Cleanup.

Author: Joshua Reed

api/v1beta2/cloudstackcluster_webhook_test.go

@@ -56,7 +56,6 @@ var _ = Describe("CloudStackCluster webhooks", func() {
 		})
 
 		It("Should reject a CloudStackCluster with IdentityRef not of kind 'Secret'", func() {
-			dummies.CSCluster.Spec.IdentityRef.Kind = "NewType"
 			Ω(k8sClient.Create(ctx, dummies.CSCluster)).
 				Should(MatchError(MatchRegexp(forbiddenRegex, "must be a Secret")))
 		})
@@ -87,12 +86,10 @@ var _ = Describe("CloudStackCluster webhooks", func() {
 				Should(MatchError(MatchRegexp(forbiddenRegex, "controlplaneendpoint\\.port")))
 		})
 		It("Should reject updates to the CloudStackCluster identity reference kind", func() {
-			dummies.CSCluster.Spec.IdentityRef.Kind = "NewType"
 			Ω(k8sClient.Update(ctx, dummies.CSCluster)).
 				Should(MatchError(MatchRegexp(forbiddenRegex, "identityref\\.kind")))
 		})
 		It("Should reject updates to the CloudStackCluster identity reference name", func() {
-			dummies.CSCluster.Spec.IdentityRef.Name = "NewType"
 			Ω(k8sClient.Update(ctx, dummies.CSCluster)).
 				Should(MatchError(MatchRegexp(forbiddenRegex, "identityref\\.name")))
 		})

api/v1beta2/cloudstackmachine_webhook_test.go

@@ -72,7 +72,6 @@ var _ = Describe("CloudStackMachine webhook", func() {
 		})
 
 		It("should reject a CloudStackMachine with IdentityRef not of kind 'Secret'", func() {
-			dummies.CSMachine1.Spec.IdentityRef.Kind = "ConfigMap"
 			Expect(k8sClient.Create(ctx, dummies.CSMachine1)).
 				Should(MatchError(MatchRegexp(forbiddenRegex, "must be a Secret")))
 		})
@@ -108,13 +107,11 @@ var _ = Describe("CloudStackMachine webhook", func() {
 		})
 
 		It("should reject identity reference kind updates to the CloudStackMachine", func() {
-			dummies.CSMachine1.Spec.IdentityRef.Kind = "ConfigMap"
 			Ω(k8sClient.Update(ctx, dummies.CSMachine1)).
 				Should(MatchError(MatchRegexp(forbiddenRegex, "identityRef\\.Kind")))
 		})
 
 		It("should reject identity reference name updates to the CloudStackMachine", func() {
-			dummies.CSMachine1.Spec.IdentityRef.Name = "IdentityConfigMap"
 			Ω(k8sClient.Update(ctx, dummies.CSMachine1)).
 				Should(MatchError(MatchRegexp(forbiddenRegex, "identityRef\\.Name")))
 		})

api/v1beta2/cloudstackmachinetemplate_webhook_test.go

@@ -62,7 +62,6 @@ var _ = Describe("CloudStackMachineTemplate webhook", func() {
 		})
 
 		It("should reject a CloudStackMachineTemplate with IdentityRef not of kind 'Secret'", func() {
-			dummies.CSMachine1.Spec.IdentityRef.Kind = "ConfigMap"
 			Expect(k8sClient.Create(ctx, dummies.CSMachine1)).
 				Should(MatchError(MatchRegexp(forbiddenRegex, "must be a Secret")))
 		})
@@ -99,13 +98,11 @@ var _ = Describe("CloudStackMachineTemplate webhook", func() {
 		})
 
 		It("should reject identity reference kind updates to the CloudStackMachineTemplate", func() {
-			dummies.CSMachineTemplate1.Spec.Spec.Spec.IdentityRef.Kind = "configMap"
 			Ω(k8sClient.Update(ctx, dummies.CSMachineTemplate1)).
 				Should(MatchError(MatchRegexp(forbiddenRegex, "identityRef\\.Kind")))
 		})
 
 		It("should reject identity reference name updates to the CloudStackMachineTemplate", func() {
-			dummies.CSMachineTemplate1.Spec.Spec.Spec.IdentityRef.Name = "IDentityConfigMap"
 			Ω(k8sClient.Update(ctx, dummies.CSMachineTemplate1)).
 				Should(MatchError(MatchRegexp(forbiddenRegex, "identityRef\\.Name")))
 		})

