Added - terraform changes for lldp

Author: Rajat Koti

internal/integrationtest/core_cross_connect_test.go

@@ -239,6 +239,8 @@ func TestCoreCrossConnectResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttrSet(datasourceName, "cross_connects.0.macsec_properties.0.primary_key.0.connectivity_association_key_secret_version"),
 				resource.TestCheckResourceAttrSet(datasourceName, "cross_connects.0.macsec_properties.0.primary_key.0.connectivity_association_name_secret_id"),
 				resource.TestCheckResourceAttrSet(datasourceName, "cross_connects.0.macsec_properties.0.primary_key.0.connectivity_association_name_secret_version"),
+				resource.TestCheckResourceAttrSet(datasourceName, "cross_connects.0.oci_logical_device_name"),
+				resource.TestCheckResourceAttrSet(datasourceName, "cross_connects.0.oci_physical_device_name"),
 				resource.TestCheckResourceAttr(datasourceName, "cross_connects.0.macsec_properties.0.state", "ENABLED"),
 				resource.TestCheckResourceAttrSet(datasourceName, "cross_connects.0.port_name"),
 				resource.TestCheckResourceAttr(datasourceName, "cross_connects.0.port_speed_shape_name", "10 Gbps"),
@@ -266,6 +268,8 @@ func TestCoreCrossConnectResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(singularDatasourceName, "macsec_properties.0.primary_key.#", "1"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "macsec_properties.0.primary_key.0.connectivity_association_key_secret_version"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "macsec_properties.0.primary_key.0.connectivity_association_name_secret_version"),
+				resource.TestCheckResourceAttrSet(singularDatasourceName, "oci_logical_device_name"),
+				resource.TestCheckResourceAttrSet(singularDatasourceName, "oci_physical_device_name"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "macsec_properties.0.state", "ENABLED"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "port_name"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "port_speed_shape_name", "10 Gbps"),

internal/service/core/core_cross_connect_data_source.go

@@ -98,6 +98,14 @@ func (s *CoreCrossConnectDataSourceCrud) SetData() error {
 		s.D.Set("macsec_properties", nil)
 	}
 
+	if s.Res.OciLogicalDeviceName != nil {
+		s.D.Set("oci_logical_device_name", *s.Res.OciLogicalDeviceName)
+	}
+
+	if s.Res.OciPhysicalDeviceName != nil {
+		s.D.Set("oci_physical_device_name", *s.Res.OciPhysicalDeviceName)
+	}
+
 	if s.Res.PortName != nil {
 		s.D.Set("port_name", *s.Res.PortName)
 	}

internal/service/core/core_cross_connect_group_data_source.go

@@ -90,6 +90,14 @@ func (s *CoreCrossConnectGroupDataSourceCrud) SetData() error {
 		s.D.Set("macsec_properties", nil)
 	}
 
