B #589: Fix tag settings for reservations (#607)

* Fix tag settings for reservations
* B #589: Override inherited tags from reservation_vnet
* B #589: Add inherited tag test case

---------

Signed-off-by: Jaime Conchello <jconchello@opennebula.io>
Co-authored-by: Dorian Jolivald <dorian.jolivald@true.nl>

Author: jaimecb

opennebula/resource_opennebula_virtual_network.go

@@ -483,6 +483,42 @@ func resourceOpennebulaVirtualNetworkCreate(ctx context.Context, d *schema.Resou
 			return diags
 		}
 
+		update := false
+		vnTemplate := vnet.Template
+		if tags, ok := d.Get("tags").(map[string]interface{}); ok {
+			for k, v := range tags {
+				update = true
+				key := strings.ToUpper(k)
+				p, _ := vnTemplate.GetPair(key)
+				if p != nil {
+					vnTemplate.Del(key)
+				}
+				vnTemplate.AddPair(key, v)
+			}
+		}
+		// add default tags if they aren't overriden
+		if len(config.defaultTags) > 0 {
+			for k, v := range config.defaultTags {
+				update = true
+				key := strings.ToUpper(k)
+				p, _ := vnTemplate.GetPair(key)
+				if p != nil {
+					continue
+				}
+				vnTemplate.AddPair(key, v)
+			}
+		}
+		if update {
+			err := vnc.Update(vnTemplate.String(), parameters.Replace)
+			if err != nil {
+				diags = append(diags, diag.Diagnostic{
+					Severity: diag.Error,
+					Summary:  "Failed to update content",
+					Detail:   fmt.Sprintf("virtual network (ID: %s): %s", d.Id(), err),
+				})
+				return diags
+			}
+		}
 		d.SetId(fmt.Sprintf("%v", vnet.ID))
 
 		log.Printf("[DEBUG] New VNET reservation ID: %d", vnet.ID)

opennebula/resource_opennebula_virtual_network_test.go

@@ -195,6 +195,8 @@ func TestAccVirtualNetwork(t *testing.T) {
 					resource.TestCheckResourceAttr("opennebula_virtual_network.reservation1", "reservation_size", "5"),
 					resource.TestCheckResourceAttr("opennebula_virtual_network.reservation1", "reservation_first_ip", "172.16.100.115"),
 					resource.TestCheckResourceAttr("opennebula_virtual_network.reservation1", "permissions", "660"),
+					resource.TestCheckResourceAttr("opennebula_virtual_network.reservation1", "tags.MY_TAG", "tag_value"),
+					resource.TestCheckResourceAttr("opennebula_virtual_network.reservation1", "tags.environment", "DEV"),
 					resource.TestCheckResourceAttrSet("opennebula_virtual_network.reservation1", "uid"),
 					resource.TestCheckResourceAttrSet("opennebula_virtual_network.reservation1", "gid"),
 					resource.TestCheckResourceAttrSet("opennebula_virtual_network.reservation1", "uname"),
@@ -544,6 +546,10 @@ var testAccVirtualNetworkReservationConfig = `
 	  permissions = "660"
 	  group = "users"
 
+ 	  tags = {
+	    environment = "example"
+	    app = "test_app"
+ 	  }
 	  lifecycle {
 	    ignore_changes = [ar, hold_ips]
 	  }
@@ -579,14 +585,18 @@ var testAccVirtualNetworkReservationConfig = `
 	}
 
 	resource "opennebula_virtual_network" "reservation1" {
-	    name = "terravnetres"
-	    description = "my terraform vnet"
-	    reservation_vnet = opennebula_virtual_network.test.id
-	    reservation_size = 5
+		name = "terravnetres"
+		description = "my terraform vnet"
+		reservation_vnet = opennebula_virtual_network.test.id
+		reservation_size = 5
 		reservation_ar_id = opennebula_virtual_network_address_range.test.id
 		reservation_first_ip = "172.16.100.115"
-	    security_groups = [0]
-	    permissions = 660
+		security_groups = [0]
+		permissions = 660
+		tags = {
+			MY_TAG = "tag_value"
+			environment = "DEV"
+		}
 	}
 
 	resource "opennebula_virtual_network" "reservation2" {