remove unnecessary files

go.mod

@@ -11,7 +11,6 @@ require (
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.10.1
 	github.com/mitchellh/gox v1.0.1
 	github.com/nutanix/ntnx-api-golang-clients/clustermgmt-go-client/v4 v4.0.1
-	github.com/nutanix/ntnx-api-golang-clients/datapolicies-go-client/v4 v4.0.1
 	github.com/nutanix/ntnx-api-golang-clients/dataprotection-go-client/v4 v4.0.1
 	github.com/nutanix/ntnx-api-golang-clients/iam-go-client/v4 v4.0.1
 	github.com/nutanix/ntnx-api-golang-clients/microseg-go-client/v4 v4.0.1

go.sum

@@ -458,8 +458,6 @@ github.com/nsf/jsondiff v0.0.0-20200515183724-f29ed568f4ce h1:RPclfga2SEJmgMmz2k
 github.com/nsf/jsondiff v0.0.0-20200515183724-f29ed568f4ce/go.mod h1:uFMI8w+ref4v2r9jz+c9i1IfIttS/OkmLfrk1jne5hs=
 github.com/nutanix/ntnx-api-golang-clients/clustermgmt-go-client/v4 v4.0.1 h1:OmOuXNY2DSsR4GUwECV2N6YK5OywXjwEFQSZou6x2HQ=
 github.com/nutanix/ntnx-api-golang-clients/clustermgmt-go-client/v4 v4.0.1/go.mod h1:sd4Fnk6MVfEDVY+8WyRoQTmLhi2SgZ3riySWErVHf8E=
-github.com/nutanix/ntnx-api-golang-clients/datapolicies-go-client/v4 v4.0.1 h1:hxPJFARcKD2G9WrPhfX8YlzSoL73/MtWdtIfEQopnw4=
-github.com/nutanix/ntnx-api-golang-clients/datapolicies-go-client/v4 v4.0.1/go.mod h1:rucOCp3ocrHS9juBpJGQYPfftCiTlI4fXvy5dirKlz8=
 github.com/nutanix/ntnx-api-golang-clients/dataprotection-go-client/v4 v4.0.1 h1:IaTTfK9Uy7uUE70b3h8G55/p6LHTwt2lHU33subKyJQ=
 github.com/nutanix/ntnx-api-golang-clients/dataprotection-go-client/v4 v4.0.1/go.mod h1:S07bx9/6uUbMOY/OUJsaIUdvZ/LDaE46Kx9VX7Pt7Ek=
 github.com/nutanix/ntnx-api-golang-clients/iam-go-client/v4 v4.0.1 h1:zWbA2qtSJt0WsBcEhqqv6FQTSz8pIwBnHA5etaQg4qo=

nutanix/config.go

@@ -10,7 +10,6 @@ import (
 	"github.com/terraform-providers/terraform-provider-nutanix/nutanix/sdks/v3/karbon"
 	v3 "github.com/terraform-providers/terraform-provider-nutanix/nutanix/sdks/v3/prism"
 	"github.com/terraform-providers/terraform-provider-nutanix/nutanix/sdks/v4/clusters"
-	"github.com/terraform-providers/terraform-provider-nutanix/nutanix/sdks/v4/datapolicies"
 	"github.com/terraform-providers/terraform-provider-nutanix/nutanix/sdks/v4/dataprotection"
 	"github.com/terraform-providers/terraform-provider-nutanix/nutanix/sdks/v4/iam"
 	"github.com/terraform-providers/terraform-provider-nutanix/nutanix/sdks/v4/microseg"
@@ -21,7 +20,7 @@ import (
 )
 
 // Version represents api version
-const Version = "3.1"
+//const Version = "3.1"
 
 // Config ...
 type Config struct {
@@ -112,10 +111,6 @@ func (c *Config) Client() (*Client, error) {
 	if err != nil {
 		return nil, err
 	}
-	dataPoliciesClient, err := datapolicies.NewDataPoliciesClient(configCreds)
-	if err != nil {
-		return nil, err
-	}
 	return &Client{
 		WaitTimeout:         c.WaitTimeout,
 		API:                 v3Client,
@@ -131,7 +126,6 @@ func (c *Config) Client() (*Client, error) {
 		VolumeAPI:           volumeClient,
 		DataProtectionAPI:   dataprotectionClient,
 		VmmAPI:              vmmClient,
-		DataPoliciesAPI:     dataPoliciesClient,
 	}, nil
 }
 
@@ -151,5 +145,4 @@ type Client struct {
 	VolumeAPI           *volumes.Client
 	DataProtectionAPI   *dataprotection.Client
 	VmmAPI              *vmm.Client
-	DataPoliciesAPI     *datapolicies.Client
 }

nutanix/provider/provider.go

@@ -267,9 +267,9 @@ func Provider() *schema.Provider {
 			"nutanix_storage_container_stats_info_v2":         storagecontainersv2.DatasourceNutanixStorageStatsInfoV2(),
 			"nutanix_category_v2":                             prismv2.DatasourceNutanixCategoryV2(),
 			"nutanix_categories_v2":                           prismv2.DatasourceNutanixCategoriesV2(),
+			"nutanix_pc_v2":                                   prismv2.DatasourceNutanixFetchPcV2(),
 			"nutanix_pcs_v2":                                  prismv2.DatasourceNutanixListPcsV2(),
 			"nutanix_restorable_pcs_v2":                       prismv2.DatasourceNutanixListRestorablePcsV2(),
-			"nutanix_pc_v2":                                   prismv2.DatasourceNutanixFetchPcV2(),
 			"nutanix_restore_points_v2":                       prismv2.DatasourceNutanixFetchRestorePointsV2(),
 			"nutanix_restore_point_v2":                        prismv2.DatasourceNutanixFetchRestorePointV2(),
 			"nutanix_backup_target_v2":                        prismv2.DatasourceNutanixBackupTargetV2(),
@@ -366,10 +366,11 @@ func Provider() *schema.Provider {
 			"nutanix_storage_containers_v2":                   storagecontainersv2.ResourceNutanixStorageContainersV2(),
 			"nutanix_category_v2":                             prismv2.ResourceNutanixCategoriesV2(),
 			"nutanix_deploy_pc_v2":                            prismv2.ResourceNutanixDeployPcV2(),
-			"nutanix_restore_pc_v2":                           prismv2.ResourceNutanixRestorePcV2(),
-			"nutanix_unregister_cluster_v2":                   prismv2.ResourceNutanixUnregisterClusterV2(),
 			"nutanix_backup_target_v2":                        prismv2.ResourceNutanixBackupTargetV2(),
 			"nutanix_restore_source_v2":                       prismv2.ResourceNutanixRestoreSourceV2(),
+			"nutanix_restore_pc_v2":                           prismv2.ResourceNutanixRestorePcV2(),
+			"nutanix_pc_registration_v2":                      prismv2.ResourceNutanixClusterPCRegistrationV2(),
+			"nutanix_unregister_cluster_v2":                   prismv2.ResourceNutanixUnregisterClusterV2(),
 			"nutanix_volume_group_v2":                         volumesv2.ResourceNutanixVolumeGroupV2(),
 			"nutanix_volume_group_disk_v2":                    volumesv2.ResourceNutanixVolumeGroupDiskV2(),
 			"nutanix_volume_group_iscsi_client_v2":            volumesv2.ResourceNutanixVolumeGroupIscsiClientV2(),

nutanix/sdks/v4/dataprotection/dataprotection.go

@@ -9,7 +9,6 @@ import (
 type Client struct {
 	APIClientInstance *dataprotection.ApiClient
 	RecoveryPoint     *api.RecoveryPointsApi
-	ProtectedResource *api.ProtectedResourcesApi
 }
 
 func NewDataProtectionClient(credentials client.Credentials) (*Client, error) {
@@ -29,8 +28,7 @@ func NewDataProtectionClient(credentials client.Credentials) (*Client, error) {
 	}
 
 	f := &Client{
-		RecoveryPoint:     api.NewRecoveryPointsApi(baseClient),
-		ProtectedResource: api.NewProtectedResourcesApi(baseClient),
+		RecoveryPoint: api.NewRecoveryPointsApi(baseClient),
 	}
 
 	return f, nil

nutanix/services/dataprotectionv2/main_test.go

@@ -9,9 +9,9 @@ import (
 
 type TestConfig struct {
 	DataProtection struct {
-		PcExtID      string `json:"pc_ext_id"`
-		ClusterExtID string `json:"cluster_ext_id"`
-		RemotePcIP   string `json:"remote_pc_ip"`
+		VMExtID      []string `json:"vm_ext_id"`
+		PcExtID      string   `json:"pc_ext_id"`
+		ClusterExtID string   `json:"cluster_ext_id"`
 	} `json:"data_protection"`
 }
 

nutanix/services/volumesv2/data_source_nutanix_volume_group_v2.go

@@ -143,7 +143,7 @@ func DatasourceNutanixVolumeGroupV2Read(ctx context.Context, d *schema.ResourceD
 
 	resp, err := conn.VolumeAPIInstance.GetVolumeGroupById(utils.StringPtr(extID.(string)))
 	if err != nil {
-		return diag.Errorf("error while fetching Volume Group : %v", err)
+		return diag.Errorf("error while fetching volume : %v", err)
 	}
 
 	getResp := resp.Data.GetValue().(volumesClient.VolumeGroup)

nutanix/services/volumesv2/resource_nutanix_volume_group_disk_v2.go

@@ -2,7 +2,6 @@ package volumesv2
 
 import (
 	"context"
-	"encoding/json"
 	"log"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
@@ -157,7 +156,7 @@ func ResourceNutanixVolumeGroupDiskV2Create(ctx context.Context, d *schema.Resou
 	}
 
 	if _, errWaitTask := stateConf.WaitForStateContext(ctx); errWaitTask != nil {
-		return diag.Errorf("error waiting for Volume Disk (%s) to create: %s", utils.StringValue(taskUUID), errWaitTask)
+		return diag.Errorf("error waiting for template (%s) to create: %s", utils.StringValue(taskUUID), errWaitTask)
 	}
 
 	// Get UUID from TASK API
@@ -171,6 +170,7 @@ func ResourceNutanixVolumeGroupDiskV2Create(ctx context.Context, d *schema.Resou
 	uuid := rUUID.EntitiesAffected[1].ExtId
 
 	d.SetId(*uuid)
+	d.Set("ext_id", *uuid)
 
 	return nil
 }
@@ -207,7 +207,7 @@ func ResourceNutanixVolumeGroupDiskV2Read(ctx context.Context, d *schema.Resourc
 	if err := d.Set("disk_storage_features", flattenDiskStorageFeatures(getResp.DiskStorageFeatures)); err != nil {
 		return diag.FromErr(err)
 	}
-
+	d.SetId(*getResp.ExtId)
 	return nil
 }
 
@@ -299,18 +299,8 @@ func ResourceNutanixVolumeGroupDiskV2Delete(ctx context.Context, d *schema.Resou
 	}
 
 	if _, errWaitTask := stateConf.WaitForStateContext(ctx); errWaitTask != nil {
-		return diag.Errorf("error waiting for Volume Disk (%s) to Delete: %s", utils.StringValue(taskUUID), errWaitTask)
-	}
-	resourceUUID, err := taskconn.TaskRefAPI.GetTaskById(taskUUID, nil)
-	if err != nil {
-		return diag.Errorf("error while fetching Volume Disk Delete Task : %v", err)
+		return diag.Errorf("error waiting for template (%s) to create: %s", utils.StringValue(taskUUID), errWaitTask)
 	}
-
-	rUUID := resourceUUID.Data.GetValue().(taskPoll.Task)
-
-	aJSON, _ := json.MarshalIndent(rUUID, "", "  ")
-	log.Printf("[DEBUG] Volume Disk Delete Task Details: %s", string(aJSON))
-
 	return nil
 }
 

nutanix/services/volumesv2/resource_nutanix_volume_group_iscsi_client_v2.go

@@ -2,7 +2,6 @@ package volumesv2
 
 import (
 	"context"
-	"encoding/json"
 	"log"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
@@ -204,7 +203,7 @@ func ResourceNutanixVolumeGroupIscsiClientV2Create(ctx context.Context, d *schem
 	}
 
 	if _, errWaitTask := stateConf.WaitForStateContext(ctx); errWaitTask != nil {
-		return diag.Errorf("error waiting for Iscsi Client  (%s) to Attach to Volume Group: %s", utils.StringValue(taskUUID), errWaitTask)
+		return diag.Errorf("error waiting for template (%s) to Attach Iscsi Client to Volume Group: %s", utils.StringValue(taskUUID), errWaitTask)
 	}
 
 	// Get UUID from TASK API
@@ -261,7 +260,7 @@ func ResourceNutanixVVolumeGroupIscsiClientV2Delete(ctx context.Context, d *sche
 	}
 
 	if _, errWaitTask := stateConf.WaitForStateContext(ctx); errWaitTask != nil {
-		return diag.Errorf("error waiting for Iscsi Client (%s) to Detach From Volume Group: %s", utils.StringValue(taskUUID), errWaitTask)
+		return diag.Errorf("error waiting for template (%s) to Detach Iscsi Client to Volume Group: %s", utils.StringValue(taskUUID), errWaitTask)
 	}
 
 	// Get UUID from TASK API
@@ -271,9 +270,12 @@ func ResourceNutanixVVolumeGroupIscsiClientV2Delete(ctx context.Context, d *sche
 		return diag.Errorf("error while Detaching Iscsi Client to Volume Group: %v", err)
 	}
 	rUUID := resourceUUID.Data.GetValue().(taskPoll.Task)
+	log.Printf("[DEBUG] rUUID 0: %v", *rUUID.EntitiesAffected[0].ExtId)
+	log.Printf("[DEBUG] rUUID 1: %v", *rUUID.EntitiesAffected[1].ExtId)
 
-	aJSON, _ := json.MarshalIndent(rUUID, "", "  ")
-	log.Printf("[DEBUG] Detach Iscsi Client from Volume Group Task Details: %s", string(aJSON))
+	uuid := rUUID.EntitiesAffected[0].ExtId
+
+	d.SetId(*uuid)
 
 	return nil
 }

nutanix/services/volumesv2/resource_nutanix_volume_group_v2.go

@@ -2,7 +2,6 @@ package volumesv2
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"log"
 
@@ -344,7 +343,7 @@ func ResourceNutanixVolumeGroupV2Create(ctx context.Context, d *schema.ResourceD
 	}
 
 	if _, errWaitTask := stateConf.WaitForStateContext(ctx); errWaitTask != nil {
-		return diag.Errorf("error waiting for Volume Group (%s) to create: %s", utils.StringValue(taskUUID), errWaitTask)
+		return diag.Errorf("error waiting for template (%s) to create: %s", utils.StringValue(taskUUID), errWaitTask)
 	}
 
 	// Get UUID from TASK API
@@ -355,13 +354,11 @@ func ResourceNutanixVolumeGroupV2Create(ctx context.Context, d *schema.ResourceD
 	}
 	rUUID := resourceUUID.Data.GetValue().(taskPoll.Task)
 
-	aJSON, _ := json.MarshalIndent(rUUID, "", "  ")
-	log.Printf("[DEBUG] Volume Group Task Details: %s", aJSON)
-
 	uuid := rUUID.EntitiesAffected[0].ExtId
 	d.SetId(*uuid)
+	d.Set("ext_id", *uuid)
 
-	return ResourceNutanixVolumeGroupV2Read(ctx, d, meta)
+	return nil
 }
 
 func ResourceNutanixVolumeGroupV2Read(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
@@ -374,9 +371,6 @@ func ResourceNutanixVolumeGroupV2Read(ctx context.Context, d *schema.ResourceDat
 
 	getResp := resp.Data.GetValue().(volumesClient.VolumeGroup)
 
-	if err := d.Set("ext_id", getResp.ExtId); err != nil {
-		return diag.FromErr(err)
-	}
 	if err := d.Set("name", getResp.Name); err != nil {
 		return diag.FromErr(err)
 	}
@@ -446,7 +440,7 @@ func ResourceNutanixVolumeGroupV2Delete(ctx context.Context, d *schema.ResourceD
 	}
 
 	if _, errWaitTask := stateConf.WaitForStateContext(ctx); errWaitTask != nil {
-		return diag.Errorf("error waiting for Volume Group (%s) to create: %s", utils.StringValue(taskUUID), errWaitTask)
+		return diag.Errorf("error waiting for template (%s) to create: %s", utils.StringValue(taskUUID), errWaitTask)
 	}
 	return nil
 }

nutanix/services/volumesv2/resource_nutanix_volume_group_vm_v2.go

@@ -2,8 +2,6 @@ package volumesv2
 
 import (
 	"context"
-	"encoding/json"
-	"log"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
@@ -75,14 +73,14 @@ func ResourceNutanixVolumeAttachVMToVolumeGroupV2Create(ctx context.Context, d *
 	taskconn := meta.(*conns.Client).PrismAPI
 	// Wait for the VM to be available
 	stateConf := &resource.StateChangeConf{
-		Pending: []string{"PENDING", "RUNNING", "QUEUED"},
+		Pending: []string{"PENDING", "RUNNING", "QUEUED", "QUEUED"},
 		Target:  []string{"SUCCEEDED"},
 		Refresh: taskStateRefreshPrismTaskGroupFunc(ctx, taskconn, utils.StringValue(taskUUID)),
 		Timeout: d.Timeout(schema.TimeoutCreate),
 	}
 
 	if _, errWaitTask := stateConf.WaitForStateContext(ctx); errWaitTask != nil {
-		return diag.Errorf("error waiting for Vm (%s) to Attach to Volume Group: %s", utils.StringValue(taskUUID), errWaitTask)
+		return diag.Errorf("error waiting for template (%s) to Attach Vm to Volume Group: %s", utils.StringValue(taskUUID), errWaitTask)
 	}
 
 	// Get UUID from TASK API
@@ -142,7 +140,7 @@ func ResourceNutanixVolumeAttachVMToVolumeGroupV2Delete(ctx context.Context, d *
 	}
 
 	if _, errWaitTask := stateConf.WaitForStateContext(ctx); errWaitTask != nil {
-		return diag.Errorf("error waiting for Vm (%s) to Detach from Volume Group: %s", utils.StringValue(taskUUID), errWaitTask)
+		return diag.Errorf("error waiting for template (%s) to Detach Vm to Volume Group: %s", utils.StringValue(taskUUID), errWaitTask)
 	}
 
 	// Get UUID from TASK API
@@ -153,8 +151,10 @@ func ResourceNutanixVolumeAttachVMToVolumeGroupV2Delete(ctx context.Context, d *
 	}
 	rUUID := resourceUUID.Data.GetValue().(taskPoll.Task)
 
-	aJSON, _ := json.MarshalIndent(rUUID, "", "  ")
-	log.Printf("[DEBUG] Detach Vm from Volume Group Task Details: %s", string(aJSON))
+	uuid := rUUID.EntitiesAffected[0].ExtId
+
+	d.SetId(*uuid)
+	d.Set("ext_id", *uuid)
 
 	return nil
 }