pkg/cloud/affinity_groups_test.go

@@ -56,7 +56,6 @@ var _ = Describe("AffinityGroup Unit Tests", func() {
 	})
 	It("creates an affinity group", func() {
 		dummies.SetDummyDomainAndAccount()
-		dummies.SetDummyDomainID()
 		ags.EXPECT().GetAffinityGroupByID(dummies.AffinityGroup.ID).Return(nil, -1, errors.New("FakeError"))
 		ags.EXPECT().NewCreateAffinityGroupParams(dummies.AffinityGroup.Name, dummies.AffinityGroup.Type).
 			Return(&cloudstack.CreateAffinityGroupParams{})

pkg/cloud/cloud_suite_test.go

@@ -89,7 +89,6 @@ func TestCloud(t *testing.T) {
 func FetchIntegTestResources() {
 	Ω(realCloudClient.ResolveZone(&dummies.CSFailureDomain1.Spec.Zone)).Should(Succeed())
 	Ω(dummies.CSFailureDomain1.Spec.Zone.ID).ShouldNot(BeEmpty())
-	dummies.CSMachine1.Status.ZoneID = dummies.CSFailureDomain1.Spec.Zone.ID
 	dummies.CSMachine1.Spec.DiskOffering.Name = ""
 	dummies.CSCluster.Spec.ControlPlaneEndpoint.Host = ""
 	Ω(realCloudClient.GetOrCreateIsolatedNetwork(

pkg/cloud/instance_test.go

@@ -66,8 +66,6 @@ var _ = Describe("Instance", func() {
 		client = cloud.NewClientFromCSAPIClient(mockClient)
 
 		dummies.SetDummyVars()
-		dummies.SetDummyClusterStatus()
-		dummies.SetDummyCSMachineStatuses()
 	})
 
 	AfterEach(func() {

pkg/cloud/isolated_network_test.go

@@ -53,7 +53,6 @@ var _ = Describe("Network", func() {
 		rs = mockClient.Resourcetags.(*csapi.MockResourcetagsServiceIface)
 		client = cloud.NewClientFromCSAPIClient(mockClient)
 		dummies.SetDummyVars()
-		dummies.SetDummyClusterStatus()
 	})
 
 	AfterEach(func() {
@@ -63,7 +62,6 @@ var _ = Describe("Network", func() {
 	It("calls to create an isolated network when not found", func() {
 		dummies.Zone1.Network = dummies.ISONet1
 		dummies.Zone1.Network.ID = ""
-		dummies.CSCluster.Status.PublicIPNetworkID = dummies.ISONet1.ID
 
 		nos.EXPECT().GetNetworkOfferingID(gomock.Any()).Return("someOfferingID", 1, nil)
 		ns.EXPECT().NewCreateNetworkParams(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).
@@ -107,7 +105,6 @@ var _ = Describe("Network", func() {
 	Context("for a closed firewall", func() {
 		It("OpenFirewallRule asks CloudStack to open the firewall", func() {
 			dummies.Zone1.Network = dummies.ISONet1
-			dummies.CSCluster.Status.PublicIPNetworkID = dummies.ISONet1.ID
 			fs.EXPECT().NewCreateEgressFirewallRuleParams(dummies.ISONet1.ID, cloud.NetworkProtocolTCP).
 				Return(&csapi.CreateEgressFirewallRuleParams{})
 			fs.EXPECT().CreateEgressFirewallRule(&csapi.CreateEgressFirewallRuleParams{}).
@@ -120,7 +117,6 @@ var _ = Describe("Network", func() {
 	Context("for an open firewall", func() {
 		It("OpenFirewallRule asks CloudStack to open the firewall anyway, but doesn't fail", func() {
 			dummies.Zone1.Network = dummies.ISONet1
-			dummies.CSCluster.Status.PublicIPNetworkID = dummies.ISONet1.ID
 
 			fs.EXPECT().NewCreateEgressFirewallRuleParams(dummies.ISONet1.ID, "tcp").
 				Return(&csapi.CreateEgressFirewallRuleParams{})

pkg/cloud/network_test.go

@@ -40,7 +40,6 @@ var _ = Describe("Network", func() {
 		ns = mockClient.Network.(*csapi.MockNetworkServiceIface)
 		client = cloud.NewClientFromCSAPIClient(mockClient)
 		dummies.SetDummyVars()
-		dummies.SetDummyClusterStatus()
 	})
 
 	AfterEach(func() {

pkg/cloud/user_credentials_test.go

@@ -29,8 +29,6 @@ var _ = Describe("User Credentials", func() {
 
 	BeforeEach(func() {
 		dummies.SetDummyVars()
-		dummies.SetDummyClusterStatus()
-		dummies.SetDummyCSMachineStatuses()
 	})
 
 	AfterEach(func() {

test/dummies/v1beta2/vars.go

@@ -159,10 +159,6 @@ func SetDummyCSMachineTemplateVars() {
 					Namespace: "default",
 				},
 				Spec: infrav1.CloudStackMachineSpec{
-					IdentityRef: &infrav1.CloudStackIdentityReference{
-						Kind: "Secret",
-						Name: "IdentitySecret",
-					},
 					Template: infrav1.CloudStackResourceIdentifier{
 						Name: GetYamlVal("CLOUDSTACK_TEMPLATE_NAME"),
 					},
@@ -192,11 +188,7 @@ func SetDummyCSMachineVars() {
 			Labels:    ClusterLabel,
 		},
 		Spec: infrav1.CloudStackMachineSpec{
-			Name: "test-machine-1",
-			IdentityRef: &infrav1.CloudStackIdentityReference{
-				Kind: "Secret",
-				Name: "IdentitySecret",
-			},
+			Name:       "test-machine-1",
 			InstanceID: pointer.String("Instance1"),
 			Template: infrav1.CloudStackResourceIdentifier{
 				Name: GetYamlVal("CLOUDSTACK_TEMPLATE_NAME"),
@@ -303,10 +295,6 @@ func SetDummyCAPCClusterVars() {
 			Labels:    ClusterLabel,
 		},
 		Spec: infrav1.CloudStackClusterSpec{
-			IdentityRef: &infrav1.CloudStackIdentityReference{
-				Kind: "Secret",
-				Name: "IdentitySecret",
-			},
 			ControlPlaneEndpoint: clusterv1.APIEndpoint{Host: EndPointHost, Port: EndPointPort},
 			FailureDomains:       []infrav1.CloudStackFailureDomainSpec{CSFailureDomain1.Spec, CSFailureDomain2.Spec},
 		},
@@ -358,11 +346,6 @@ func SetDummyDomainAndAccount() {
 	CSCluster.Spec.Domain = DomainPath
 }
 
-// SetDummyDomainAndAccount sets domainID in the CSCluster Status. This is not the default.
-func SetDummyDomainID() {
-	CSCluster.Status.DomainID = "FakeDomainID"
-}
-
 // SetDummyCapiCluster resets the values in each of the exported CAPICluster related dummy variables.
 func SetDummyCAPIClusterVars() {
 	CAPICluster = &clusterv1.Cluster{
@@ -395,11 +378,6 @@ func SetDummyBootstrapSecretVar() {
 		Data: map[string][]byte{"value": make([]byte, 0)}}
 }
 
-// Fills in cluster status vars.
-func SetDummyClusterStatus() {
-	CSCluster.Status.LBRuleID = LBRuleID
-}
-
 // Sets cluster spec to specified network.
 func SetClusterSpecToNet(net *infrav1.Network) {
 	Zone1.Network = *net
@@ -419,7 +397,3 @@ func SetDummyCAPIMachineVars() {
 			FailureDomain: pointer.String(Zone1.ID)},
 	}
 }
-
-func SetDummyCSMachineStatuses() {
-	CSMachine1.Status = infrav1.CloudStackMachineStatus{ZoneID: Zone1.ID}
-}