Support UpdateDrgAttachment of types Virtual_Circuit, RPC and IPSec

Author: Borys Shchipanskyi

CHANGELOG.md

@@ -7,6 +7,7 @@
 - Support for Bastion Service
 - Support charge for Container Images and Generic Artifacts 
 - Support for Generic Artifacts Service
+- Support Update `DrgAttachment` of types `Virtual_Circuit`, `RPC` and `IPSec`
 
 ## 4.27.0 (May 19, 2021)
 

examples/networking/drg_route/drg_routing.tf

@@ -1,102 +1,71 @@
 // Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
 // Licensed under the Mozilla Public License v2.0
 
-variable "tenancy_ocid" {
-}
-
-variable "user_ocid" {
-}
-
-variable "fingerprint" {
-}
-
-variable "private_key_path" {
-}
-
-variable "region" {
-}
 
-variable "compartment_ocid" {
-}
-
-provider "oci" {
-  tenancy_ocid = var.tenancy_ocid
-  user_ocid = var.user_ocid
-  fingerprint = var.fingerprint
-  private_key_path = var.private_key_path
-  region = var.region
-}
-
-variable "instance_image_ocid" {
-  type = map(string)
-
-  default = {
-    # See https://docs.us-phoenix-1.oraclecloud.com/images/
-    # Oracle-provided image "Oracle-Linux-7.5-2018.10.16-0"
-    us-phoenix-1 = "ocid1.image.oc1.phx.aaaaaaaaoqj42sokaoh42l76wsyhn3k2beuntrh5maj3gmgmzeyr55zzrwwa"
-    us-ashburn-1 = "ocid1.image.oc1.iad.aaaaaaaageeenzyuxgia726xur4ztaoxbxyjlxogdhreu3ngfj2gji3bayda"
-    eu-frankfurt-1 = "ocid1.image.oc1.eu-frankfurt-1.aaaaaaaaitzn6tdyjer7jl34h2ujz74jwy5nkbukbh55ekp6oyzwrtfa4zma"
-    uk-london-1 = "ocid1.image.oc1.uk-london-1.aaaaaaaa32voyikkkzfxyo4xbdmadc2dmvorfxxgdhpnk6dw64fa3l4jh7wa"
-  }
-}
 
 resource "oci_core_vcn" "test_vcn_a" {
-  // required
+  // Required
   cidr_block = "10.0.0.0/16"
   compartment_id = var.compartment_ocid
 
-  // optional
-  display_name = "testVcnA"
+  // Optional
+  display_name = "MyTestVcnA"
   dns_label = "dnslabelA"
 }
 
 
 resource "oci_core_vcn" "test_vcn_b" {
-  // required
+  // Required
   cidr_block = "20.0.0.0/16"
   compartment_id = var.compartment_ocid
 
-  // optional
-  display_name = "testVcnB"
+  // Optional
+  display_name = "MyTestVcnB"
   dns_label = "dnslabelB"
 }
 
 
