Merge pull request #415 from stuggi/topo_func

[functional] verify LastAppliedTopology != nil before checking name

Author: openshift-merge-bot[bot]

tests/functional/ovncontroller_controller_test.go

@@ -1309,11 +1309,12 @@ var _ = Describe("OVNController controller", func() {
 		It("sets topologyref in both .Status CR and resources", func() {
 			Eventually(func(g Gomega) {
 				ovn := GetOVNController(ovnControllerName)
-				g.Expect(ovn.Status.LastAppliedTopology.Name).ToNot(BeNil())
+				g.Expect(ovn.Status.LastAppliedTopology).NotTo(BeNil())
 			}, timeout, interval).Should(Succeed())
 
 			Eventually(func(g Gomega) {
 				ovn := GetOVNController(ovnControllerName)
+				g.Expect(ovn.Status.LastAppliedTopology).NotTo(BeNil())
 				g.Expect(ovn.Status.LastAppliedTopology.Name).To(Equal(ovnTopologies[0].Name))
 			}, timeout, interval).Should(Succeed())
 
@@ -1332,6 +1333,7 @@ var _ = Describe("OVNController controller", func() {
 
 			Eventually(func(g Gomega) {
 				ovn := GetOVNController(ovnControllerName)
+				g.Expect(ovn.Status.LastAppliedTopology).NotTo(BeNil())
 				g.Expect(ovn.Status.LastAppliedTopology.Name).To(Equal(ovnTopologies[1].Name))
 				g.Expect(GetDaemonSet(daemonSetName).Spec.Template.Spec.TopologySpreadConstraints).To(BeNil())
 				g.Expect(GetDaemonSet(daemonSetNameOVS).Spec.Template.Spec.Affinity).To(BeNil())

tests/functional/ovndbcluster_controller_test.go

@@ -1267,6 +1267,7 @@ var _ = Describe("OVNDBCluster controller", func() {
 		It("sets topologyref in both .Status CR and resources", func() {
 			Eventually(func(g Gomega) {
 				ovndb := GetOVNDBCluster(OVNDBClusterName)
+				g.Expect(ovndb.Status.LastAppliedTopology).NotTo(BeNil())
 				g.Expect(ovndb.Status.LastAppliedTopology.Name).To(Equal(ovnTopologies[0].Name))
 				g.Expect(th.GetStatefulSet(statefulSetName).Spec.Template.Spec.TopologySpreadConstraints).ToNot(BeNil())
 				g.Expect(th.GetStatefulSet(statefulSetName).Spec.Template.Spec.Affinity).To(BeNil())
@@ -1282,6 +1283,7 @@ var _ = Describe("OVNDBCluster controller", func() {
 
 			Eventually(func(g Gomega) {
 				ovndb := GetOVNDBCluster(OVNDBClusterName)
+				g.Expect(ovndb.Status.LastAppliedTopology).NotTo(BeNil())
 				g.Expect(ovndb.Status.LastAppliedTopology.Name).To(Equal(ovnTopologies[1].Name))
 				g.Expect(th.GetStatefulSet(statefulSetName).Spec.Template.Spec.TopologySpreadConstraints).ToNot(BeNil())
 				g.Expect(th.GetStatefulSet(statefulSetName).Spec.Template.Spec.Affinity).To(BeNil())

tests/functional/ovnnorthd_controller_test.go

@@ -442,6 +442,7 @@ var _ = Describe("OVNNorthd controller", func() {
 		It("sets topologyref in both .Status CR and resources", func() {
 			Eventually(func(g Gomega) {
 				northd := ovn.GetOVNNorthd(ovnNorthdName)
+				g.Expect(northd.Status.LastAppliedTopology).NotTo(BeNil())
 				g.Expect(northd.Status.LastAppliedTopology.Name).To(Equal(ovnTopologies[0].Name))
 				g.Expect(th.GetDeployment(deploymentName).Spec.Template.Spec.TopologySpreadConstraints).ToNot(BeNil())
 				g.Expect(th.GetDeployment(deploymentName).Spec.Template.Spec.Affinity).To(BeNil())
@@ -457,6 +458,7 @@ var _ = Describe("OVNNorthd controller", func() {
 
 			Eventually(func(g Gomega) {
 				northd := ovn.GetOVNNorthd(ovnNorthdName)
+				g.Expect(northd.Status.LastAppliedTopology).NotTo(BeNil())
 				g.Expect(northd.Status.LastAppliedTopology.Name).To(Equal(ovnTopologies[1].Name))
 				g.Expect(th.GetDeployment(deploymentName).Spec.Template.Spec.TopologySpreadConstraints).ToNot(BeNil())
 				g.Expect(th.GetDeployment(deploymentName).Spec.Template.Spec.Affinity).To(BeNil())