Merge pull request #9978 from pawanpinjarkar/create-singlenmstateconfig-multiple-hosts

OCPBUGS-77767: OVE Above/Below-the-sea integration - Network configuration not persisted

Author: openshift-merge-bot[bot]

internal/ignition/disconnected.go

@@ -1,6 +1,7 @@
 package ignition
 
 import (
+	"bytes"
 	"context"
 	"encoding/json"
 	"fmt"
@@ -366,6 +367,7 @@ func createNMStateConfigManifests(infraEnv *common.InfraEnv, manifestsDir string
 		nmStateConfigInfraEnvLabelKey: infraEnv.ID.String(),
 	}
 
+	var nmStateYAMLs [][]byte
 	for i, config := range staticNetworkConfigs {
 		if config == nil || config.NetworkYaml == "" {
 			continue
@@ -409,9 +411,15 @@ func createNMStateConfigManifests(infraEnv *common.InfraEnv, manifestsDir string
 			return errors.Wrapf(err, "failed to marshal NMStateConfig %d", i)
 		}
 
-		filename := filepath.Join(manifestsDir, fmt.Sprintf("nmstateconfig-%d.yaml", i))
-		if err = os.WriteFile(filename, nmStateYAML, 0o600); err != nil {
-			return errors.Wrapf(err, "failed to write NMStateConfig %d", i)
+		nmStateYAMLs = append(nmStateYAMLs, nmStateYAML)
+	}
+
+	if len(nmStateYAMLs) > 0 {
+		combinedYAML := bytes.Join(nmStateYAMLs, []byte("---\n"))
+
+		filename := filepath.Join(manifestsDir, "nmstateconfig.yaml")
+		if err := os.WriteFile(filename, combinedYAML, 0o600); err != nil {
+			return errors.Wrap(err, "failed to write NMStateConfig")
 		}
 
 		log.Infof("Created NMStateConfig manifest: %s", filename)

internal/ignition/disconnected_test.go

@@ -1,6 +1,7 @@
 package ignition
 
 import (
+	"bytes"
 	"context"
 	"os"
 	"path/filepath"
@@ -440,6 +441,18 @@ var _ = Describe("Disconnected Ignition", func() {
 						{"mac_address": "52:54:00:aa:bb:cc", "logical_nic_name": "eth0"}
 					],
 					"network_yaml": "interfaces:\n- name: eth0\n  type: ethernet\n  state: up\n  ipv4:\n    enabled: true\n    address:\n    - ip: 192.168.1.10\n      prefix-length: 24\n    dhcp: false\n"
+				},
+				{
+					"mac_interface_map": [
+						{"mac_address": "53:54:00:aa:bb:cc", "logical_nic_name": "eth0"}
+					],
+					"network_yaml": "interfaces:\n- name: eth0\n  type: ethernet\n  state: up\n  ipv4:\n    enabled: true\n    address:\n    - ip: 192.168.1.11\n      prefix-length: 24\n    dhcp: false\n"
+				},
+				{
+					"mac_interface_map": [
+						{"mac_address": "54:54:00:aa:bb:cc", "logical_nic_name": "eth0"}
+					],
+					"network_yaml": "interfaces:\n- name: eth0\n  type: ethernet\n  state: up\n  ipv4:\n    enabled: true\n    address:\n    - ip: 192.168.1.12\n      prefix-length: 24\n    dhcp: false\n"
 				}
 			]`
 
@@ -458,20 +471,46 @@ var _ = Describe("Disconnected Ignition", func() {
 				oveDir := args[4]
 
 				By("Verifying NMStateConfig manifest was created")
-				nmstateConfigContent, err := os.ReadFile(filepath.Join(oveDir, "cluster-manifests", "nmstateconfig-0.yaml"))
-				Expect(err).NotTo(HaveOccurred())
+				nmstateConfigContent, err := os.ReadFile(filepath.Join(oveDir, "cluster-manifests", "nmstateconfig.yaml"))
+				Expect(err).NotTo(HaveOccurred())
+
+				// Split the YAML content by document separator
+				// Note: We use sigs.k8s.io/yaml (not gopkg.in/yaml.v2) because Kubernetes types
+				// use json struct tags, which sigs.k8s.io/yaml handles correctly but gopkg.in/yaml.v2 doesn't
+				var nmstateConfigs []v1beta1.NMStateConfig
+				docs := bytes.Split(nmstateConfigContent, []byte("---\n"))
+				for _, doc := range docs {
+					doc = bytes.TrimSpace(doc)
+					if len(doc) == 0 {
+						continue
+					}
+
+					var config v1beta1.NMStateConfig
+					err = yaml.Unmarshal(doc, &config)
+					Expect(err).NotTo(HaveOccurred())
+					nmstateConfigs = append(nmstateConfigs, config)
+				}
 
-				var nmstateConfig v1beta1.NMStateConfig
-				err = yaml.Unmarshal(nmstateConfigContent, &nmstateConfig)
-				Expect(err).NotTo(HaveOccurred())
+				Expect(nmstateConfigs).To(HaveLen(3))
 
-				Expect(nmstateConfig.APIVersion).To(Equal("agent-install.openshift.io/v1beta1"))
-				Expect(nmstateConfig.Kind).To(Equal("NMStateConfig"))
-				Expect(nmstateConfig.ObjectMeta.Name).To(Equal("nmstate-config-0"))
-				Expect(nmstateConfig.ObjectMeta.Labels).To(HaveKeyWithValue(nmStateConfigInfraEnvLabelKey, infraEnv.ID.String()))
-				Expect(nmstateConfig.Spec.Interfaces).To(HaveLen(1))
-				Expect(nmstateConfig.Spec.Interfaces[0].Name).To(Equal("eth0"))
-				Expect(nmstateConfig.Spec.Interfaces[0].MacAddress).To(Equal("52:54:00:aa:bb:cc"))
+				expectedConfigs := []struct {
+					name       string
+					macAddress string
+				}{
+					{"nmstate-config-0", "52:54:00:aa:bb:cc"},
+					{"nmstate-config-1", "53:54:00:aa:bb:cc"},
+					{"nmstate-config-2", "54:54:00:aa:bb:cc"},
+				}
+
+				for i, expected := range expectedConfigs {
+					Expect(nmstateConfigs[i].APIVersion).To(Equal("agent-install.openshift.io/v1beta1"))
+					Expect(nmstateConfigs[i].Kind).To(Equal("NMStateConfig"))
+					Expect(nmstateConfigs[i].ObjectMeta.Name).To(Equal(expected.name))
+					Expect(nmstateConfigs[i].ObjectMeta.Labels).To(HaveKeyWithValue(nmStateConfigInfraEnvLabelKey, infraEnv.ID.String()))
+					Expect(nmstateConfigs[i].Spec.Interfaces).To(HaveLen(1))
+					Expect(nmstateConfigs[i].Spec.Interfaces[0].Name).To(Equal("eth0"))
+					Expect(nmstateConfigs[i].Spec.Interfaces[0].MacAddress).To(Equal(expected.macAddress))
+				}
 
 				By("Verifying InfraEnv manifest selector references NMStateConfig labels")
 				infraEnvContent, err := os.ReadFile(filepath.Join(oveDir, "cluster-manifests", "infraenv.yaml"))
@@ -512,7 +551,7 @@ var _ = Describe("Disconnected Ignition", func() {
 				oveDir := args[4]
 
 				By("Verifying no NMStateConfig manifest was created")
-				_, err := os.Stat(filepath.Join(oveDir, "cluster-manifests", "nmstateconfig-0.yaml"))
+				_, err := os.Stat(filepath.Join(oveDir, "cluster-manifests", "nmstateconfig.yaml"))
 				Expect(os.IsNotExist(err)).To(BeTrue())
 
 				By("Verifying InfraEnv manifest does not set NMStateConfig selector")