-resource "oci_core_drg" "test_drg" {
-  // required
+resource "oci_core_drg" "test_vcn_drg" {
+  // Required
   compartment_id = var.compartment_ocid
 
-  // optional
-  display_name = "testDrg"
+  // Optional
+  display_name = "MyTestVcnDrg"
 }
 
-resource "oci_core_drg_route_distribution" "test_drg_route_distribution" {
-  // required
-  drg_id = oci_core_drg.test_drg.id
+resource "oci_core_drg_route_distribution" "test_vcn_drg_route_distribution" {
+  // Required
+  drg_id = oci_core_drg.test_vcn_drg.id
   distribution_type = "IMPORT"
 
   // optional
-  display_name = "testDrgRouteDistribution"
+  display_name = "MyTestVcnDrgRouteDistribution"
 
 }
 
-resource "oci_core_drg_attachment" "test_drg_attachment_a" {
-  // required
-  drg_id = oci_core_drg.test_drg.id
+resource "oci_core_drg_attachment" "test_vcn_drg_attachment_a" {
+  // Required
+  drg_id = oci_core_drg.test_vcn_drg.id
   vcn_id = oci_core_vcn.test_vcn_a.id
 
+  // Optional
+  drg_route_table_id = oci_core_drg_route_table.test_vcn_drg_route_table.id
+
 }
 
-resource "oci_core_drg_attachment" "test_drg_attachment_b" {
-  // required
-  drg_id = oci_core_drg.test_drg.id
+resource "oci_core_drg_attachment" "test_vcn_drg_attachment_b" {
+  // Required
+  drg_id = oci_core_drg.test_vcn_drg.id
   vcn_id = oci_core_vcn.test_vcn_b.id
 
+  // Optional
+  drg_route_table_id = oci_core_drg_route_table.test_vcn_drg_route_table.id
+
 }
 
-resource "oci_core_drg_route_distribution_statement" "test_drg_route_distribution_statements" {
-  // required
-  drg_route_distribution_id = oci_core_drg_route_distribution.test_drg_route_distribution.id
+resource "oci_core_drg_route_distribution_statement" "test_vcn_drg_route_distribution_statements" {
+  // Required
+  drg_route_distribution_id = oci_core_drg_route_distribution.test_vcn_drg_route_distribution.id
   action = "ACCEPT"
 
   match_criteria {
@@ -109,19 +78,24 @@ resource "oci_core_drg_route_distribution_statement" "test_drg_route_distributio
 
 }
 
-data "oci_core_drg_route_distribution" "test_drg_route_distribution_data" {
-  // required
-  drg_route_distribution_id = oci_core_drg_route_distribution.test_drg_route_distribution.id
+data "oci_core_drg_route_distribution" "test_vcn_drg_route_distribution_data" {
+  // Required
+  drg_route_distribution_id = oci_core_drg_route_distribution.test_vcn_drg_route_distribution.id
 }
 
-resource "oci_core_drg_route_table" "test_drg_route_table" {
-  drg_id = oci_core_drg.test_drg.id
+resource "oci_core_drg_route_table" "test_vcn_drg_route_table" {
+  drg_id = oci_core_drg.test_vcn_drg.id
+
+  // Optional
+  import_drg_route_distribution_id = oci_core_drg_route_distribution.test_vcn_drg_route_distribution.id
+  display_name = "MyTestVcnDrgRouteTable"
 }
 
-resource "oci_core_drg_route_table_route_rule" "test_drg_route_table_route_rule" {
-  #Required
-  drg_route_table_id = oci_core_drg_route_table.test_drg_route_table.id
+resource "oci_core_drg_route_table_route_rule" "test_vcn_drg_route_table_route_rule" {
+  // Required
+  drg_route_table_id = oci_core_drg_route_table.test_vcn_drg_route_table.id
   destination                = "10.0.0.0/8"
   destination_type           = "CIDR_BLOCK"
-  next_hop_drg_attachment_id = oci_core_drg_attachment.test_drg_attachment_a.id
+  next_hop_drg_attachment_id = oci_core_drg_attachment.test_vcn_drg_attachment_a.id
 }
+

examples/networking/drg_route/drg_routing_ipsec_rpc.tf

@@ -0,0 +1,126 @@
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+resource "oci_core_drg" "test_drg" {
+  // required
+  compartment_id = var.compartment_ocid
+
+  // optional
+  display_name = "MyTestDrg"
+}
+
+resource "oci_core_drg_route_distribution" "test_drg_route_distribution" {
+  // Required
+  drg_id = oci_core_drg.test_drg.id
+  distribution_type = "IMPORT"
+
+  // Optional
+  display_name = "MyTestDrgRouteDistribution"
+}
+
+resource "oci_core_drg_route_table" "test_drg_route_table" {
+  // Required
+  drg_id = oci_core_drg.test_drg.id
+
+  // Optional
+  import_drg_route_distribution_id = oci_core_drg_route_distribution.test_drg_route_distribution.id
+  display_name = "MyTestDrgRouteTable"
+}
+
+// RPC
+resource "oci_core_remote_peering_connection" "test_rpc" {
+
+  compartment_id = var.compartment_ocid
+  drg_id         = oci_core_drg.test_drg.id
+  display_name   = "MyTestRemotePeeringConnection"
+}
+
+
+// IPSec Start
+
+resource "oci_core_ipsec" "test_ip_sec_connection" {
+  // Required
+  compartment_id = var.compartment_ocid
+  cpe_id = oci_core_cpe.test_cpe.id
+  drg_id = oci_core_drg.test_drg.id
+  static_routes = [
+    "10.0.0.0/16"]
+
+  // Optional
+  cpe_local_identifier = "189.44.2.135"
+  cpe_local_identifier_type = "IP_ADDRESS"
+  display_name = "MyTestIPSecConnection"
+
+  freeform_tags = {
+    "Department" = "Finance"
+  }
+}
+
+resource "oci_core_cpe" "test_cpe" {
+  compartment_id = var.compartment_ocid
+  display_name = "test_cpe"
+  ip_address = "189.44.2.135"
+  cpe_device_shape_id = data.oci_core_cpe_device_shape.test_cpe_device_shape.id
+}
+
+data "oci_core_cpe_device_shape" "test_cpe_device_shape" {
+  cpe_device_shape_id = data.oci_core_cpe_device_shapes.test_cpe_device_shapes.cpe_device_shapes[0].cpe_device_shape_id
+}
+
+data "oci_core_ipsec_connection_tunnels" "test_ip_sec_connection_tunnels" {
+  ipsec_id = oci_core_ipsec.test_ip_sec_connection.id
+}
+data "oci_core_cpe_device_shapes" "test_cpe_device_shapes" {
+}
+//  IPsec end
+
+
+// Get auto generated attachment for ipsec tunnel 1
+resource "oci_core_drg_attachment_management" "test_drg_ipsec_attachment_tunnel_1" {
+  // Required
+  attachment_type = "IPSEC_TUNNEL"
+  compartment_id = var.compartment_ocid
+  drg_id = oci_core_drg.test_vcn_drg.id
+  network_id = data.oci_core_ipsec_connection_tunnels.test_ip_sec_connection_tunnels.ip_sec_connection_tunnels[0].id
+
+  // Optional
+  display_name = "MyTestDrgAttachmentForTunnel1"
+  drg_route_table_id = oci_core_drg_route_table.test_drg_route_table.id
+
+}
+// Get auto generated attachment for ipsec tunnel 2
+resource "oci_core_drg_attachment_management" "test_drg_ipsec_attachment_tunnel_2" {
+  // Required
+  attachment_type = "IPSEC_TUNNEL"
+  compartment_id = var.compartment_ocid
+  drg_id = oci_core_drg.test_vcn_drg.id
+  network_id = data.oci_core_ipsec_connection_tunnels.test_ip_sec_connection_tunnels.ip_sec_connection_tunnels[1].id
+
+  // Optional
+  display_name = "MyTestDrgAttachmentForTunnel2"
+  drg_route_table_id = oci_core_drg_route_table.test_drg_route_table.id
+
+}
+
+// Get auto generated attachment for rpc by rpc.id
+resource "oci_core_drg_attachment_management" "test_drg_rpc_attachment" {
+  // Required
+  attachment_type = "REMOTE_PEERING_CONNECTION"
+  compartment_id = var.compartment_ocid
+  network_id = oci_core_remote_peering_connection.test_rpc.id
+  drg_id = oci_core_drg.test_vcn_drg.id
+
+  // Optional
+  display_name = "MyTestDrgAttachmentForRpc"
+  drg_route_table_id = oci_core_drg_route_table.test_drg_route_table.id
+
+}
+//
+
+// Add Static route
+resource "oci_core_drg_route_table_route_rule" "test_drg_rpc_route_table_route_rule" {
+  drg_route_table_id = oci_core_drg_route_table.test_drg_route_table.id
+  destination = "10.0.0.0/16"
+  destination_type = "CIDR_BLOCK"
+  next_hop_drg_attachment_id = oci_core_drg_attachment_management.test_drg_rpc_attachment.id
+}

examples/networking/drg_route/input.tf

@@ -0,0 +1,38 @@
+variable "tenancy_ocid" {
+}
+
+variable "user_ocid" {
+}
+
+variable "fingerprint" {
+}
+
+variable "private_key_path" {
+}
+
+variable "region" {
+}
+
+variable "compartment_ocid" {
+}
+
+provider "oci" {
+  tenancy_ocid = var.tenancy_ocid
+  user_ocid = var.user_ocid
+  fingerprint = var.fingerprint
+  private_key_path = var.private_key_path
+  region = var.region
+}
+
+variable "instance_image_ocid" {
+  type = map(string)
+
+  default = {
+    # See https://docs.us-phoenix-1.oraclecloud.com/images/
+    # Oracle-provided image "Oracle-Linux-7.5-2018.10.16-0"
+    us-phoenix-1 = "ocid1.image.oc1.phx.aaaaaaaaoqj42sokaoh42l76wsyhn3k2beuntrh5maj3gmgmzeyr55zzrwwa"
+    us-ashburn-1 = "ocid1.image.oc1.iad.aaaaaaaageeenzyuxgia726xur4ztaoxbxyjlxogdhreu3ngfj2gji3bayda"
+    eu-frankfurt-1 = "ocid1.image.oc1.eu-frankfurt-1.aaaaaaaaitzn6tdyjer7jl34h2ujz74jwy5nkbukbh55ekp6oyzwrtfa4zma"
+    uk-london-1 = "ocid1.image.oc1.uk-london-1.aaaaaaaa32voyikkkzfxyo4xbdmadc2dmvorfxxgdhpnk6dw64fa3l4jh7wa"
+  }
+}