feat: added storage_config attribute in the data source, and created …

…test case and doc
nutanix · Jun 10, 2020 · f14d392 · f14d392
1 parent 58597b7
commit f14d392
Show file tree

Hide file tree

Showing 3 changed files with 121 additions and 6 deletions.
diff --git a/nutanix/data_source_nutanix_virtual_machine.go b/nutanix/data_source_nutanix_virtual_machine.go
@@ -522,6 +522,43 @@ func dataSourceNutanixVirtualMachine() *schema.Resource {
 							Type:     schema.TypeInt,
 							Computed: true,
 						},
+						"storage_config": {
+							Type:     schema.TypeList,
+							Computed: true,
+							MaxItems: 1,
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"flash_mode": {
+										Type:     schema.TypeString,
+										Computed: true,
+									},
+									"storage_container_reference": {
+										Type:     schema.TypeList,
+										Computed: true,
+										Elem: &schema.Resource{
+											Schema: map[string]*schema.Schema{
+												"url": {
+													Type:     schema.TypeString,
+													Computed: true,
+												},
+												"kind": {
+													Type:     schema.TypeString,
+													Computed: true,
+												},
+												"name": {
+													Type:     schema.TypeString,
+													Computed: true,
+												},
+												"uuid": {
+													Type:     schema.TypeString,
+													Computed: true,
+												},
+											},
+										},
+									},
+								},
+							},
+						},
 						"device_properties": {
 							Type:     schema.TypeList,
 							Computed: true,
@@ -570,7 +607,6 @@ func dataSourceNutanixVirtualMachine() *schema.Resource {
 								},
 							},
 						},
