Fix bond networkdata template

Align it with openstack network_data.json.

Change-Id: Iea45ad2822d273937d53f98b99e0aea0a2bf47f0
Signed-off-by: rabi <ramishra@redhat.com>

Author: rabi

templates/openstackbaremetalset/cloudinit/networkdata

@@ -8,19 +8,17 @@ links:
 - name: {{ .CtlplaneInterface }}
   id: {{ .CtlplaneInterface }}
   type: bond
-  bond_interfaces:
+  bond_links:
   {{- range $iface := .CtlplaneBondInterfaces }}
     - {{ $iface }}
   {{- end }}
   bond_mode: {{ if .CtlplaneBondMode }}{{ .CtlplaneBondMode }}{{ else }}active-backup{{ end }}
   {{- if (index . "CtlplaneBondOptions") }}
-  params:
-    {{- range $key, $value := .CtlplaneBondOptions }}
-    {{ $key }}: {{ $value }}
-    {{- end }}
+  {{- range $key, $value := .CtlplaneBondOptions }}
+  {{ $key }}: {{ $value }}
+  {{- end }}
   {{- else }}
-  params:
-    bond-miimon: 100
+  bond_miimon: 100
   {{- end }}
 {{- else }}
 - name: {{ .CtlplaneInterface }}
@@ -39,9 +37,11 @@ networks:
 {{- if (index . "CtlplaneVlan") }}
 - link: {{ .CtlplaneInterface }}.{{ .CtlplaneVlan }}
   id: {{ .CtlplaneInterface }}.{{ .CtlplaneVlan }}
+  network_id: {{ .CtlplaneInterface }}.{{ .CtlplaneVlan }}
 {{- else }}
 - link: {{ .CtlplaneInterface }}
   id: {{ .CtlplaneInterface }}
+  network_id: {{ .CtlplaneInterface }}
 {{- end }}
   type: {{ .CtlplaneIpVersion }}
   ip_address: {{ .CtlplaneIp }}

tests/functional/openstackbaremetalset_controller_test.go

@@ -488,12 +488,10 @@ var _ = Describe("BaremetalSet Test", func() {
 			Expect(networkData).NotTo(ContainSubstring("dns_nameservers:    - "))
 			Expect(networkData).To(MatchRegexp("(?m)^  dns_search:\n"))
 			Expect(networkData).NotTo(ContainSubstring("dns_search:    - "))
-			Expect(networkData).To(ContainSubstring("dns_nameservers:"))
 			Expect(networkData).To(ContainSubstring("8.8.8.8"))
 			Expect(networkData).To(ContainSubstring("8.8.4.4"))
+			Expect(networkData).To(ContainSubstring("dns_nameservers:"))
 			Expect(networkData).To(ContainSubstring("dns_search:"))
-			Expect(networkData).To(ContainSubstring("example.com"))
-			Expect(networkData).To(ContainSubstring("test.local"))
 		})
 	})
 
@@ -1026,12 +1024,13 @@ var _ = Describe("BaremetalSet Test", func() {
 				// Verify proper YAML formatting
 				g.Expect(networkData).To(MatchRegexp("(?m)^links:\n"))
 				g.Expect(networkData).NotTo(ContainSubstring("links:- "))
-				g.Expect(networkData).To(MatchRegexp("(?m)^  bond_interfaces:\n"))
-				g.Expect(networkData).NotTo(ContainSubstring("bond_interfaces:    - "))
+				g.Expect(networkData).To(MatchRegexp("(?m)^  bond_links:\n"))
+				g.Expect(networkData).NotTo(ContainSubstring("bond_links:    - "))
 				g.Expect(networkData).To(MatchRegexp("bond_mode: [^\n]+\n  "))
-				g.Expect(networkData).NotTo(MatchRegexp("bond_mode: [^\n]+  params:"))
+				g.Expect(networkData).NotTo(ContainSubstring("params:"))
 				g.Expect(networkData).Should(ContainSubstring("type: bond"))
 				g.Expect(networkData).Should(ContainSubstring("bond_mode: active-backup"))
+				g.Expect(networkData).Should(ContainSubstring("bond_miimon: 100"))
 				g.Expect(networkData).Should(ContainSubstring("eno1"))
 				g.Expect(networkData).Should(ContainSubstring("eno2"))
 			}, th.Timeout, th.Interval).Should(Succeed())
@@ -1103,9 +1102,12 @@ var _ = Describe("BaremetalSet Test", func() {
 				networkData := string(secret.Data["networkData"])
 				g.Expect(networkData).Should(ContainSubstring("type: bond"))
 				g.Expect(networkData).Should(ContainSubstring("bond_mode: 802.3ad"))
+				g.Expect(networkData).Should(ContainSubstring("bond_links:"))
 				g.Expect(networkData).Should(ContainSubstring("type: vlan"))
 				g.Expect(networkData).Should(ContainSubstring("vlan_id: 100"))
 				g.Expect(networkData).Should(ContainSubstring("bond0.100"))
+				g.Expect(networkData).Should(ContainSubstring("network_id: bond0.100"))
+				g.Expect(networkData).Should(ContainSubstring("vlan_mac_address: null"))
 			}, th.Timeout, th.Interval).Should(Succeed())
 		})
 	})