+	if s.Res.OciLogicalDeviceName != nil {
+		s.D.Set("oci_logical_device_name", *s.Res.OciLogicalDeviceName)
+	}
+
+	if s.Res.OciPhysicalDeviceName != nil {
+		s.D.Set("oci_physical_device_name", *s.Res.OciPhysicalDeviceName)
+	}
+
 	s.D.Set("state", s.Res.LifecycleState)
 
 	if s.Res.TimeCreated != nil {

internal/service/core/core_cross_connect_group_resource.go

@@ -115,6 +115,14 @@ func CoreCrossConnectGroupResource() *schema.Resource {
 			},
 
 			// Computed
+			"oci_logical_device_name": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"oci_physical_device_name": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"state": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -374,6 +382,14 @@ func (s *CoreCrossConnectGroupResourceCrud) SetData() error {
 		s.D.Set("macsec_properties", nil)
 	}
 
+	if s.Res.OciLogicalDeviceName != nil {
+		s.D.Set("oci_logical_device_name", *s.Res.OciLogicalDeviceName)
+	}
+
+	if s.Res.OciPhysicalDeviceName != nil {
+		s.D.Set("oci_physical_device_name", *s.Res.OciPhysicalDeviceName)
+	}
+
 	s.D.Set("state", s.Res.LifecycleState)
 
 	if s.Res.TimeCreated != nil {

internal/service/core/core_cross_connect_groups_data_source.go

@@ -134,6 +134,14 @@ func (s *CoreCrossConnectGroupsDataSourceCrud) SetData() error {
 			crossConnectGroup["macsec_properties"] = nil
 		}
 
+		if r.OciLogicalDeviceName != nil {
+			crossConnectGroup["oci_logical_device_name"] = *r.OciLogicalDeviceName
+		}
+
+		if r.OciPhysicalDeviceName != nil {
+			crossConnectGroup["oci_physical_device_name"] = *r.OciPhysicalDeviceName
+		}
+
 		crossConnectGroup["state"] = r.LifecycleState
 
 		if r.TimeCreated != nil {

internal/service/core/core_cross_connect_resource.go

@@ -151,6 +151,14 @@ func CoreCrossConnectResource() *schema.Resource {
 			},
 
 			// Computed
+			"oci_logical_device_name": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"oci_physical_device_name": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"port_name": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -474,6 +482,14 @@ func (s *CoreCrossConnectResourceCrud) SetData() error {
 		s.D.Set("macsec_properties", nil)
 	}
 
+	if s.Res.OciLogicalDeviceName != nil {
+		s.D.Set("oci_logical_device_name", *s.Res.OciLogicalDeviceName)
+	}
+
+	if s.Res.OciPhysicalDeviceName != nil {
+		s.D.Set("oci_physical_device_name", *s.Res.OciPhysicalDeviceName)
+	}
+
 	if s.Res.PortName != nil {
 		s.D.Set("port_name", *s.Res.PortName)
 	}

internal/service/core/core_cross_connects_data_source.go

@@ -151,6 +151,14 @@ func (s *CoreCrossConnectsDataSourceCrud) SetData() error {
 			crossConnect["macsec_properties"] = nil
 		}
 
+		if r.OciLogicalDeviceName != nil {
+			crossConnect["oci_logical_device_name"] = *r.OciLogicalDeviceName
+		}
+
+		if r.OciPhysicalDeviceName != nil {
+			crossConnect["oci_physical_device_name"] = *r.OciPhysicalDeviceName
+		}
+
 		if r.PortName != nil {
 			crossConnect["port_name"] = *r.PortName
 		}

internal/service/core/core_instance_resource.go

@@ -1223,6 +1223,11 @@ func (s *CoreInstanceResourceCrud) Delete() error {
 		request.PreserveBootVolume = &tmp
 	}
 
+	if preserveDataVolumes, ok := s.D.GetOkExists("preserve_data_volumes"); ok {
+		tmp := preserveDataVolumes.(bool)
+		request.PreserveDataVolumes = &tmp
+	}
+
 	request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(s.DisableNotFoundRetries, "core")
 
 	_, err := s.Client.TerminateInstance(context.Background(), request)

website/docs/d/core_boot_volume.html.markdown

@@ -32,7 +32,7 @@ The following arguments are supported:
 
 The following attributes are exported:
 
-* `auto_tuned_vpus_per_gb` - The number of Volume Performance Units per GB that this boot volume is effectively tuned to when it's idle. 
+* `auto_tuned_vpus_per_gb` - The number of Volume Performance Units per GB that this boot volume is effectively tuned to. 
 * `availability_domain` - The availability domain of the boot volume.  Example: `Uocm:PHX-AD-1` 
 * `boot_volume_replicas` - The list of boot volume replicas of this boot volume
 	* `availability_domain` - The availability domain of the boot volume replica.  Example: `Uocm:PHX-AD-1` 
@@ -44,7 +44,7 @@ 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 boot volume's Oracle ID (OCID).
 * `image_id` - The image OCID used to create the boot volume.
-* `is_auto_tune_enabled` - Specifies whether the auto-tune performance is enabled for this boot volume. 
+* `is_auto_tune_enabled` - Specifies whether the auto-tune performance is enabled for this boot volume. This field is deprecated. Use the `DetachedVolumeAutotunePolicy` instead to enable the volume for detached autotune. 
 * `is_hydrated` - Specifies whether the boot volume's data has finished copying from the source boot volume or boot volume backup. 
 * `kms_key_id` - The OCID of the Key Management master encryption key assigned to the boot volume.
 * `size_in_gbs` - The size of the boot volume in GBs.
@@ -60,5 +60,7 @@ The following attributes are exported:
 
 	Allowed values:
 	* `10`: Represents Balanced option.
-	* `20`: Represents Higher Performance option. 
+	* `20`: Represents Higher Performance option.
+
+	For performance autotune enabled volumes, It would be the Default(Minimum) VPUs/GB. 
 

website/docs/d/core_boot_volume_attachments.html.markdown

@@ -56,7 +56,7 @@ The following attributes are exported:
 * `encryption_in_transit_type` - Refer the top-level definition of encryptionInTransitType. The default value is NONE. 
 * `id` - The OCID of the boot volume attachment.
 * `instance_id` - The OCID of the instance the boot volume is attached to.
-* `is_pv_encryption_in_transit_enabled` - Whether in-transit encryption for the boot volume's paravirtualized attachment is enabled or not.
+* `is_pv_encryption_in_transit_enabled` - Whether in-transit encryption for the boot volume's paravirtualized attachment is enabled or not. 
 * `state` - The current state of the boot volume attachment.
 * `time_created` - The date and time the boot volume was created, in the format defined by [RFC3339](https://tools.ietf.org/html/rfc3339).  Example: `2016-08-25T21:10:29.600Z`