Fixup tests

Author: Joshua Reed

pkg/cloud/cluster.go

@@ -93,7 +93,15 @@ func (c *client) GetOrCreateCluster(csCluster *infrav1.CloudStackCluster) (retEr
 }
 
 func (c *client) DisposeClusterResources(csCluster *infrav1.CloudStackCluster) (retError error) {
-	for _, zone := range csCluster.Spec.Zones {
+	if csCluster.Status.PublicIPID != "" {
+		if err := c.DeleteClusterTag(ResourceTypeIPAddress, csCluster.Status.PublicIPID, csCluster); err != nil {
+			return err
+		}
+		if err := c.DisassociatePublicIPAddressIfNotInUse(csCluster); err != nil {
+			return err
+		}
+	}
+	for _, zone := range csCluster.Status.Zones {
 		if err := c.RemoveClusterTagFromNetwork(csCluster, zone.Network); err != nil {
 			return err
 		}

pkg/cloud/instance.go

@@ -147,6 +147,7 @@ func (c *client) GetOrCreateVMInstance(
 		!strings.Contains(strings.ToLower(err.Error()), "no match") {
 		return err
 	}
+
 	offeringID, err := c.ResolveServiceOffering(csMachine)
 	if err != nil {
 		return err

pkg/cloud/instance_test.go

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

pkg/cloud/network.go

@@ -31,7 +31,7 @@ type NetworkIface interface {
 	ResolveNetwork(*capcv1.CloudStackCluster, *capcv1.Network) error
 	CreateIsolatedNetwork(*capcv1.CloudStackCluster) error
 	OpenFirewallRules(*capcv1.CloudStackCluster) error
-	ResolvePublicIPDetails(*capcv1.CloudStackCluster) (*cloudstack.PublicIpAddress, error)
+	FetchPublicIP(*capcv1.CloudStackCluster) (*cloudstack.PublicIpAddress, error)
 	ResolveLoadBalancerRuleDetails(*capcv1.CloudStackCluster) error
 	GetOrCreateLoadBalancerRule(*capcv1.CloudStackCluster) error
 	GetOrCreateIsolatedNetwork(*capcv1.CloudStackCluster) error
@@ -134,19 +134,17 @@ func (c *client) CreateIsolatedNetwork(csCluster *capcv1.CloudStackCluster) (ret
 	if err != nil {
 		return err
 	}
-	if err := c.AddClusterTag(ResourceTypeNetwork, zoneStatus.Network.ID, csCluster); err != nil {
-		return err
-	}
-	if err := c.AddCreatedByCAPCTag(ResourceTypeNetwork, zoneStatus.Network.ID); err != nil {
-		return err
-	}
 
 	// Update Zone/Network status accordingly.
 	netStatus.ID = resp.Id
 	netStatus.Type = resp.Type
 	zoneStatus.Network = netStatus
 	csCluster.Status.Zones[zoneStatus.Name] = zoneStatus
 
+	if err := c.AddCreatedByCAPCTag(ResourceTypeNetwork, zoneStatus.Network.ID); err != nil {
+		return err
+	}
+
 	return nil
 }
 
@@ -201,7 +199,7 @@ func (c *client) DeleteNetworkIfNotInUse(csCluster *capcv1.CloudStackCluster, ne
 	return nil
 }
 
-func (c *client) ResolvePublicIPDetails(csCluster *capcv1.CloudStackCluster) (*cloudstack.PublicIpAddress, error) {
+func (c *client) FetchPublicIP(csCluster *capcv1.CloudStackCluster) (*cloudstack.PublicIpAddress, error) {
 	ip := csCluster.Spec.ControlPlaneEndpoint.Host
 
 	zoneStatus := csCluster.Status.Zones.GetOne()
@@ -234,7 +232,7 @@ func (c *client) ResolvePublicIPDetails(csCluster *capcv1.CloudStackCluster) (*c
 
 // AssociatePublicIPAddress Gets a PublicIP and associates it.
 func (c *client) AssociatePublicIPAddress(csCluster *capcv1.CloudStackCluster) (retErr error) {
-	publicAddress, err := c.ResolvePublicIPDetails(csCluster)
+	publicAddress, err := c.FetchPublicIP(csCluster)
 	if err != nil {
 		return err
 	}
@@ -379,11 +377,19 @@ func (c *client) GetOrCreateIsolatedNetwork(csCluster *capcv1.CloudStackCluster)
 			return err
 		}
 	}
+	networkID := csCluster.Status.Zones.GetOne().Network.ID
+	if err := c.AddClusterTag(ResourceTypeNetwork, networkID, csCluster); err != nil {
+		return err
+	}
 
 	if csCluster.Status.PublicIPID == "" { // Don't try to get public IP again it's already been fetched.
 		if err := c.AssociatePublicIPAddress(csCluster); err != nil {
 			return err
 		}
+		// Add created by CAPC tag to public IP.
+		if err := c.AddCreatedByCAPCTag(ResourceTypeIPAddress, csCluster.Status.PublicIPID); err != nil {
+			return err
+		}
 	}
 	if err := c.GetOrCreateLoadBalancerRule(csCluster); err != nil {
 		return err