Support VCN Transit

Author: ccushing

oci/core_drg_attachment_resource.go

@@ -39,6 +39,11 @@ func DrgAttachmentResource() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"route_table_id": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
 
 			// Computed
 			"compartment_id": {
@@ -142,6 +147,11 @@ func (s *DrgAttachmentResourceCrud) Create() error {
 		request.DrgId = &tmp
 	}
 
+	if routeTableId, ok := s.D.GetOkExists("route_table_id"); ok {
+		tmp := routeTableId.(string)
+		request.RouteTableId = &tmp
+	}
+
 	if vcnId, ok := s.D.GetOkExists("vcn_id"); ok {
 		tmp := vcnId.(string)
 		request.VcnId = &tmp
@@ -186,6 +196,11 @@ func (s *DrgAttachmentResourceCrud) Update() error {
 	tmp := s.D.Id()
 	request.DrgAttachmentId = &tmp
 
+	if routeTableId, ok := s.D.GetOkExists("route_table_id"); ok {
+		tmp := routeTableId.(string)
+		request.RouteTableId = &tmp
+	}
+
 	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "core")
 
 	response, err := s.Client.UpdateDrgAttachment(context.Background(), request)
@@ -222,6 +237,10 @@ func (s *DrgAttachmentResourceCrud) SetData() error {
 		s.D.Set("drg_id", *s.Res.DrgId)
 	}
 
+	if s.Res.RouteTableId != nil {
+		s.D.Set("route_table_id", *s.Res.RouteTableId)
+	}
+
 	s.D.Set("state", s.Res.LifecycleState)
 
 	if s.Res.TimeCreated != nil {

oci/core_drg_attachment_test.go

@@ -28,9 +28,10 @@ var (
 	}
 
 	drgAttachmentRepresentation = map[string]interface{}{
-		"drg_id":       Representation{repType: Required, create: `${oci_core_drg.test_drg.id}`},
-		"vcn_id":       Representation{repType: Required, create: `${oci_core_vcn.test_vcn.id}`},
-		"display_name": Representation{repType: Optional, create: `displayName`, update: `displayName2`},
+		"drg_id":         Representation{repType: Required, create: `${oci_core_drg.test_drg.id}`},
+		"vcn_id":         Representation{repType: Required, create: `${oci_core_vcn.test_vcn.id}`},
+		"display_name":   Representation{repType: Optional, create: `displayName`, update: `displayName2`},
+		"route_table_id": Representation{repType: Required, create: `${oci_core_vcn.test_vcn.default_route_table_id}`},
 	}
 
 	DrgAttachmentResourceDependencies = DrgRequiredOnlyResource + VcnRequiredOnlyResource + VcnResourceDependencies
@@ -61,6 +62,7 @@ func TestCoreDrgAttachmentResource_basic(t *testing.T) {
 					generateResourceFromRepresentationMap("oci_core_drg_attachment", "test_drg_attachment", Required, Create, drgAttachmentRepresentation),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttrSet(resourceName, "drg_id"),
+					resource.TestCheckResourceAttrSet(resourceName, "route_table_id"),
 					resource.TestCheckResourceAttrSet(resourceName, "vcn_id"),
 
 					func(s *terraform.State) (err error) {
@@ -83,6 +85,7 @@ func TestCoreDrgAttachmentResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "display_name", "displayName"),
 					resource.TestCheckResourceAttrSet(resourceName, "drg_id"),
 					resource.TestCheckResourceAttrSet(resourceName, "id"),
+					resource.TestCheckResourceAttrSet(resourceName, "route_table_id"),
 					resource.TestCheckResourceAttrSet(resourceName, "state"),
 					resource.TestCheckResourceAttrSet(resourceName, "vcn_id"),
 
@@ -102,6 +105,7 @@ func TestCoreDrgAttachmentResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "display_name", "displayName2"),
 					resource.TestCheckResourceAttrSet(resourceName, "drg_id"),
 					resource.TestCheckResourceAttrSet(resourceName, "id"),
+					resource.TestCheckResourceAttrSet(resourceName, "route_table_id"),
 					resource.TestCheckResourceAttrSet(resourceName, "state"),
 					resource.TestCheckResourceAttrSet(resourceName, "vcn_id"),
 
@@ -130,6 +134,7 @@ func TestCoreDrgAttachmentResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(datasourceName, "drg_attachments.0.display_name", "displayName2"),
 					resource.TestCheckResourceAttrSet(datasourceName, "drg_attachments.0.drg_id"),
 					resource.TestCheckResourceAttrSet(datasourceName, "drg_attachments.0.id"),
+					resource.TestCheckResourceAttrSet(datasourceName, "drg_attachments.0.route_table_id"),
 					resource.TestCheckResourceAttrSet(datasourceName, "drg_attachments.0.state"),
 					resource.TestCheckResourceAttrSet(datasourceName, "drg_attachments.0.vcn_id"),
 				),

oci/core_drg_attachments_data_source.go

@@ -139,6 +139,10 @@ func (s *DrgAttachmentsDataSourceCrud) SetData() error {
 			drgAttachment["id"] = *r.Id
 		}
 
+		if r.RouteTableId != nil {
+			drgAttachment["route_table_id"] = *r.RouteTableId
+		}
+
 		drgAttachment["state"] = r.LifecycleState
 
 		if r.TimeCreated != nil {

oci/core_local_peering_gateway_resource.go

@@ -57,6 +57,11 @@ func LocalPeeringGatewayResource() *schema.Resource {
 				Computed: true,
 				Elem:     schema.TypeString,
 			},
+			"route_table_id": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
 			// @CODEGEN we use peer_id to do the connect action
 			"peer_id": {
 				Type:         schema.TypeString,
@@ -74,6 +79,13 @@ func LocalPeeringGatewayResource() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"peer_advertised_cidr_details": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+			},
 			"peering_status": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -245,6 +257,11 @@ func (s *LocalPeeringGatewayResourceCrud) Create() error {
 		request.FreeformTags = objectMapToStringMap(freeformTags.(map[string]interface{}))
 	}
 
+	if routeTableId, ok := s.D.GetOkExists("route_table_id"); ok {
+		tmp := routeTableId.(string)
+		request.RouteTableId = &tmp
+	}
+
 	if vcnId, ok := s.D.GetOkExists("vcn_id"); ok {
 		tmp := vcnId.(string)
 		request.VcnId = &tmp
@@ -301,6 +318,11 @@ func (s *LocalPeeringGatewayResourceCrud) Update() error {
 	tmp := s.D.Id()
 	request.LocalPeeringGatewayId = &tmp
 
+	if routeTableId, ok := s.D.GetOkExists("route_table_id"); ok {
+		tmp := routeTableId.(string)
+		request.RouteTableId = &tmp
+	}
+
 	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "core")
 
 	response, err := s.Client.UpdateLocalPeeringGateway(context.Background(), request)
@@ -347,12 +369,18 @@ func (s *LocalPeeringGatewayResourceCrud) SetData() error {
 		s.D.Set("peer_advertised_cidr", *s.Res.PeerAdvertisedCidr)
 	}
 
+	s.D.Set("peer_advertised_cidr_details", s.Res.PeerAdvertisedCidrDetails)
+
 	s.D.Set("peering_status", s.Res.PeeringStatus)
 
 	if s.Res.PeeringStatusDetails != nil {
 		s.D.Set("peering_status_details", *s.Res.PeeringStatusDetails)
 	}
 
+	if s.Res.RouteTableId != nil {
+		s.D.Set("route_table_id", *s.Res.RouteTableId)
+	}
+
 	s.D.Set("state", s.Res.LifecycleState)
 
 	if s.Res.TimeCreated != nil {

oci/core_local_peering_gateway_test.go

@@ -32,6 +32,7 @@ var (
 		"defined_tags":   Representation{repType: Optional, create: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")}`, update: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "updatedValue")}`},
 		"display_name":   Representation{repType: Optional, create: `displayName`, update: `displayName2`},
 		"freeform_tags":  Representation{repType: Optional, create: map[string]string{"Department": "Finance"}, update: map[string]string{"Department": "Accounting"}},
+		"route_table_id": Representation{repType: Required, create: `${oci_core_vcn.test_vcn.default_route_table_id}`},
 	}
 
 	secondLocalPeeringGatewayRepresentation = map[string]interface{}{
@@ -86,6 +87,7 @@ func TestCoreLocalPeeringGatewayResource_basic(t *testing.T) {
 					generateResourceFromRepresentationMap("oci_core_local_peering_gateway", "test_local_peering_gateway", Required, Create, localPeeringGatewayRepresentation),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
+					resource.TestCheckResourceAttrSet(resourceName, "route_table_id"),
 					resource.TestCheckResourceAttrSet(resourceName, "vcn_id"),
 
 					func(s *terraform.State) (err error) {
@@ -111,6 +113,7 @@ func TestCoreLocalPeeringGatewayResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet(resourceName, "id"),
 					resource.TestCheckResourceAttrSet(resourceName, "is_cross_tenancy_peering"),
 					resource.TestCheckResourceAttrSet(resourceName, "peering_status"),
+					resource.TestCheckResourceAttrSet(resourceName, "route_table_id"),
 					resource.TestCheckResourceAttrSet(resourceName, "state"),
 					resource.TestCheckResourceAttrSet(resourceName, "time_created"),
 					resource.TestCheckResourceAttrSet(resourceName, "vcn_id"),
@@ -134,6 +137,7 @@ func TestCoreLocalPeeringGatewayResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet(resourceName, "id"),
 					resource.TestCheckResourceAttrSet(resourceName, "is_cross_tenancy_peering"),
 					resource.TestCheckResourceAttrSet(resourceName, "peering_status"),
+					resource.TestCheckResourceAttrSet(resourceName, "route_table_id"),
 					resource.TestCheckResourceAttrSet(resourceName, "state"),
 					resource.TestCheckResourceAttrSet(resourceName, "time_created"),
 					resource.TestCheckResourceAttrSet(resourceName, "vcn_id"),
@@ -165,6 +169,7 @@ func TestCoreLocalPeeringGatewayResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet(datasourceName, "local_peering_gateways.0.id"),
 					resource.TestCheckResourceAttrSet(datasourceName, "local_peering_gateways.0.is_cross_tenancy_peering"),
 					resource.TestCheckResourceAttrSet(datasourceName, "local_peering_gateways.0.peering_status"),
+					resource.TestCheckResourceAttrSet(datasourceName, "local_peering_gateways.0.route_table_id"),
 					resource.TestCheckResourceAttrSet(datasourceName, "local_peering_gateways.0.state"),
 					resource.TestCheckResourceAttrSet(datasourceName, "local_peering_gateways.0.time_created"),
 					resource.TestCheckResourceAttrSet(datasourceName, "local_peering_gateways.0.vcn_id"),

oci/core_local_peering_gateways_data_source.go

@@ -121,12 +121,18 @@ func (s *LocalPeeringGatewaysDataSourceCrud) SetData() error {
 			localPeeringGateway["peer_advertised_cidr"] = *r.PeerAdvertisedCidr
 		}
 
+		localPeeringGateway["peer_advertised_cidr_details"] = r.PeerAdvertisedCidrDetails
+
 		localPeeringGateway["peering_status"] = r.PeeringStatus
 
 		if r.PeeringStatusDetails != nil {
 			localPeeringGateway["peering_status_details"] = *r.PeeringStatusDetails
 		}
 
+		if r.RouteTableId != nil {
+			localPeeringGateway["route_table_id"] = *r.RouteTableId
+		}
+
 		localPeeringGateway["state"] = r.LifecycleState
 
 		if r.TimeCreated != nil {

website/docs/d/core_drg_attachments.html.markdown

@@ -49,6 +49,7 @@ The following attributes are exported:
 * `display_name` - A user-friendly name. Does not have to be unique, and it's changeable. Avoid entering confidential information. 
 * `drg_id` - The OCID of the DRG.
 * `id` - The DRG attachment's Oracle ID (OCID).
+* `route_table_id` - The OCID of the route table the DRG attachment is using.
 * `state` - The DRG attachment's current state.
 * `time_created` - The date and time the DRG attachment was created, in the format defined by RFC3339.  Example: `2016-08-25T21:10:29.600Z` 
 * `vcn_id` - The OCID of the VCN.

website/docs/d/core_local_peering_gateways.html.markdown

@@ -47,9 +47,11 @@ The following attributes are exported:
 * `freeform_tags` - Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Department": "Finance"}` 
 * `id` - The LPG's Oracle ID (OCID).
 * `is_cross_tenancy_peering` - Whether the VCN at the other end of the peering is in a different tenancy.  Example: `false` 
-* `peer_advertised_cidr` - The range of IP addresses available on the VCN at the other end of the peering from this LPG. The value is `null` if the LPG is not peered. You can use this as the destination CIDR for a route rule to route a subnet's traffic to this LPG.  Example: `192.168.0.0/16` 
+* `peer_advertised_cidr` - The smallest aggregate CIDR that contains all the CIDR routes advertised by the VCN at the other end of the peering from this LPG. See `peerAdvertisedCidrDetails` for the individual CIDRs. The value is `null` if the LPG is not peered.  Example: `192.168.0.0/16`, or if aggregated with `172.16.0.0/24` then `128.0.0.0/1` 
+* `peer_advertised_cidr_details` - The specific ranges of IP addresses available on or via the VCN at the other end of the peering from this LPG. The value is `null` if the LPG is not peered. You can use these as destination CIDRs for route rules to route a subnet's traffic to this LPG.  Example: [`192.168.0.0/16`, `172.16.0.0/24`] 
 * `peering_status` - Whether the LPG is peered with another LPG. `NEW` means the LPG has not yet been peered. `PENDING` means the peering is being established. `REVOKED` means the LPG at the other end of the peering has been deleted. 
 * `peering_status_details` - Additional information regarding the peering status, if applicable.
+* `route_table_id` - The OCID of the route table the LPG is using.
 * `state` - The LPG's current lifecycle state.
 * `time_created` - The date and time the LPG was created, in the format defined by RFC3339.  Example: `2016-08-25T21:10:29.600Z` 
 * `vcn_id` - The OCID of the VCN the LPG belongs to.

website/docs/r/core_drg_attachment.html.markdown

@@ -32,6 +32,7 @@ resource "oci_core_drg_attachment" "test_drg_attachment" {
 
 	#Optional
 	display_name = "${var.drg_attachment_display_name}"
+	route_table_id = "${oci_core_route_table.test_route_table.id}"
 }
 ```
 
@@ -41,6 +42,9 @@ The following arguments are supported:
 
 * `display_name` - (Optional) (Updatable) A user-friendly name. Does not have to be unique. Avoid entering confidential information.
 * `drg_id` - (Required) The OCID of the DRG.
+* `route_table_id` - (Optional) (Updatable) The OCID of the route table the DRG attachment will use.
+
+	If you don't specify a route table here, the DRG attachment is created without an associated route table. The Networking service does NOT automatically associate the attached VCN's default route table with the DRG attachment. 
 * `vcn_id` - (Required) The OCID of the VCN.
 
 
@@ -55,6 +59,7 @@ The following attributes are exported:
 * `display_name` - A user-friendly name. Does not have to be unique, and it's changeable. Avoid entering confidential information. 
 * `drg_id` - The OCID of the DRG.
 * `id` - The DRG attachment's Oracle ID (OCID).
+* `route_table_id` - The OCID of the route table the DRG attachment is using.
 * `state` - The DRG attachment's current state.
 * `time_created` - The date and time the DRG attachment was created, in the format defined by RFC3339.  Example: `2016-08-25T21:10:29.600Z` 
 * `vcn_id` - The OCID of the VCN.

website/docs/r/core_local_peering_gateway.html.markdown

@@ -25,6 +25,7 @@ resource "oci_core_local_peering_gateway" "test_local_peering_gateway" {
 	display_name = "${var.local_peering_gateway_display_name}"
 	freeform_tags = {"Department"= "Finance"}
 	peer_id = "${oci_core_local_peering_gateway.test_local_peering_gateway2.id}"
+	route_table_id = "${oci_core_route_table.test_route_table.id}"
 }
 ```
 
@@ -41,6 +42,9 @@ The following arguments are supported:
 * `display_name` - (Optional) (Updatable) A user-friendly name. Does not have to be unique, and it's changeable. Avoid entering confidential information. 
 * `freeform_tags` - (Optional) (Updatable) Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Department": "Finance"}` 
 * `peer_id` - (Optional) The OCID of the LPG you want to peer with. Specifying a peer_id connects this local peering gateway (LPG) to another one in the same region. This operation must be called by the VCN administrator who is designated as the *requestor* in the peering relationship. The *acceptor* must implement an Identity and Access Management (IAM) policy that gives the requestor permission to connect to LPGs in the acceptor's compartment. Without that permission, this operation will fail. For more information, see [VCN Peering](https://docs.cloud.oracle.com/iaas/Content/Network/Tasks/VCNpeering.htm).
+* `route_table_id` - (Optional) (Updatable) The OCID of the route table the LPG will use.
+
+	If you don't specify a route table here, the LPG is created without an associated route table. The Networking service does NOT automatically associate the attached VCN's default route table with the LPG. 
 * `vcn_id` - (Required) The OCID of the VCN the LPG belongs to.
 
 
@@ -57,9 +61,11 @@ The following attributes are exported:
 * `freeform_tags` - Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Department": "Finance"}` 
 * `id` - The LPG's Oracle ID (OCID).
 * `is_cross_tenancy_peering` - Whether the VCN at the other end of the peering is in a different tenancy.  Example: `false` 
-* `peer_advertised_cidr` - The range of IP addresses available on the VCN at the other end of the peering from this LPG. The value is `null` if the LPG is not peered. You can use this as the destination CIDR for a route rule to route a subnet's traffic to this LPG.  Example: `192.168.0.0/16` 
+* `peer_advertised_cidr` - The smallest aggregate CIDR that contains all the CIDR routes advertised by the VCN at the other end of the peering from this LPG. See `peerAdvertisedCidrDetails` for the individual CIDRs. The value is `null` if the LPG is not peered.  Example: `192.168.0.0/16`, or if aggregated with `172.16.0.0/24` then `128.0.0.0/1` 
+* `peer_advertised_cidr_details` - The specific ranges of IP addresses available on or via the VCN at the other end of the peering from this LPG. The value is `null` if the LPG is not peered. You can use these as destination CIDRs for route rules to route a subnet's traffic to this LPG.  Example: [`192.168.0.0/16`, `172.16.0.0/24`] 
 * `peering_status` - Whether the LPG is peered with another LPG. `NEW` means the LPG has not yet been peered. `PENDING` means the peering is being established. `REVOKED` means the LPG at the other end of the peering has been deleted. 
 * `peering_status_details` - Additional information regarding the peering status, if applicable.
+* `route_table_id` - The OCID of the route table the LPG is using.
 * `state` - The LPG's current lifecycle state.
 * `time_created` - The date and time the LPG was created, in the format defined by RFC3339.  Example: `2016-08-25T21:10:29.600Z` 
 * `vcn_id` - The OCID of the VCN the LPG belongs to.