Added network tagging to controller

Author: mrog

pkg/cloud/network.go

@@ -59,8 +59,18 @@ func (c *client) ResolveNetwork(csCluster *infrav1.CloudStackCluster) (retErr er
 }
 
 func (c *client) GetOrCreateNetwork(csCluster *infrav1.CloudStackCluster) (retErr error) {
+	// Tag the network so we can clean it up later
+	tagNetwork := func(csCluster *infrav1.CloudStackCluster, createdByCapc bool) error {
+		clusterTag := "CAPC_cluster_" + string(csCluster.UID)
+		tags := map[string]string{clusterTag: "1"}
+		if createdByCapc {
+			tags["created_by_CAPC"] = "1"
+		}
+		return c.AddNetworkTags(csCluster.Status.NetworkID, tags)
+	}
+
 	if retErr = c.ResolveNetwork(csCluster); retErr == nil { // Found network.
-		return nil
+		return tagNetwork(csCluster, false)
 	} else if !strings.Contains(retErr.Error(), "No match found") { // Some other error.
 		return retErr
 	} // Network not found.
@@ -86,7 +96,7 @@ func (c *client) GetOrCreateNetwork(csCluster *infrav1.CloudStackCluster) (retEr
 	csCluster.Status.NetworkID = resp.Id
 	csCluster.Status.NetworkType = resp.Type
 
-	return nil
+	return tagNetwork(csCluster, true)
 }
 
 func (c *client) ResolvePublicIPDetails(csCluster *infrav1.CloudStackCluster) (*cloudstack.PublicIpAddress, error) {

pkg/cloud/tags.go

@@ -17,15 +17,15 @@ limitations under the License.
 package cloud
 
 type TagIFace interface {
-	TagNetwork(string, map[string]string) error
+	AddNetworkTags(string, map[string]string) error
 	GetNetworkTags(string) (map[string]string, error)
 	DeleteNetworkTags(string, map[string]string) error
 }
 
 const resourceTypeNetwork = "network"
 
 // TagNetwork adds tags to a network by network id.
-func (c *client) TagNetwork(networkId string, tags map[string]string) error {
+func (c *client) AddNetworkTags(networkId string, tags map[string]string) error {
 	// https://cloudstack.apache.org/api/apidocs-4.16/apis/createTags.html
 	p := c.cs.Resourcetags.NewCreateTagsParams([]string{networkId}, resourceTypeNetwork, tags)
 	_, err := c.cs.Resourcetags.CreateTags(p)

pkg/cloud/tags_test.go

@@ -37,12 +37,13 @@ var _ = Describe("Tag Unit Tests", func() {
 		client, connectionErr := cloud.NewClient("../../cloud-config")
 
 		const (
-			tagKey   = "TestTag"
-			tagValue = "ArbitraryValue"
+			tagKey   = "test_tag"
+			tagValue = "arbitrary_value"
 		)
 
 		var (
 			networkId string
+			testTags  map[string]string
 		)
 
 		BeforeEach(func() {
@@ -55,13 +56,13 @@ var _ = Describe("Tag Unit Tests", func() {
 			}
 
 			networkId = cluster.Status.NetworkID
+			testTags = map[string]string{tagKey: tagValue}
 		})
 
 		It("Tags a network with an arbitrary tag.", func() {
-			tags := map[string]string{tagKey: tagValue}
 			// Delete the tag if it already exists from a prior test run, otherwise the test will fail.
-			_ = client.DeleteNetworkTags(networkId, tags)
-			Ω(client.TagNetwork(networkId, tags)).Should(Succeed())
+			_ = client.DeleteNetworkTags(networkId, testTags)
+			Ω(client.AddNetworkTags(networkId, testTags)).Should(Succeed())
 		})
 
 		It("Fetches said tag.", func() {
@@ -71,7 +72,7 @@ var _ = Describe("Tag Unit Tests", func() {
 		})
 
 		It("Deletes said tag.", func() {
-			Ω(client.DeleteNetworkTags(networkId, map[string]string{tagKey: tagValue})).Should(Succeed())
+			Ω(client.DeleteNetworkTags(networkId, testTags)).Should(Succeed())
 			remainingTags, err := client.GetNetworkTags(networkId)
 			Ω(err).Should(BeNil())
 			Ω(remainingTags[tagKey]).Should(Equal(""))