B #464: VM: add and share raw section

OpenNebula · Jul 19, 2023 · c25dcd3 · c25dcd3
1 parent cd053b5
commit c25dcd3
Show file tree

Hide file tree

Showing 5 changed files with 148 additions and 160 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@ FEATURES:
 
 * **New Resource**: `opennebula_user_quotas` (#448)
 * **New Resource**: `opennebula_group_quotas` (#447)
+* resources/opennebula_virtual_machine: add `raw` section and share its code with `opennebula_template` resource. (#464)
 
 DEPRECATION:
 

diff --git a/opennebula/resource_opennebula_template.go b/opennebula/resource_opennebula_template.go
@@ -58,36 +58,6 @@ func commonTemplateSchemas() map[string]*schema.Schema {
 				},
 			},
 			"disk": diskSchema(),
-			"raw": {
-				Type:        schema.TypeList,
-				Optional:    true,
-				MaxItems:    1,
-				Description: "Low-level hypervisor tuning",
-				Elem: &schema.Resource{
-					Schema: map[string]*schema.Schema{
-						"type": {
-							Type:     schema.TypeString,
-							Required: true,
-							ValidateFunc: func(v interface{}, k string) (ws []string, errors []error) {
-								validtypes := []string{"kvm", "lxd", "vmware"}
-								value := v.(string)
-
-								if inArray(value, validtypes) < 0 {
-									errors = append(errors, fmt.Errorf("Type %q must be one of: %s", k, strings.Join(validtypes, ",")))
-								}
-
-								return
-							},
-							Description: "Name of the hypervisor: kvm, lxd, vmware",
-						},
-						"data": {
-							Type:        schema.TypeString,
-							Required:    true,
-							Description: "Low-level data to pass to the hypervisor",
-						},
-					},
-				},
-			},
 			"reg_time": {
 				Type:        schema.TypeInt,
 				Computed:    true,
@@ -475,32 +445,6 @@ func resourceOpennebulaTemplateReadCustom(ctx context.Context, d *schema.Resourc
 		diags = append(diags, diag)
 	}
 
-	rawVec, _ := tpl.Template.GetVector("RAW")
-	if rawVec != nil {
-
-		rawMap := make([]map[string]interface{}, 0, 1)
-
-		hypType, _ := rawVec.GetStr("TYPE")
-		data, _ := rawVec.GetStr("DATA")
-
-		rawMap = append(rawMap, map[string]interface{}{
-			"type": hypType,
-			"data": data,
-		})
-
-		if _, ok := d.GetOk("raw"); ok {
-			err = d.Set("raw", rawMap)
-			if err != nil {
-				diags = append(diags, diag.Diagnostic{
-					Severity: diag.Error,
-					Summary:  "Failed to set attribute",
-					Detail:   fmt.Sprintf("template (ID: %s): %s", d.Id(), err),
-				})
-				return diags
-			}
-		}
-	}
-
 	if tpl.LockInfos != nil {
 		d.Set("lock", LockLevelToString(tpl.LockInfos.Locked))
 	}
@@ -714,50 +658,11 @@ func resourceOpennebulaTemplateUpdateCustom(ctx context.Context, d *schema.Resou
 	}
 
 	if d.HasChange("raw") {
-		newTpl.Del("RAW")
-
-		raw := d.Get("raw").([]interface{})
-		if len(raw) > 0 {
-			for i := 0; i < len(raw); i++ {
-				rawConfig := raw[i].(map[string]interface{})
-				rawVec := newTpl.AddVector("RAW")
-				rawVec.AddPair("TYPE", rawConfig["type"].(string))
-				rawVec.AddPair("DATA", rawConfig["data"].(string))
-			}
-		}
-	}
-
-	if d.HasChange("sched_requirements") {
-		schedRequirements := d.Get("sched_requirements").(string)
-
-		if len(schedRequirements) > 0 {
-			newTpl.Placement(vmk.SchedRequirements, schedRequirements)
-		} else {
-			newTpl.Del(string(vmk.SchedRequirements))
-		}
-		update = true
-	}
-
-	if d.HasChange("sched_ds_requirements") {
-		schedDSRequirements := d.Get("sched_ds_requirements").(string)
-
-		if len(schedDSRequirements) > 0 {
-			newTpl.Placement(vmk.SchedDSRequirements, schedDSRequirements)
-		} else {
-			newTpl.Del(string(vmk.SchedDSRequirements))
-		}
+		updateRaw(d, &newTpl.Template)
 		update = true
 	}
 
-	if d.HasChange("description") {
-		newTpl.Del(string(vmk.Description))
-
-		description := d.Get("description").(string)
-
-		if len(description) > 0 {
-			newTpl.Add(vmk.Description, description)
-		}
-
+	if updateTemplate(d, &newTpl) {
 		update = true
 	}
 
@@ -813,13 +718,6 @@ func resourceOpennebulaTemplateUpdateCustom(ctx context.Context, d *schema.Resou
 		update = true
 	}
 
-	if d.HasChange("template_section") {
-
-		updateTemplateSection(d, &newTpl.Template)
-
-		update = true
-	}
-
 	if d.HasChange("tags") {
 
 		oldTagsIf, newTagsIf := d.GetChange("tags")
@@ -1002,15 +900,6 @@ func generateTemplate(d *schema.ResourceData, meta interface{}) (*vm.Template, e
 		return nil, err
 	}
 
-	//Generate RAW definition
-	raw := d.Get("raw").([]interface{})
-	for i := 0; i < len(raw); i++ {
-		rawConfig := raw[i].(map[string]interface{})
-		rawVec := tpl.AddVector("RAW")
-		rawVec.AddPair("TYPE", rawConfig["type"].(string))
-		rawVec.AddPair("DATA", rawConfig["data"].(string))
-	}
-
 	// add default tags if they aren't overriden
 	config := meta.(*Configuration)
 

diff --git a/opennebula/resource_opennebula_virtual_machine.go b/opennebula/resource_opennebula_virtual_machine.go
@@ -1225,45 +1225,7 @@ func resourceOpennebulaVirtualMachineUpdateCustom(ctx context.Context, d *schema
 		},
 	}
 
-	if d.HasChange("sched_requirements") {
-		schedRequirements := d.Get("sched_requirements").(string)
-
-		if len(schedRequirements) > 0 {
-			tpl.Placement(vmk.SchedRequirements, schedRequirements)
-		} else {
-			tpl.Del(string(vmk.SchedRequirements))
-		}
-		update = true
-	}
-
-	if d.HasChange("sched_ds_requirements") {
-		schedDSRequirements := d.Get("sched_ds_requirements").(string)
-
-		if len(schedDSRequirements) > 0 {
-			tpl.Placement(vmk.SchedDSRequirements, schedDSRequirements)
-		} else {
-			tpl.Del(string(vmk.SchedDSRequirements))
-		}
-		update = true
-	}
-
-	if d.HasChange("description") {
-
-		tpl.Del(string(vmk.Description))
-
-		description := d.Get("description").(string)
-
-		if len(description) > 0 {
-			tpl.Add(vmk.Description, description)
-		}
-
-		update = true
-	}
-
-	if d.HasChange("template_section") {
-
-		updateTemplateSection(d, &tpl.Template)
-
+	if updateTemplate(d, tpl) {
 		update = true
 	}
 
@@ -1503,6 +1465,11 @@ func resourceOpennebulaVirtualMachineUpdateCustom(ctx context.Context, d *schema
 		}
 	}
 
+	if d.HasChange("raw") {
+		updateRaw(d, &tpl.Template)
+		updateConf = true
+	}
+
 	if d.HasChange("cpu") || d.HasChange("vcpu") || d.HasChange("memory") {
 
 		timeout := time.Duration(d.Get("timeout").(int)) * time.Minute