fix TestCoreVirtualCircuitResource_basic

Author: jiangong

oci/core_virtual_circuit_test.go

@@ -22,8 +22,8 @@ var (
 	VirtualCircuitRequiredOnlyResource = VirtualCircuitResourceDependencies +
 		generateResourceFromRepresentationMap("oci_core_virtual_circuit", "test_virtual_circuit", Required, Create, virtualCircuitRequiredOnlyRepresentation)
 
-	VirtualCircuitResourceConfig = VirtualCircuitResourceDependencies +
-		generateResourceFromRepresentationMap("oci_core_virtual_circuit", "test_virtual_circuit", Optional, Update, virtualCircuitRepresentation)
+	VirtualCircuitWithProviderResourceConfig = VirtualCircuitResourceDependencies +
+		generateResourceFromRepresentationMap("oci_core_virtual_circuit", "test_virtual_circuit", Optional, Update, virtualCircuitWithProviderRepresentation)
 
 	virtualCircuitSingularDataSourceRepresentation = map[string]interface{}{
 		"virtual_circuit_id": Representation{repType: Required, create: `${oci_core_virtual_circuit.test_virtual_circuit.id}`},
@@ -57,23 +57,25 @@ var (
 		"compartment_id":         Representation{repType: Required, create: `${var.compartment_id}`},
 		"type":                   Representation{repType: Required, create: `${var.virtual_circuit_type}`},
 		"bandwidth_shape_name":   Representation{repType: Optional, create: `10 Gbps`, update: `20 Gbps`},
-		"cross_connect_mappings": RepresentationGroup{Required, virtualCircuitCrossConnectMappingsRepresentation},
+		"cross_connect_mappings": RepresentationGroup{Required, crossConnectMappingsRequiredOnlyRepresentation},
 		"customer_bgp_asn":       Representation{repType: Required, create: `10`, update: `11`},
 		"display_name":           Representation{repType: Optional, create: `displayName`, update: `displayName2`},
 		"gateway_id":             Representation{repType: Optional, create: `${oci_core_drg.test_drg.id}`},
-		"provider_service_id":    Representation{repType: Optional, create: `${data.oci_core_fast_connect_provider_services.test_fast_connect_provider_services.fast_connect_provider_services.0.id}`},
 		"region":                 Representation{repType: Optional, create: `us-phoenix-1`},
 	}
-	virtualCircuitRepresentationWithoutProvider = map[string]interface{}{
+
+	virtualCircuitWithProviderRepresentation = map[string]interface{}{
 		"compartment_id":         Representation{repType: Required, create: `${var.compartment_id}`},
 		"type":                   Representation{repType: Required, create: `${var.virtual_circuit_type}`},
 		"bandwidth_shape_name":   Representation{repType: Optional, create: `10 Gbps`, update: `20 Gbps`},
 		"cross_connect_mappings": RepresentationGroup{Required, virtualCircuitCrossConnectMappingsRepresentation},
 		"customer_bgp_asn":       Representation{repType: Required, create: `10`, update: `11`},
 		"display_name":           Representation{repType: Optional, create: `displayName`, update: `displayName2`},
 		"gateway_id":             Representation{repType: Optional, create: `${oci_core_drg.test_drg.id}`},
+		"provider_service_id":    Representation{repType: Optional, create: `${data.oci_core_fast_connect_provider_services.test_fast_connect_provider_services.fast_connect_provider_services.0.id}`},
 		"region":                 Representation{repType: Optional, create: `us-phoenix-1`},
 	}
+
 	crossConnectMappingsPublicRequiredOnlyRepresentation = map[string]interface{}{
 		"cross_connect_or_cross_connect_group_id": Representation{repType: Required, create: `${oci_core_cross_connect.test_cross_connect.cross_connect_group_id}`},
 		"vlan": Representation{repType: Required, create: `200`, update: `300`},
@@ -92,7 +94,7 @@ var (
 		"cidr_block": Representation{repType: Required, create: `0.0.0.0/5`},
 	}
 
-	VirtualCircuitResourceConfigFilter = `
+	VirtualCircuitWithProviderResourceConfigFilter = `
 data "oci_core_fast_connect_provider_services" "test_fast_connect_provider_services" {
 	#Required
 	compartment_id = "${var.compartment_id}"
@@ -179,13 +181,13 @@ func TestCoreVirtualCircuitResource_basic(t *testing.T) {
 			},
 			// verify create - PRIVATE Virtual Circuit with Provider
 			{
-				Config: config + VirtualCircuitPrivatePropertyVariables + compartmentIdVariableStr + VirtualCircuitResourceConfigFilter + VirtualCircuitResourceConfig,
+				Config: config + VirtualCircuitPrivatePropertyVariables + compartmentIdVariableStr + VirtualCircuitWithProviderResourceConfigFilter + VirtualCircuitWithProviderResourceConfig,
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
 					resource.TestCheckResourceAttr(resourceName, "cross_connect_mappings.#", "1"),
-					resource.TestCheckResourceAttr(resourceName, "cross_connect_mappings.0.customer_bgp_peering_ip", "10.0.0.18/31"),
-					resource.TestCheckResourceAttr(resourceName, "cross_connect_mappings.0.oracle_bgp_peering_ip", "10.0.0.19/31"),
-					resource.TestCheckResourceAttr(resourceName, "customer_bgp_asn", "10"),
+					resource.TestCheckResourceAttr(resourceName, "cross_connect_mappings.0.customer_bgp_peering_ip", "10.0.0.20/31"),
+					resource.TestCheckResourceAttr(resourceName, "cross_connect_mappings.0.oracle_bgp_peering_ip", "10.0.0.21/31"),
+					resource.TestCheckResourceAttr(resourceName, "customer_bgp_asn", "11"),
 					resource.TestCheckResourceAttrSet(resourceName, "gateway_id"),
 					resource.TestCheckResourceAttrSet(resourceName, "provider_service_id"),
 					resource.TestCheckResourceAttr(resourceName, "provider_state", "INACTIVE"),
@@ -232,7 +234,7 @@ func TestCoreVirtualCircuitResource_basic(t *testing.T) {
 			// verify create with optionals
 			{
 				Config: config + compartmentIdVariableStr + VirtualCircuitResourceDependencies + VirtualCircuitPrivatePropertyVariables +
-					generateResourceFromRepresentationMap("oci_core_virtual_circuit", "test_virtual_circuit", Optional, Create, virtualCircuitRepresentationWithoutProvider),
+					generateResourceFromRepresentationMap("oci_core_virtual_circuit", "test_virtual_circuit", Optional, Create, virtualCircuitRepresentation),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(resourceName, "bandwidth_shape_name", "10 Gbps"),
 					resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
@@ -257,7 +259,7 @@ func TestCoreVirtualCircuitResource_basic(t *testing.T) {
 			// verify updates to updatable parameters
 			{
 				Config: config + compartmentIdVariableStr + VirtualCircuitResourceDependencies + VirtualCircuitPrivatePropertyVariables +
-					generateResourceFromRepresentationMap("oci_core_virtual_circuit", "test_virtual_circuit", Optional, Update, virtualCircuitRepresentationWithoutProvider),
+					generateResourceFromRepresentationMap("oci_core_virtual_circuit", "test_virtual_circuit", Optional, Update, virtualCircuitRepresentation),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(resourceName, "bandwidth_shape_name", "20 Gbps"),
 					resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
@@ -285,7 +287,7 @@ func TestCoreVirtualCircuitResource_basic(t *testing.T) {
 			{
 				Config: config + generateDataSourceFromRepresentationMap("oci_core_virtual_circuits", "test_virtual_circuits", Optional, Update, virtualCircuitDataSourceRepresentation) +
 					compartmentIdVariableStr + VirtualCircuitResourceDependencies + VirtualCircuitPrivatePropertyVariables +
-					generateResourceFromRepresentationMap("oci_core_virtual_circuit", "test_virtual_circuit", Optional, Update, virtualCircuitRepresentationWithoutProvider),
+					generateResourceFromRepresentationMap("oci_core_virtual_circuit", "test_virtual_circuit", Optional, Update, virtualCircuitRepresentation),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(datasourceName, "compartment_id", compartmentId),
 					resource.TestCheckResourceAttr(datasourceName, "display_name", "displayName2"),
@@ -309,7 +311,7 @@ func TestCoreVirtualCircuitResource_basic(t *testing.T) {
 			{
 				Config: config + generateDataSourceFromRepresentationMap("oci_core_virtual_circuit", "test_virtual_circuit", Required, Create, virtualCircuitSingularDataSourceRepresentation) +
 					compartmentIdVariableStr + VirtualCircuitResourceDependencies + VirtualCircuitPrivatePropertyVariables +
-					generateResourceFromRepresentationMap("oci_core_virtual_circuit", "test_virtual_circuit", Optional, Update, virtualCircuitRepresentationWithoutProvider),
+					generateResourceFromRepresentationMap("oci_core_virtual_circuit", "test_virtual_circuit", Optional, Update, virtualCircuitRepresentation),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "gateway_id"),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "virtual_circuit_id"),
@@ -335,12 +337,12 @@ func TestCoreVirtualCircuitResource_basic(t *testing.T) {
 			// remove singular datasource from previous step so that it doesn't conflict with import tests
 			{
 				Config: config + compartmentIdVariableStr + VirtualCircuitResourceDependencies + VirtualCircuitPrivatePropertyVariables +
-					generateResourceFromRepresentationMap("oci_core_virtual_circuit", "test_virtual_circuit", Optional, Update, virtualCircuitRepresentationWithoutProvider),
+					generateResourceFromRepresentationMap("oci_core_virtual_circuit", "test_virtual_circuit", Optional, Update, virtualCircuitRepresentation),
 			},
 			// verify resource import
 			{
 				Config: config + compartmentIdVariableStr + VirtualCircuitResourceDependencies + VirtualCircuitPrivatePropertyVariables +
-					generateResourceFromRepresentationMap("oci_core_virtual_circuit", "test_virtual_circuit", Optional, Update, virtualCircuitRepresentationWithoutProvider),
+					generateResourceFromRepresentationMap("oci_core_virtual_circuit", "test_virtual_circuit", Optional, Update, virtualCircuitRepresentation),
 				ImportState:       true,
 				ImportStateVerify: true,
 				ImportStateVerifyIgnore: []string{