sdk v2 updates

poddm · poddm · commit 990925e75a32 · 2024-10-21T15:08:59.000-07:00
diff --git a/cloudstack/resource_cloudstack_cluster.go b/cloudstack/resource_cloudstack_cluster.go
@@ -21,7 +21,7 @@ package cloudstack
 
 import (
 	"github.com/apache/cloudstack-go/v2/cloudstack"
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func resourceCloudStackCluster() *schema.Resource {
diff --git a/cloudstack/resource_cloudstack_cluster_test.go b/cloudstack/resource_cloudstack_cluster_test.go
@@ -22,7 +22,7 @@ package cloudstack
 import (
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 )
 
 func TestAccCloudStackCluster_basic(t *testing.T) {
diff --git a/cloudstack/resource_cloudstack_network_service_provider_state.go b/cloudstack/resource_cloudstack_network_service_provider_state.go
@@ -23,7 +23,7 @@ import (
 	"fmt"
 
 	"github.com/apache/cloudstack-go/v2/cloudstack"
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func resourceCloudStackNetworkServiceProviderState() *schema.Resource {
diff --git a/cloudstack/resource_cloudstack_network_service_provider_state_test.go b/cloudstack/resource_cloudstack_network_service_provider_state_test.go
@@ -22,7 +22,7 @@ package cloudstack
 import (
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 )
 
 func TestAccCloudstackNetworkServiceProviderState_basic(t *testing.T) {
diff --git a/cloudstack/resource_cloudstack_physical_network.go b/cloudstack/resource_cloudstack_physical_network.go
@@ -24,7 +24,7 @@ import (
 	"strings"
 
 	"github.com/apache/cloudstack-go/v2/cloudstack"
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func resourceCloudStackPhysicalNetwork() *schema.Resource {
diff --git a/cloudstack/resource_cloudstack_physical_network_test.go b/cloudstack/resource_cloudstack_physical_network_test.go
@@ -22,7 +22,7 @@ package cloudstack
 import (
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 )
 
 func TestAccCloudStackPhysicalNetwork_basic(t *testing.T) {
diff --git a/cloudstack/resource_cloudstack_pod.go b/cloudstack/resource_cloudstack_pod.go
@@ -21,7 +21,7 @@ package cloudstack
 
 import (
 	"github.com/apache/cloudstack-go/v2/cloudstack"
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func resourceCloudStackPod() *schema.Resource {
@@ -69,7 +69,7 @@ func resourceCloudStackPod() *schema.Resource {
 func resourceCloudStackPodCreate(d *schema.ResourceData, meta interface{}) error {
 	cs := meta.(*cloudstack.CloudStackClient)
 
-	p := cs.Pod.NewCreatePodParams(d.Get("gateway").(string), d.Get("name").(string), d.Get("netmask").(string), d.Get("start_ip").(string), d.Get("zone_id").(string))
+	p := cs.Pod.NewCreatePodParams(d.Get("name").(string), d.Get("zone_id").(string))
 	if v, ok := d.GetOk("allocation_state"); ok {
 		p.SetAllocationstate(v.(string))
 	}
diff --git a/cloudstack/resource_cloudstack_pod_test.go b/cloudstack/resource_cloudstack_pod_test.go
@@ -22,7 +22,7 @@ package cloudstack
 import (
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 )
 
 func TestAccCloudStackPod_basic(t *testing.T) {
diff --git a/cloudstack/resource_cloudstack_secondary_storage.go b/cloudstack/resource_cloudstack_secondary_storage.go
@@ -23,7 +23,7 @@ import (
 	"fmt"
 
 	"github.com/apache/cloudstack-go/v2/cloudstack"
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func resourceCloudStackSecondaryStorage() *schema.Resource {
diff --git a/cloudstack/resource_cloudstack_secondary_storage_test.go b/cloudstack/resource_cloudstack_secondary_storage_test.go
@@ -22,7 +22,7 @@ package cloudstack
 import (
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 )
 
 func TestAccCloudStackSecondaryStorage_basic(t *testing.T) {
diff --git a/cloudstack/resource_cloudstack_storage_pool.go b/cloudstack/resource_cloudstack_storage_pool.go
@@ -24,7 +24,7 @@ import (
 	"strings"
 
 	"github.com/apache/cloudstack-go/v2/cloudstack"
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func resourceCloudStackStoragePool() *schema.Resource {
diff --git a/cloudstack/resource_cloudstack_storage_pool_test.go b/cloudstack/resource_cloudstack_storage_pool_test.go
@@ -22,7 +22,7 @@ package cloudstack
 import (
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 )
 
 func TestAccCloudStackStoragePool_basic(t *testing.T) {
diff --git a/cloudstack/resource_cloudstack_traffic_type.go b/cloudstack/resource_cloudstack_traffic_type.go
@@ -23,7 +23,7 @@ import (
 	"fmt"
 
 	"github.com/apache/cloudstack-go/v2/cloudstack"
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func resourceCloudStackTrafficType() *schema.Resource {
diff --git a/cloudstack/resource_cloudstack_traffic_type_test.go b/cloudstack/resource_cloudstack_traffic_type_test.go
@@ -22,7 +22,7 @@ package cloudstack
 import (
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 )
 
 func TestAccCloudStacktrafficType_basic(t *testing.T) {
diff --git a/cloudstack/resource_cloudstack_vlan_ip_range.go b/cloudstack/resource_cloudstack_vlan_ip_range.go
@@ -23,7 +23,7 @@ import (
 	"fmt"
 
 	"github.com/apache/cloudstack-go/v2/cloudstack"
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func resourceCloudstackVlanIpRange() *schema.Resource {
diff --git a/cloudstack/resource_cloudstack_vlan_ip_range_test.go b/cloudstack/resource_cloudstack_vlan_ip_range_test.go
@@ -22,7 +22,7 @@ package cloudstack
 import (
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 )
 
 func TestAccCloudstackVlanIpRange_basic(t *testing.T) {
diff --git a/cloudstack/resource_cloudstack_zone_test.go b/cloudstack/resource_cloudstack_zone_test.go
@@ -22,7 +22,7 @@ package cloudstack
 import (
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 )
 
 func TestAccCloudStackZone_basic(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ package cloudstack`
`21`	`21`
`22`	`22`	`import (`
`23`	`23`	`"github.com/apache/cloudstack-go/v2/cloudstack"`
`24`		`- "github.com/hashicorp/terraform/helper/schema"`
	`24`	`+ "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`func resourceCloudStackCluster() *schema.Resource {`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ package cloudstack`
`22`	`22`	`import (`
`23`	`23`	`"testing"`
`24`	`24`
`25`		`- "github.com/hashicorp/terraform/helper/resource"`
	`25`	`+ "github.com/hashicorp/terraform-plugin-testing/helper/resource"`
`26`	`26`	`)`
`27`	`27`
`28`	`28`	`func TestAccCloudStackCluster_basic(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ import (`
`23`	`23`	`"fmt"`
`24`	`24`
`25`	`25`	`"github.com/apache/cloudstack-go/v2/cloudstack"`
`26`		`- "github.com/hashicorp/terraform/helper/schema"`
	`26`	`+ "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"`
`27`	`27`	`)`
`28`	`28`
`29`	`29`	`func resourceCloudStackNetworkServiceProviderState() *schema.Resource {`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ import (`
`24`	`24`	`"strings"`
`25`	`25`
`26`	`26`	`"github.com/apache/cloudstack-go/v2/cloudstack"`
`27`		`- "github.com/hashicorp/terraform/helper/schema"`
	`27`	`+ "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"`
`28`	`28`	`)`
`29`	`29`
`30`	`30`	`func resourceCloudStackPhysicalNetwork() *schema.Resource {`