@@ -18,10 +18,11 @@ package functional_test
1818
1919import (
2020 "fmt"
21- "gopkg.in/yaml.v2"
2221 "math/rand"
2322 "net"
2423
24+ "gopkg.in/yaml.v2"
25+
2526 "github.com/google/uuid"
2627 . "github.com/onsi/ginkgo/v2" //revive:disable:dot-imports
2728 . "github.com/onsi/gomega" //revive:disable:dot-imports
@@ -818,19 +819,12 @@ var _ = Describe("Designate controller", func() {
818819 Eventually (func (g Gomega ) {
819820 designateAPI := GetDesignateAPI (designateAPIName )
820821 g .Expect (designateAPI .Status .LastAppliedTopology ).ToNot (BeNil ())
821- designateCentral := GetDesignateCentral (designateCentralName )
822- g .Expect (designateCentral .Status .LastAppliedTopology ).ToNot (BeNil ())
823- designateProducer := GetDesignateProducer (designateProducerName )
824- g .Expect (designateProducer .Status .LastAppliedTopology ).ToNot (BeNil ())
825- //NOTE: MDNS and bind9 are simulated and the logic is the same
826- }, timeout , interval ).Should (Succeed ())
827-
828- Eventually (func (g Gomega ) {
829- designateAPI := GetDesignateAPI (designateAPIName )
830822 g .Expect (designateAPI .Status .LastAppliedTopology .Name ).To (Equal (designateTopologies [0 ].Name ))
831823 designateCentral := GetDesignateCentral (designateCentralName )
824+ g .Expect (designateCentral .Status .LastAppliedTopology ).ToNot (BeNil ())
832825 g .Expect (designateCentral .Status .LastAppliedTopology .Name ).To (Equal (designateTopologies [0 ].Name ))
833826 designateProducer := GetDesignateProducer (designateProducerName )
827+ g .Expect (designateProducer .Status .LastAppliedTopology ).ToNot (BeNil ())
834828 g .Expect (designateProducer .Status .LastAppliedTopology .Name ).To (Equal (designateTopologies [0 ].Name ))
835829 //NOTE: MDNS and bind9 are simulated and the logic is the same
836830 }, timeout , interval ).Should (Succeed ())
@@ -845,10 +839,13 @@ var _ = Describe("Designate controller", func() {
845839 Eventually (func (g Gomega ) {
846840 th .SimulateJobSuccess (designateDBSyncName )
847841 designateAPI := GetDesignateAPI (designateAPIName )
842+ g .Expect (designateAPI .Status .LastAppliedTopology ).ToNot (BeNil ())
848843 g .Expect (designateAPI .Status .LastAppliedTopology .Name ).To (Equal (designateTopologies [1 ].Name ))
849844 designateCentral := GetDesignateCentral (designateCentralName )
845+ g .Expect (designateCentral .Status .LastAppliedTopology ).ToNot (BeNil ())
850846 g .Expect (designateCentral .Status .LastAppliedTopology .Name ).To (Equal (designateTopologies [1 ].Name ))
851847 designateProducer := GetDesignateProducer (designateProducerName )
848+ g .Expect (designateProducer .Status .LastAppliedTopology ).ToNot (BeNil ())
852849 g .Expect (designateProducer .Status .LastAppliedTopology .Name ).To (Equal (designateTopologies [1 ].Name ))
853850 }, timeout , interval ).Should (Succeed ())
854851 })
@@ -873,10 +870,13 @@ var _ = Describe("Designate controller", func() {
873870 Eventually (func (g Gomega ) {
874871 th .SimulateJobSuccess (designateDBSyncName )
875872 designateAPI := GetDesignateAPI (designateAPIName )
873+ g .Expect (designateAPI .Status .LastAppliedTopology ).ToNot (BeNil ())
876874 g .Expect (designateAPI .Status .LastAppliedTopology .Name ).To (Equal (designateTopologies [1 ].Name ))
877875 designateCentral := GetDesignateCentral (designateCentralName )
876+ g .Expect (designateCentral .Status .LastAppliedTopology ).ToNot (BeNil ())
878877 g .Expect (designateCentral .Status .LastAppliedTopology .Name ).To (Equal (designateTopologies [2 ].Name ))
879878 designateProducer := GetDesignateProducer (designateProducerName )
879+ g .Expect (designateProducer .Status .LastAppliedTopology ).ToNot (BeNil ())
880880 g .Expect (designateProducer .Status .LastAppliedTopology .Name ).To (Equal (designateTopologies [3 ].Name ))
881881 }, timeout , interval ).Should (Succeed ())
882882 })
0 commit comments