Cover missing code and address review comments

Author: Shilpa-Gokul

cloud/scope/powervs_cluster_test.go

@@ -179,7 +179,7 @@ func TestReconcileNetwork(t *testing.T) {
 
 		clusterScopeParams := getPowerVSClusterScopeParams()
 		clusterScopeParams.PowerVSClientFactory = func() (powervs.PowerVS, error) {
-			mockPowerVS.EXPECT().GetDHCPServer(gomock.Any()).Return(nil, fmt.Errorf("intentional error"))
+			mockPowerVS.EXPECT().GetDHCPServer(gomock.Any()).Return(nil, fmt.Errorf("GetDHCPServer error"))
 			return mockPowerVS, nil
 		}
 		clusterScope, _ := NewPowerVSClusterScope(clusterScopeParams)
@@ -188,6 +188,23 @@ func TestReconcileNetwork(t *testing.T) {
 		g.Expect(err).ToNot(BeNil())
 		g.Expect(requeue).To(BeFalse())
 	})
+	t.Run("When DHCPServer exists and is active", func(t *testing.T) {
+		g := NewWithT(t)
+		setup(t)
+		t.Cleanup(teardown)
+
+		clusterScopeParams := getPowerVSClusterScopeParams()
+		clusterScopeParams.PowerVSClientFactory = func() (powervs.PowerVS, error) {
+			dhcpServer := &models.DHCPServerDetail{ID: ptr.To("dhcpID"), Status: ptr.To(string(infrav1beta2.DHCPServerStateActive))}
+			mockPowerVS.EXPECT().GetDHCPServer(gomock.Any()).Return(dhcpServer, nil)
+			return mockPowerVS, nil
+		}
+		clusterScope, _ := NewPowerVSClusterScope(clusterScopeParams)
+
+		requeue, err := clusterScope.ReconcileNetwork()
+		g.Expect(err).To(BeNil())
+		g.Expect(requeue).To(BeFalse())
+	})
 	t.Run("When DHCPID is empty and GetNetworkByID returns error ", func(t *testing.T) {
 		g := NewWithT(t)
 		setup(t)
@@ -196,7 +213,7 @@ func TestReconcileNetwork(t *testing.T) {
 		clusterScopeParams := getPowerVSClusterScopeParams()
 		clusterScopeParams.PowerVSClientFactory = func() (powervs.PowerVS, error) {
 			network := &models.Network{}
-			mockPowerVS.EXPECT().GetNetworkByID(gomock.Any()).Return(network, fmt.Errorf("intentional error"))
+			mockPowerVS.EXPECT().GetNetworkByID(gomock.Any()).Return(network, fmt.Errorf("GetNetworkByID error"))
 			return mockPowerVS, nil
 		}
 		clusterScopeParams.IBMPowerVSCluster.Spec.DHCPServer.ID = nil
@@ -211,10 +228,9 @@ func TestReconcileNetwork(t *testing.T) {
 		g := NewWithT(t)
 		setup(t)
 		t.Cleanup(teardown)
-
+		network := &models.Network{NetworkID: ptr.To("networkID")}
 		clusterScopeParams := getPowerVSClusterScopeParams()
 		clusterScopeParams.PowerVSClientFactory = func() (powervs.PowerVS, error) {
-			network := &models.Network{NetworkID: ptr.To("networkID")}
 			mockPowerVS.EXPECT().GetNetworkByID(gomock.Any()).Return(network, nil)
 			return mockPowerVS, nil
 		}
@@ -223,10 +239,35 @@ func TestReconcileNetwork(t *testing.T) {
 		clusterScope, _ := NewPowerVSClusterScope(clusterScopeParams)
 
 		requeue, err := clusterScope.ReconcileNetwork()
+		g.Expect(clusterScope.IBMPowerVSCluster.Status.Network.ID).To(Equal(network.NetworkID))
 		g.Expect(err).To(BeNil())
 		g.Expect(requeue).To(BeFalse())
 	})
-	t.Run("When DHCPID is empty and networkID is empty", func(t *testing.T) {
+	t.Run("When DHCPID is empty and GetNetworkByName returns empty network", func(t *testing.T) {
+		g := NewWithT(t)
+		setup(t)
+		t.Cleanup(teardown)
+
+		network := &models.NetworkReference{}
+		dhcpNetwork := &models.DHCPServerNetwork{ID: ptr.To("dhcpNetworkID")}
+		dhcpServer := &models.DHCPServer{ID: ptr.To("dhcpID"), Network: dhcpNetwork}
+		clusterScopeParams := getPowerVSClusterScopeParams()
+		clusterScopeParams.PowerVSClientFactory = func() (powervs.PowerVS, error) {
+			mockPowerVS.EXPECT().GetNetworkByName(gomock.Any()).Return(network, nil)
+			mockPowerVS.EXPECT().CreateDHCPServer(gomock.Any()).Return(dhcpServer, nil)
+			return mockPowerVS, nil
+		}
+		clusterScopeParams.IBMPowerVSCluster.Spec.DHCPServer.ID = nil
+		clusterScope, _ := NewPowerVSClusterScope(clusterScopeParams)
+
+		requeue, err := clusterScope.ReconcileNetwork()
+		g.Expect(clusterScope.IBMPowerVSCluster.Status.DHCPServer.ID).To(Equal(dhcpServer.ID))
+		g.Expect(clusterScope.IBMPowerVSCluster.Status.Network.ID).To(Equal(dhcpNetwork.ID))
+		g.Expect(err).To(BeNil())
+		g.Expect(requeue).To(BeTrue())
+
+	})
+	t.Run("When DHCPID is empty and checkNetwork returns empty network ID", func(t *testing.T) {
 		g := NewWithT(t)
 		setup(t)
 		t.Cleanup(teardown)
@@ -249,7 +290,7 @@ func TestReconcileNetwork(t *testing.T) {
 		g.Expect(requeue).To(BeTrue())
 
 	})
-	t.Run("When DHCPID and networkID is empty and createDHCPServer returns error", func(t *testing.T) {
+	t.Run("When DHCPID and networkID is not empty and createDHCPServer returns error", func(t *testing.T) {
 		g := NewWithT(t)
 		setup(t)
 		t.Cleanup(teardown)
@@ -258,7 +299,7 @@ func TestReconcileNetwork(t *testing.T) {
 		clusterScopeParams.PowerVSClientFactory = func() (powervs.PowerVS, error) {
 			network := &models.Network{}
 			mockPowerVS.EXPECT().GetNetworkByID(gomock.Any()).Return(network, nil)
-			mockPowerVS.EXPECT().CreateDHCPServer(gomock.Any()).Return(nil, fmt.Errorf("intentional error"))
+			mockPowerVS.EXPECT().CreateDHCPServer(gomock.Any()).Return(nil, fmt.Errorf("CreateDHCPServer error"))
 			return mockPowerVS, nil
 		}
 		clusterScopeParams.IBMPowerVSCluster.Spec.DHCPServer.ID = nil