Add network attachments specific EnvTests

This change is an addition to the main change that adds more
envTests to test-operator. It is specifically adding the testing
needed for Tempest and Tobiko when network attachments are
specified.

Author: kstrenkova

go.mod

@@ -58,6 +58,7 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/openshift/api v3.9.0+incompatible // indirect
+	github.com/openstack-k8s-operators/lib-common/modules/test v0.6.0
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_golang v1.20.4 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect

go.sum

@@ -119,6 +119,8 @@ github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.2026020508
 github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260205083029-d03e9df035ef/go.mod h1:ndqfy1KbVorHH6+zlUFPIrCRhMSxO3ImYJUGaooE0x0=
 github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20260205083029-d03e9df035ef h1:2wJUSZ2ybE6JVjEyuk/HEaJ1in64jf/lrPOs8NrRHFo=
 github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20260205083029-d03e9df035ef/go.mod h1:jofj+VqDszxLCZSBYo794KGkCjMo01xzhQ/gffYzf3I=
+github.com/openstack-k8s-operators/lib-common/modules/test v0.6.0 h1:heoPZJrNVCbcrc2J60ysp4W7Wp3EcnuRnX16xOXg13Q=
+github.com/openstack-k8s-operators/lib-common/modules/test v0.6.0/go.mod h1:oKvVb28i6wwBR5uQO2B2KMzZnCFTPCUCj31c5Zvz2lo=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

test/functional/suite_test.go

@@ -27,7 +27,9 @@ import (
 
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
+	networkv1 "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1"
 	common_test "github.com/openstack-k8s-operators/lib-common/modules/common/test/helpers"
+	"github.com/openstack-k8s-operators/lib-common/modules/test"
 	testv1 "github.com/openstack-k8s-operators/test-operator/api/v1beta1"
 	controller "github.com/openstack-k8s-operators/test-operator/internal/controller"
 	webhookv1beta1 "github.com/openstack-k8s-operators/test-operator/internal/webhook/v1beta1"
@@ -68,11 +70,20 @@ var _ = BeforeSuite(func() {
 
 	ctx, cancel = context.WithCancel(context.TODO())
 
+	networkv1CRD, err := test.GetCRDDirFromModule(
+		"github.com/k8snetworkplumbingwg/network-attachment-definition-client", "../../go.mod", "artifacts/networks-crd.yaml")
+	Expect(err).ShouldNot(HaveOccurred())
+
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{
 		CRDDirectoryPaths: []string{
 			filepath.Join("..", "..", "config", "crd", "bases"),
 		},
+		CRDInstallOptions: envtest.CRDInstallOptions{
+			Paths: []string{
+				networkv1CRD,
+			},
+		},
 		ErrorIfCRDPathMissing: true,
 		WebhookInstallOptions: envtest.WebhookInstallOptions{
 			Paths: []string{filepath.Join("..", "..", "config", "webhook")},
@@ -86,14 +97,16 @@ var _ = BeforeSuite(func() {
 	logger = ctrl.Log.WithName("---Test---")
 
 	// cfg is defined in this file globally.
-	var err error
 	cfg, err = testEnv.Start()
 	Expect(err).NotTo(HaveOccurred())
 	Expect(cfg).NotTo(BeNil())
 
 	err = testv1.AddToScheme(scheme.Scheme)
 	Expect(err).NotTo(HaveOccurred())
 
+	err = networkv1.AddToScheme(scheme.Scheme)
+	Expect(err).NotTo(HaveOccurred())
+
 	//+kubebuilder:scaffold:scheme
 
 	k8sClient, err = client.New(cfg, client.Options{Scheme: scheme.Scheme})

test/functional/tempest_controller_test.go

@@ -169,4 +169,27 @@ var _ = Describe("Tempest controller", func() {
 			)
 		})
 	})
+
+	When("Tempest is created with network attachments", func() {
+		BeforeEach(func() {
+			openstackConfigMap, openstackSecret := CreateCommonOpenstackResources(namespace)
+			Expect(k8sClient.Create(ctx, openstackConfigMap)).Should(Succeed())
+			Expect(k8sClient.Create(ctx, openstackSecret)).Should(Succeed())
+
+			nad := th.CreateNetworkAttachmentDefinition(types.NamespacedName{
+				Namespace: namespace,
+				Name:      "ctlplane",
+			})
+			DeferCleanup(th.DeleteInstance, nad)
+
+			spec := GetDefaultTempestSpec()
+			spec["networkAttachments"] = []string{"ctlplane"}
+			DeferCleanup(th.DeleteInstance, CreateTempest(tempestName, spec))
+		})
+
+		It("should add network annotation to pod", func() {
+			pod := GetTestOperatorPod(namespace, tempestName.Name)
+			Expect(pod.Annotations).To(HaveKey("k8s.v1.cni.cncf.io/networks"))
+		})
+	})
 })

test/functional/tobiko_controller_test.go

@@ -138,4 +138,30 @@ var _ = Describe("Tobiko controller", func() {
 			)
 		})
 	})
+
+	When("Tobiko is created with network attachments", func() {
+		BeforeEach(func() {
+			openstackConfigMap, openstackSecret := CreateCommonOpenstackResources(namespace)
+			Expect(k8sClient.Create(ctx, openstackConfigMap)).Should(Succeed())
+			Expect(k8sClient.Create(ctx, openstackSecret)).Should(Succeed())
+
+			testOperatorConfigMap := CreateTestOperatorConfigMap(namespace)
+			Expect(k8sClient.Create(ctx, testOperatorConfigMap)).Should(Succeed())
+
+			nad := th.CreateNetworkAttachmentDefinition(types.NamespacedName{
+				Namespace: namespace,
+				Name:      "ctlplane",
+			})
+			DeferCleanup(th.DeleteInstance, nad)
+
+			spec := GetDefaultTobikoSpec()
+			spec["networkAttachments"] = []string{"ctlplane"}
+			DeferCleanup(th.DeleteInstance, CreateTobiko(tobikoName, spec))
+		})
+
+		It("should add network annotation to pod", func() {
+			pod := GetTestOperatorPod(namespace, tobikoName.Name)
+			Expect(pod.Annotations).To(HaveKey("k8s.v1.cni.cncf.io/networks"))
+		})
+	})
 })