X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=deploy%2Fmachine%2Ftemplates%2F_networkdata.json;h=25eeda57bd6e262efff8d218add6eb3ffcf0086f;hb=refs%2Fchanges%2F04%2F4804%2F1;hp=f6f190158ed76bc43fc518197da2300b0fef72bf;hpb=7f5b95aaf15bca22ac6506ac5e1b5db0d0437222;p=icn.git

diff --git a/deploy/machine/templates/_networkdata.json b/deploy/machine/templates/_networkdata.json
index f6f1901..25eeda5 100644
--- a/deploy/machine/templates/_networkdata.json
+++ b/deploy/machine/templates/_networkdata.json
@@ -1,9 +1,9 @@
 {{- define "machine.networkData" -}}
-{{- if .networks -}}
+{{- if .networkData -}}
 {
   "links": [
 {{- $local := dict "first" true -}}
-{{- range $name, $network := .networks }}
+{{- range $name, $link := .networkData.links.ethernets }}
 {{- if not $local.first }}
     },{
 {{- else }}
@@ -11,14 +11,14 @@
 {{- end }}
 {{- $_ := set $local "first" false }}
       "id": "{{ $name }}_nic",
-      "ethernet_mac_address": "{{ $network.macAddress }}",
+      "ethernet_mac_address": "{{ $link.macAddress }}",
       "type": "phy"
 {{- end }}
     }
   ],
   "networks": [
 {{- $local := dict "first" true -}}
-{{- range $name, $network := .networks }}
+{{- range $name, $network := .networkData.networks.ipv4DHCP }}
 {{- if not $local.first }}
     },{
 {{- else }}
@@ -26,15 +26,47 @@
 {{- end }}
 {{- $_ := set $local "first" false }}
       "id": "{{ $name }}",
-      "link": "{{ $name }}_nic",
-      "type": "{{ $network.type }}"{{- if $network.ipAddress }},
+      "link": "{{ $network.link | default $name }}_nic",
+      "type": "ipv4_dhcp"
+{{- end }}
+{{- range $name, $network := .networkData.networks.ipv4 }}
+    },{
+      "id": "{{ $name }}",
+      "link": "{{ $network.link | default $name }}_nic",
+      "type": "ipv4"{{- if $network.ipAddress }},
+      "ip_address": "{{ $network.ipAddress }}"{{- end }}{{- if $network.gateway }},
+      "gateway": "{{ $network.gateway }}"{{- end }}
+{{- end }}
+{{- range $name, $network := .networkData.networks.ipv6DHCP }}
+    },{
+      "id": "{{ $name }}",
+      "link": "{{ $network.link | default $name }}_nic",
+      "type": "ipv4_dhcp"
+{{- end }}
+{{- range $name, $network := .networkData.networks.ipv6 }}
+    },{
+      "id": "{{ $name }}",
+      "link": "{{ $network.link | default $name }}_nic",
+      "type": "ipv6"{{- if $network.ipAddress }},
       "ip_address": "{{ $network.ipAddress }}"{{- end }}{{- if $network.gateway }},
-      "gateway": "{{ $network.gateway }}"{{- end }}{{- if $network.nameservers }},
-      "dns_nameservers": {{ $network.nameservers }}{{- end }}
+      "gateway": "{{ $network.gateway }}"{{- end }}
 {{- end }}
     }
   ],
-  "services": []
+  "services": [
+{{- $local := dict "first" true -}}
+{{- range $address := .networkData.services.dns }}
+{{- if not $local.first }}
+    },{
+{{- else }}
+    {
+{{- end }}
+{{- $_ := set $local "first" false }}
+      "type": "dns",
+      "address": "{{ $address }}"
+{{- end }}
+    }
+  ]
 }
 {{ end }}
 {{- end }}