-
 						"volume_group_reference": {
 							Type:     schema.TypeMap,
 							Computed: true,
@@ -665,6 +701,9 @@ func dataSourceNutanixVirtualMachineRead(d *schema.ResourceData, meta interface{
 	if err := d.Set("parent_reference", flattenReferenceValues(resp.Status.Resources.ParentReference)); err != nil {
 		return err
 	}
+	if err := d.Set("disk_list", flattenDiskList(resp.Status.Resources.DiskList)); err != nil {
+		return err
+	}
 
 	diskAddress := make(map[string]interface{})
 	mac := ""
@@ -753,7 +792,7 @@ func dataSourceNutanixVirtualMachineRead(d *schema.ResourceData, meta interface{
 	d.Set("vga_console_enabled", utils.BoolValue(resp.Status.Resources.VgaConsoleEnabled))
 	d.SetId(utils.StringValue(resp.Metadata.UUID))
 
-	return d.Set("disk_list", setDiskList(resp.Status.Resources.DiskList, resp.Status.Resources.GuestCustomization))
+	return nil
 }
 
 func resourceDatasourceVirtualMachineInstanceStateUpgradeV0(is map[string]interface{}, meta interface{}) (map[string]interface{}, error) {

diff --git a/nutanix/data_source_nutanix_virtual_machine_test.go b/nutanix/data_source_nutanix_virtual_machine_test.go
@@ -44,6 +44,70 @@ func TestAccNutanixVirtualMachineDataSource_WithDisk(t *testing.T) {
 	})
 }
 
+func TestAccNutanixVirtualMachineDataSource_withDiskContainer(t *testing.T) {
+	datasourceName := "data.nutanix_virtual_machine.nutanix_virtual_machine"
+	vmName := acctest.RandomWithPrefix("test-dou-vm")
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:  func() { testAccPreCheck(t) },
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccVMDataSourceWithDiskContainer(vmName),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrSet(datasourceName, "vm_id"),
+					resource.TestCheckResourceAttrSet(datasourceName, "disk_list.#"),
+					resource.TestCheckResourceAttrSet(datasourceName, "disk_list.0.disk_size_bytes"),
+					resource.TestCheckResourceAttrSet(datasourceName, "disk_list.0.disk_size_mib"),
+					resource.TestCheckResourceAttrSet(datasourceName, "disk_list.0.storage_config.#"),
+					resource.TestCheckResourceAttrSet(datasourceName, "disk_list.0.storage_config.0.storage_container_reference.#"),
+					resource.TestCheckResourceAttrSet(datasourceName, "disk_list.0.storage_config.0.storage_container_reference.0.kind"),
+					resource.TestCheckResourceAttrSet(datasourceName, "disk_list.0.storage_config.0.storage_container_reference.0.uuid"),
+					resource.TestCheckResourceAttrSet(datasourceName, "disk_list.0.storage_config.0.storage_container_reference.0.name"),
+				),
+			},
+		},
+	})
+}
+
+func testAccVMDataSourceWithDiskContainer(vmName string) string {
+	return fmt.Sprintf(`
+		data "nutanix_clusters" "clusters" {}
+
+		locals {
+			cluster1 = [
+				for cluster in data.nutanix_clusters.clusters.entities :
+				cluster.metadata.uuid if cluster.service_list[0] != "PRISM_CENTRAL"
+			][0]
+		}
+
+		resource "nutanix_virtual_machine" "vm-disk" {
+			name                 = "%s"
+			cluster_uuid         = local.cluster1
+			num_vcpus_per_socket = 1
+			num_sockets          = 1
+			memory_size_mib      = 186
+
+			disk_list {
+				# disk_size_mib = 300
+				disk_size_bytes = 68157440
+				disk_size_mib   = 65
+
+				storage_config {
+					storage_container_reference {
+						kind = "storage_container"
+						uuid = "2bbe77bc-fd14-4697-8de1-6369757f9219"
+					}
+				}
+			}
+		}
+
+		data "nutanix_virtual_machine" "nutanix_virtual_machine" {
+			vm_id = nutanix_virtual_machine.vm-disk.id
+		}
+	`, vmName)
+}
+
 func testAccVMDataSourceConfig(r int) string {
 	return fmt.Sprintf(`
 data "nutanix_clusters" "clusters" {}
@@ -72,25 +136,25 @@ data "nutanix_virtual_machine" "nutanix_virtual_machine" {
 func testAccVMDataSourceConfigWithDisk(r 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_image" "cirros-034-disk" {
 		name        = "test-image-dou-vm-create-%[1]d"
 		source_uri  = "http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img"
 		description = "heres a tiny linux image, not an iso, but a real disk!"
 	}
-	
+
 	resource "nutanix_virtual_machine" "vm1" {
 	  name = "test-dou-vm-%[1]d"
 	  cluster_uuid = "${local.cluster1}"
 	  num_vcpus_per_socket = 1
 	  num_sockets          = 1
 	  memory_size_mib      = 186
-	
+
 		disk_list {
 			data_source_reference = {
 				kind = "image"

diff --git a/website/docs/d/virtual_machine.html.markdown b/website/docs/d/virtual_machine.html.markdown
@@ -109,6 +109,18 @@ The device_properties attribute supports the following.
 * `device_type`: - A Disk type (default: DISK).
 * `disk_address`: - Address of disk to boot from.
 
+### Storage Config
+User inputs of storage configuration parameters for VMs.
+
+* `flash_mode`: - State of the storage policy to pin virtual disks to the hot tier. When specified as a VM attribute, the storage policy applies to all virtual disks of the VM unless overridden by the same attribute specified for a virtual disk.
+
+* `storage_container_reference`: - Reference to a kind. Either one of (kind, uuid) or url needs to be specified.
+* `storage_container_reference.#.url`: - GET query on the URL will provide information on the source.
+* `storage_container_reference.#.kind`: - kind of the container reference
+* `storage_container_reference.#.name`: - name of the container reference
+* `storage_container_reference.#.uuid`: - uiid of the container reference
+
+
 ### Sysprep
 
 The guest_customization_sysprep attribute supports the following: