resource/alicloud_realtime_compute_vvp_instance: Added the field resource_id.

Author: ChenHanZhang

alicloud/resource_alicloud_realtime_compute_vvp_instance.go

@@ -122,6 +122,10 @@ func resourceAliCloudRealtimeComputeVvpInstance() *schema.Resource {
 				Required: true,
 				ForceNew: true,
 			},
+			"resource_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 		},
 	}
 }
@@ -253,7 +257,7 @@ func resourceAliCloudRealtimeComputeVvpInstanceRead(d *schema.ResourceData, meta
 	d.Set("status", objectRaw["ClusterStatus"])
 	d.Set("vpc_id", objectRaw["VpcId"])
 	d.Set("vvp_instance_name", objectRaw["InstanceName"])
-	d.Set("zone_id", objectRaw["ZoneId"])
+	d.Set("resource_id", objectRaw["ResourceId"])
 	resourceSpecMaps := make([]map[string]interface{}, 0)
 	resourceSpecMap := make(map[string]interface{})
 	resourceSpec1Raw := make(map[string]interface{})

alicloud/resource_alicloud_realtime_compute_vvp_instance_test.go

@@ -54,7 +54,6 @@ func TestAccAliCloudRealtimeComputeVvpInstance_basic4636(t *testing.T) {
 					testAccCheck(map[string]string{
 						"vvp_instance_name": name,
 						"vpc_id":            CHECKSET,
-						"zone_id":           "cn-hangzhou-i",
 						"vswitch_ids.#":     "1",
 						"payment_type":      "PayAsYouGo",
 					}),
@@ -126,7 +125,7 @@ func TestAccAliCloudRealtimeComputeVvpInstance_basic4636(t *testing.T) {
 				ResourceName:            resourceId,
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"duration", "pricing_cycle"},
+				ImportStateVerifyIgnore: []string{"duration", "pricing_cycle", "zone_id"},
 			},
 		},
 	})
@@ -220,7 +219,6 @@ func TestAccAliCloudRealtimeComputeVvpInstance_basic4594(t *testing.T) {
 						"vvp_instance_name": name,
 						"vpc_id":            CHECKSET,
 						"vswitch_ids.#":     "1",
-						"zone_id":           "cn-hangzhou-i",
 						"payment_type":      "Subscription",
 						"pricing_cycle":     "Month",
 						"duration":          "1",
@@ -244,7 +242,7 @@ func TestAccAliCloudRealtimeComputeVvpInstance_basic4594(t *testing.T) {
 				ResourceName:            resourceId,
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"duration", "pricing_cycle"},
+				ImportStateVerifyIgnore: []string{"duration", "pricing_cycle", "zone_id"},
 			},
 		},
 	})
@@ -326,7 +324,6 @@ func TestAccAliCloudRealtimeComputeVvpInstance_basic4636_twin(t *testing.T) {
 					testAccCheck(map[string]string{
 						"vvp_instance_name": name,
 						"vpc_id":            CHECKSET,
-						"zone_id":           "cn-hangzhou-i",
 						"vswitch_ids.#":     "1",
 						"payment_type":      "PayAsYouGo",
 					}),
@@ -336,7 +333,7 @@ func TestAccAliCloudRealtimeComputeVvpInstance_basic4636_twin(t *testing.T) {
 				ResourceName:            resourceId,
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"duration", "pricing_cycle"},
+				ImportStateVerifyIgnore: []string{"duration", "pricing_cycle", "zone_id"},
 			},
 		},
 	})
@@ -396,7 +393,6 @@ func TestAccAliCloudRealtimeComputeVvpInstance_basic4594_twin(t *testing.T) {
 						"vvp_instance_name": name,
 						"vpc_id":            CHECKSET,
 						"vswitch_ids.#":     "1",
-						"zone_id":           "cn-hangzhou-i",
 						"payment_type":      "Subscription",
 						"pricing_cycle":     "Month",
 						"duration":          "1",
@@ -407,7 +403,7 @@ func TestAccAliCloudRealtimeComputeVvpInstance_basic4594_twin(t *testing.T) {
 				ResourceName:            resourceId,
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"duration", "pricing_cycle"},
+				ImportStateVerifyIgnore: []string{"duration", "pricing_cycle", "zone_id"},
 			},
 		},
 	})