Merge pull request nutanix#53 from nutanix/develop

Develop
yannickstruyf3 · May 15, 2018 · eaeb4c6 · eaeb4c6
2 parents c740abd + 5531f94
commit eaeb4c6
Show file tree

Hide file tree

Showing 7 changed files with 360 additions and 70 deletions.
diff --git a/client/v3/v3_structs.go b/client/v3/v3_structs.go
@@ -1186,13 +1186,26 @@ type ClusterNodes struct {
 	HypervisorServerList []*HypervisorServer `json:"hypervisor_server_list,omitempty"`
 }
 
+// SoftwareMapValues ...
+type SoftwareMapValues struct {
+	SoftwareType *string `json:"software_type,omitempty"`
+	Status       *string `json:"status,omitempty"`
+	Version      *string `json:"version,omitempty"`
+}
+
+// SoftwareMap ...
+type SoftwareMap struct {
+	NCC *SoftwareMapValues `json:"ncc,omitempty"`
+	NOS *SoftwareMapValues `json:"nos,omitempty"`
+}
+
 // ClusterConfig ...
 type ClusterConfig struct {
 	GpuDriverVersion              *string                    `json:"gpu_driver_version,omitempty"`
 	ClientAuth                    *ClientAuth                `json:"client_auth,omitempty"`
 	AuthorizedPublicKeyList       []*PublicKey               `json:"authorized_public_key_list,omitempty"`
-	SoftwareMap                   map[string]interface{}     `json:"software_map,omitempty"`
-	EncryptionStatus              map[string]interface{}     `json:"encryption_status,omitempty"`
+	SoftwareMap                   *SoftwareMap               `json:"software_map,omitempty"`
+	EncryptionStatus              *string                    `json:"encryption_status,omitempty"`
 	SslKey                        *SslKey                    `json:"ssl_key,omitempty"`
 	ServiceList                   []*string                  `json:"service_list,omitempty"`
 	SupportedInformationVerbosity *string                    `json:"supported_information_verbosity,omitempty"`
@@ -1305,7 +1318,7 @@ type ConfigClusterSpec struct {
 	ClientAuth                    *ClientAuth                 `json:"client_auth,omitempty"`
 	AuthorizedPublicKeyList       []*PublicKey                `json:"authorized_public_key_list,omitempty"`
 	SoftwareMap                   map[string]interface{}      `json:"software_map,omitempty"`
-	EncryptionStatus              map[string]interface{}      `json:"encryption_status,omitempty"`
+	EncryptionStatus              string                      `json:"encryption_status,omitempty"`
 	RedundancyFactor              *int64                      `json:"redundancy_factor,omitempty"`
 	CertificationSigningInfo      *CertificationSigningInfo   `json:"certification_signing_info,omitempty"`
 	SupportedInformationVerbosity *string                     `json:"supported_information_verbosity,omitempty"`
@@ -1385,9 +1398,18 @@ type Credentials struct {
 	Password *string `json:"password,omitempty"`
 }
 
+// VMEfficiencyMap ...
+type VMEfficiencyMap struct {
+	BullyVMNum           *string `json:"bully_vm_num,omitempty"`
+	ConstrainedVMNum     *string `json:"constrained_vm_num,omitempty"`
+	DeadVMNum            *string `json:"dead_vm_num,omitempty"`
+	InefficientVMNum     *string `json:"inefficient_vm_num,omitempty"`
+	OverprovisionedVMNum *string `json:"overprovisioned_vm_num,omitempty"`
+}
+
 // ClusterAnalysis ...
 type ClusterAnalysis struct {
-	VMEfficiencyMap map[string]interface{} `json:"vm_efficiency_map,omitempty"`
+	VMEfficiencyMap *VMEfficiencyMap `json:"vm_efficiency_map,omitempty"`
 }
 
 //CategoryListMetadata All api calls that return a list will have this metadata block as input

diff --git a/examples/main.tf b/examples/main.tf
@@ -6,8 +6,14 @@ provider "nutanix" {
   port     = 9440
 }
 
-variable clusterid {
-  default = "000567f3-1921-c722-471d-0cc47ac31055"
+data "nutanix_clusters" "clusters" {
+  metadata = {
+    length = 3
+  }
+}
+
+output "cluster" {
+  value = "${data.nutanix_clusters.clusters.entities.2.metadata.uuid}"
 }
 
 resource "nutanix_virtual_machine" "vm1" {
@@ -20,7 +26,7 @@ resource "nutanix_virtual_machine" "vm1" {
 
   cluster_reference = {
     kind = "cluster"
-    uuid = "${var.clusterid}"
+    uuid = "${data.nutanix_clusters.clusters.entities.2.metadata.uuid}"
   }
 
   num_vcpus_per_socket = 1
@@ -51,7 +57,7 @@ resource "nutanix_virtual_machine" "vm2" {
 
   cluster_reference = {
     kind = "cluster"
-    uuid = "${var.clusterid}"
+    uuid = "${data.nutanix_clusters.clusters.entities.2.metadata.uuid}"
   }
 
   num_vcpus_per_socket = 1
@@ -82,7 +88,7 @@ resource "nutanix_subnet" "test" {
 
   cluster_reference = {
     kind = "cluster"
-    uuid = "${var.clusterid}"
+    uuid = "${data.nutanix_clusters.clusters.entities.2.metadata.uuid}"
   }
 
   vlan_id     = 201

diff --git a/examples/terraform-provider-nutanix b/examples/terraform-provider-nutanix