Skip to content

Commit

Permalink
Fix-nutanix#86: Added use_hot_add parameter
Browse files Browse the repository at this point in the history
  • Loading branch information
@yannickstruyf3
yannickstruyf3 committed May 29, 2020
1 parent 4ea61c4 commit abb6caa
Show file tree
Hide file tree
Showing 3 changed files with 152 additions and 1 deletion.
21 changes: 20 additions & 1 deletion nutanix/resource_nutanix_virtual_machine.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,11 @@ func resourceNutanixVirtualMachine() *schema.Resource {

// RESOURCES ARGUMENTS

"use_hot_add": {
Type: schema.TypeBool,
Optional: true,
Default: true,
},
"num_vnuma_nodes": {
Type: schema.TypeInt,
Optional: true,
Expand Down Expand Up @@ -918,6 +923,12 @@ func resourceNutanixVirtualMachineRead(d *schema.ResourceData, meta interface{})
return fmt.Errorf("error setting parent_reference for Virtual Machine %s: %s", d.Id(), err)
}

//use_hot_add cannot be derived via API so get the value for 'use_hot_add'.
// if err := d.Set("use_hot_add", true); err != nil {
// if err := d.Set("use_hot_add", d.Get("use_hot_add")); err != nil {
// return fmt.Errorf("error setting use_got_add for Virtual Machine %s: %s", d.Id(), err)
// }

diskAddress := make(map[string]interface{})
mac := ""
b := make([]string, 0)
Expand Down Expand Up @@ -1005,7 +1016,15 @@ func resourceNutanixVirtualMachineRead(d *schema.ResourceData, meta interface{})
func resourceNutanixVirtualMachineUpdate(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*Client).API
setVMTimeout(meta)
var hotPlugChange = true
var hotPlugChange = d.Get("use_hot_add").(bool)

// log.Printf("[HP] hotplugchange pre: %t", hotPlugChange)

// if uha, uhaok := d.GetOk("use_hot_add"); uhaok {
// log.Printf("[HP] use_hot_add: %t", uha.(bool))
// hotPlugChange = uha.(bool)
// }
log.Printf("[HP] hotplugchange post: %t", hotPlugChange)

log.Printf("[Debug] Updating VM values %s", d.Id())

Expand Down
131 changes: 131 additions & 0 deletions nutanix/resource_nutanix_virtual_machine_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,94 @@ func testAccCheckNutanixVirtualMachineDestroy(s *terraform.State) error {
return nil
}

func TestAccNutanixVirtualMachine_hotadd(t *testing.T) {
r := acctest.RandInt()
memory_1 := 1024
memory_2 := 2048
resourceName := "nutanix_virtual_machine.vm10"
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckNutanixVirtualMachineDestroy,
Steps: []resource.TestStep{
{
Config: testAccNutanixVMConfigHotAdd(r, memory_1),
Check: resource.ComposeTestCheckFunc(
testAccCheckNutanixVirtualMachineExists(resourceName),
resource.TestCheckResourceAttr(resourceName, "hardware_clock_timezone", "UTC"),
resource.TestCheckResourceAttr(resourceName, "power_state", "ON"),
resource.TestCheckResourceAttr(resourceName, "memory_size_mib", "1024"),
resource.TestCheckResourceAttr(resourceName, "num_sockets", "1"),
resource.TestCheckResourceAttr(resourceName, "num_vcpus_per_socket", "1"),
resource.TestCheckResourceAttr(resourceName, "use_hot_add", "true"),
),
},
{
Config: testAccNutanixVMConfigHotAdd(r, memory_2),
Check: resource.ComposeTestCheckFunc(
testAccCheckNutanixVirtualMachineExists(resourceName),
resource.TestCheckResourceAttr(resourceName, "hardware_clock_timezone", "UTC"),
resource.TestCheckResourceAttr(resourceName, "power_state", "ON"),
resource.TestCheckResourceAttr(resourceName, "memory_size_mib", "2048"),
resource.TestCheckResourceAttr(resourceName, "num_sockets", "1"),
resource.TestCheckResourceAttr(resourceName, "num_vcpus_per_socket", "1"),
resource.TestCheckResourceAttr(resourceName, "use_hot_add", "true"),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
ImportStateVerifyIgnore: []string{"disk_list"},
},
},
})
}

func TestAccNutanixVirtualMachine_nohotadd(t *testing.T) {
r := acctest.RandInt()
memory_1 := 1024
memory_2 := 2048
resourceName := "nutanix_virtual_machine.vm10"
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckNutanixVirtualMachineDestroy,
Steps: []resource.TestStep{
{
Config: testAccNutanixVMConfigNoHotAdd(r, memory_1),
Check: resource.ComposeTestCheckFunc(
testAccCheckNutanixVirtualMachineExists(resourceName),
resource.TestCheckResourceAttr(resourceName, "hardware_clock_timezone", "UTC"),
resource.TestCheckResourceAttr(resourceName, "power_state", "ON"),
resource.TestCheckResourceAttr(resourceName, "memory_size_mib", "1024"),
resource.TestCheckResourceAttr(resourceName, "num_sockets", "1"),
resource.TestCheckResourceAttr(resourceName, "num_vcpus_per_socket", "1"),
resource.TestCheckResourceAttr(resourceName, "use_hot_add", "false"),
),
},
{
Config: testAccNutanixVMConfigNoHotAdd(r, memory_2),
Check: resource.ComposeTestCheckFunc(
testAccCheckNutanixVirtualMachineExists(resourceName),
resource.TestCheckResourceAttr(resourceName, "hardware_clock_timezone", "UTC"),
resource.TestCheckResourceAttr(resourceName, "power_state", "ON"),
resource.TestCheckResourceAttr(resourceName, "memory_size_mib", "2048"),
resource.TestCheckResourceAttr(resourceName, "num_sockets", "1"),
resource.TestCheckResourceAttr(resourceName, "num_vcpus_per_socket", "1"),
resource.TestCheckResourceAttr(resourceName, "use_hot_add", "false"),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
ImportStateVerifyIgnore: []string{"disk_list", "use_hot_add"},
},
},
})
}

func testAccNutanixVMConfig(r int) string {
return fmt.Sprintf(`
data "nutanix_clusters" "clusters" {}
Expand Down Expand Up @@ -830,3 +918,46 @@ func testAccNutanixVMConfigCloningVM(r int) string {
}
`, r)
}
func testAccNutanixVMConfigHotAdd(r, memory int) string {
return fmt.Sprintf(`
data "nutanix_clusters" "clusters" {}
locals {
cluster1 = "${data.nutanix_clusters.clusters.entities.0.service_list.0 == "PRISM_CENTRAL"
? data.nutanix_clusters.clusters.entities.1.metadata.uuid : data.nutanix_clusters.clusters.entities.0.metadata.uuid}"
}
resource "nutanix_virtual_machine" "vm10" {
name = "test-dou-%d"
cluster_uuid = "${local.cluster1}"
num_vcpus_per_socket = 1
num_sockets = 1
memory_size_mib = %d
power_state_mechanism = "ACPI"
use_hot_add = true
}
`, r, memory)
}

func testAccNutanixVMConfigNoHotAdd(r, memory int) string {
return fmt.Sprintf(`
data "nutanix_clusters" "clusters" {}
locals {
cluster1 = "${data.nutanix_clusters.clusters.entities.0.service_list.0 == "PRISM_CENTRAL"
? data.nutanix_clusters.clusters.entities.1.metadata.uuid : data.nutanix_clusters.clusters.entities.0.metadata.uuid}"
}
resource "nutanix_virtual_machine" "vm10" {
name = "test-dou-%[1]d"
cluster_uuid = "${local.cluster1}"
num_vcpus_per_socket = 1
num_sockets = 1
memory_size_mib = %[2]d
power_state_mechanism = "ACPI"
use_hot_add = false
}
`, r, memory)
}
1 change: 1 addition & 0 deletions website/docs/r/virtual_machine.html.markdown
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ The following arguments are supported:
* `power_state_mechanism`: - (Optional) Indicates the mechanism guiding the VM power state transition. Currently used for the transition to \"OFF\" state. Power state mechanism (ACPI/GUEST/HARD).
* `vga_console_enabled`: - (Optional) Indicates whether VGA console should be enabled or not.
* `disk_list` Disks attached to the VM.
* `use_hot_add`: - (Optional) Use Hot Add when modifying VM resources. Passing value false will result in VM reboots. Default value is true.

### Disk List

Expand Down

0 comments on commit abb6caa

Please sign in to comment.