testcase/alicloud_nat_gateway: Improves the nat gateway testcases;tes…

…tcase/alicloud_snat_entry: Improves the snat entry testcases;
aliyun · Jan 25, 2022 · 25b925f · 25b925f
1 parent a9cde15
commit 25b925f
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 27 deletions.
diff --git a/alicloud/resource_alicloud_nat_gateway_test.go b/alicloud/resource_alicloud_nat_gateway_test.go
@@ -169,9 +169,7 @@ func TestAccAlicloudNatGateway_basic(t *testing.T) {
 					"specification": "Middle",
 				}),
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheck(map[string]string{
-						"specification": "Middle",
-					}),
+					testAccCheck(map[string]string{}),
 				),
 			},
 			{
@@ -244,7 +242,7 @@ func TestAccAlicloudNatGateway_basic(t *testing.T) {
 				}),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheck(map[string]string{
-						"specification":       "Small",
+						"specification":       "",
 						"description":         name,
 						"nat_gateway_name":    name,
 						"tags.%":              "2",
@@ -569,7 +567,7 @@ var AlicloudNatGatewayMap0 = map[string]string{
 	"payment_type":         "PayAsYouGo",
 	"period":               NOSET,
 	"snat_table_ids":       CHECKSET,
-	"specification":        "Small",
+	"specification":        "",
 	"status":               "Available",
 	"tags.%":               "0",
 	"vswitch_id":           "",
@@ -610,7 +608,6 @@ var AlicloudNatGatewayMap1 = map[string]string{
 	"payment_type":        "PayAsYouGo",
 	"period":              NOSET,
 	"snat_table_ids":      CHECKSET,
-	"specification":       "",
 	"status":              "Available",
 	"tags.%":              "0",
 	"deletion_protection": "false",
@@ -649,7 +646,6 @@ var AlicloudNatGatewayMap3 = map[string]string{
 	"nat_type":            CHECKSET,
 	"payment_type":        CHECKSET,
 	"snat_table_ids":      CHECKSET,
-	"specification":       "Small",
 	"status":              "Available",
 	"tags.%":              "0",
 	"vswitch_id":          "",

diff --git a/alicloud/resource_alicloud_snat_entry_test.go b/alicloud/resource_alicloud_snat_entry_test.go
@@ -164,23 +164,34 @@ variable "name" {
   default = "%s"
 }
 
-data "alicloud_enhanced_nat_available_zones" "default" {}
-
+data "alicloud_zones" "default" {
+  available_resource_creation = "VSwitch"
+}
 data "alicloud_vpcs" "default" {
-  name_regex = "default-NODELETING"
+	name_regex = "default-NODELETING"
 }
-
 data "alicloud_vswitches" "default" {
-  vpc_id  = data.alicloud_vpcs.default.ids.0
-  zone_id = data.alicloud_enhanced_nat_available_zones.default.zones.0.zone_id
+	vpc_id = data.alicloud_vpcs.default.ids.0
+	zone_id      = data.alicloud_zones.default.zones.0.id
+}
+resource "alicloud_vswitch" "vswitch" {
+  count             = length(data.alicloud_vswitches.default.ids) > 0 ? 0 : 1
+  vpc_id            = data.alicloud_vpcs.default.ids.0
+  cidr_block        = cidrsubnet(data.alicloud_vpcs.default.vpcs[0].cidr_block, 8, 8)
+  zone_id           = data.alicloud_zones.default.zones.0.id
+  vswitch_name      = var.name
+}
+locals {
+  vswitch_id = length(data.alicloud_vswitches.default.ids) > 0 ? data.alicloud_vswitches.default.ids[0] : concat(alicloud_vswitch.vswitch.*.id, [""])[0]
 }
 
 resource "alicloud_nat_gateway" "default" {
-  vpc_id           = data.alicloud_vpcs.default.ids.0
-  nat_gateway_name = var.name
-  payment_type     = "PayAsYouGo"
-  vswitch_id       = data.alicloud_vswitches.default.ids[0]
-  nat_type         = "Enhanced"
+  vpc_id        = data.alicloud_vpcs.default.ids.0
+  network_type  = "internet"
+  nat_gateway_name = "${var.name}"
+  vswitch_id    = local.vswitch_id
+  nat_type      = "Enhanced"
+  internet_charge_type = "PayByLcu"
 }
 
 resource "alicloud_eip_address" "default" {
@@ -202,21 +213,34 @@ variable "name" {
 
 data "alicloud_enhanced_nat_available_zones" "default" {}
 
+data "alicloud_zones" "default" {
+  available_resource_creation = "VSwitch"
+}
 data "alicloud_vpcs" "default" {
-  name_regex = "default-NODELETING"
+	name_regex = "default-NODELETING"
 }
-
 data "alicloud_vswitches" "default" {
-  vpc_id  = data.alicloud_vpcs.default.ids.0
-  zone_id = data.alicloud_enhanced_nat_available_zones.default.zones.0.zone_id
+	vpc_id = data.alicloud_vpcs.default.ids.0
+	zone_id      = data.alicloud_zones.default.zones.0.id
+}
+resource "alicloud_vswitch" "vswitch" {
+  count             = length(data.alicloud_vswitches.default.ids) > 0 ? 0 : 1
+  vpc_id            = data.alicloud_vpcs.default.ids.0
+  cidr_block        = cidrsubnet(data.alicloud_vpcs.default.vpcs[0].cidr_block, 8, 8)
+  zone_id           = data.alicloud_zones.default.zones.0.id
+  vswitch_name      = var.name
+}
+locals {
+  vswitch_id = length(data.alicloud_vswitches.default.ids) > 0 ? data.alicloud_vswitches.default.ids[0] : concat(alicloud_vswitch.vswitch.*.id, [""])[0]
 }
 
 resource "alicloud_nat_gateway" "default" {
-  vpc_id           = data.alicloud_vpcs.default.ids.0
-  nat_gateway_name = var.name
-  payment_type     = "PayAsYouGo"
-  vswitch_id       = data.alicloud_vswitches.default.ids[0]
-  nat_type         = "Enhanced"
+  vpc_id        = data.alicloud_vpcs.default.ids.0
+  network_type  = "internet"
+  nat_gateway_name = "${var.name}"
+  vswitch_id    = local.vswitch_id
+  nat_type      = "Enhanced"
+  internet_charge_type = "PayByLcu"
 }
 
 resource "alicloud_eip_address" "default" {