Added - ShapeConfig in List Shape in Core service

Author: Fangyan Xu

internal/integrationtest/core_drg_attachment_test.go

@@ -428,6 +428,7 @@ func drgAttachmentSweepResponseFetchOperation(client *tf_client.OracleClients, r
 }
 
 // Adding a test case for testing the Update request. Updating both drg_route_table_id from and route_table_id simultaneously.
+// issue-routing-tag: core/computeSharedOwnershipVmAndBm
 func TestCoreDrgAttachmentUpdateRequest_basic(t *testing.T) {
 	httpreplay.SetScenario("TestCoreDrgAttachmentResource_basic")
 	defer httpreplay.SaveScenario()

internal/integrationtest/core_instance_resource_test.go

@@ -1700,6 +1700,7 @@ func TestAccResourceCoreInstance_BM_Milan_instance_resource(t *testing.T) {
 	})
 }
 
+// issue-routing-tag: core/computeSharedOwnershipVmAndBm
 func TestAccResourceCoreInstance_BM_Rome_shielded_instance_resource(t *testing.T) {
 	if strings.Contains(utils.GetEnvSettingWithBlankDefault("suppressed_tests"), "TestAccResourceCoreInstance_BM_Rome_shielded_instance_resource") {
 		t.Skip("Skipping suppressed TestAccResourceCoreInstance_BM_Rome_shielded_instance_resource")
@@ -1808,6 +1809,7 @@ func TestAccResourceCoreInstance_BM_Rome_shielded_instance_resource(t *testing.T
 	})
 }
 
+// issue-routing-tag: core/computeSharedOwnershipVmAndBm
 func TestAccResourceCoreInstance_BM_Skylake_shielded_instance_resource(t *testing.T) {
 	if strings.Contains(utils.GetEnvSettingWithBlankDefault("suppressed_tests"), "TestAccResourceCoreInstance_BM_Skylake_shielded_instance_resource") {
 		t.Skip("Skipping suppressed TestAccResourceCoreInstance_BM_Skylake_shielded_instance_resource")
@@ -1916,6 +1918,7 @@ func TestAccResourceCoreInstance_BM_Skylake_shielded_instance_resource(t *testin
 	})
 }
 
+// issue-routing-tag: core/computeSharedOwnershipVmAndBm
 func TestAccResourceCoreInstance_VM_Intel_shielded_instance_resource(t *testing.T) {
 	if strings.Contains(utils.GetEnvSettingWithBlankDefault("suppressed_tests"), "TestAccResourceCoreInstance_VM_Intel_shielded_instance_resource") {
 		t.Skip("Skipping suppressed TestAccResourceCoreInstance_VM_Intel_shielded_instance_resource")
@@ -2024,6 +2027,7 @@ func TestAccResourceCoreInstance_VM_Intel_shielded_instance_resource(t *testing.
 	})
 }
 
+// issue-routing-tag: core/computeSharedOwnershipVmAndBm
 func TestAccResourceCoreInstance_VM_Amd_shielded_instance_resource(t *testing.T) {
 	if strings.Contains(utils.GetEnvSettingWithBlankDefault("suppressed_tests"), "TestAccResourceCoreInstance_VM_Amd_shielded_instance_resource") {
 		t.Skip("Skipping suppressed TestAccResourceCoreInstance_VM_Amd_shielded_instance_resource")

internal/integrationtest/core_shape_test.go

@@ -89,9 +89,13 @@ func TestCoreShapeResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(datasourceName, "compartment_id", compartmentId),
 
 				resource.TestCheckResourceAttrSet(datasourceName, "shapes.#"),
+				resource.TestCheckResourceAttrSet(datasourceName, "shapes.0.billing_type"),
 				resource.TestCheckResourceAttrSet(datasourceName, "shapes.0.gpus"),
 				//resource.TestCheckResourceAttrSet(datasourceName, "shapes.0.local_disk_description"),
+				resource.TestCheckResourceAttrSet(datasourceName, "shapes.0.is_billed_for_stopped_instance"),
+				resource.TestCheckResourceAttrSet(datasourceName, "shapes.0.is_flexible"),
 				resource.TestCheckResourceAttrSet(datasourceName, "shapes.0.is_live_migration_supported"),
+				resource.TestCheckResourceAttrSet(datasourceName, "shapes.0.is_subcore"),
 				resource.TestCheckResourceAttrSet(datasourceName, "shapes.0.local_disks"),
 				resource.TestCheckResourceAttrSet(datasourceName, "shapes.0.local_disks_total_size_in_gbs"),
 				resource.TestCheckResourceAttrSet(datasourceName, "shapes.0.max_vnic_attachments"),
@@ -100,6 +104,9 @@ func TestCoreShapeResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttrSet(datasourceName, "shapes.0.networking_bandwidth_in_gbps"),
 				resource.TestCheckResourceAttrSet(datasourceName, "shapes.0.ocpus"),
 				resource.TestCheckResourceAttrSet(datasourceName, "shapes.0.processor_description"),
+				resource.TestCheckResourceAttrSet(datasourceName, "shapes.0.quota_names.#"),
+				resource.TestCheckResourceAttrSet(datasourceName, "shapes.0.recommended_alternatives.#"),
+				resource.TestCheckResourceAttrSet(datasourceName, "shapes.0.resize_compatible_shapes.#"),
 			),
 		},
 

internal/integrationtest/core_volume_group_backup_copy_test.go

@@ -38,6 +38,7 @@ var (
 	volumeGroupBackupSourceDetailsRepresentation = map[string]interface{}{}
 )
 
+// issue-routing-tag: core/computeSharedOwnershipVmAndBm
 func TestResourceCoreVolumeGroupBackup_copy(t *testing.T) {
 	httpreplay.SetScenario("TestResourceCoreVolumeGroupBackup_copy")
 	defer httpreplay.SaveScenario()

internal/service/core/core_shapes_data_source.go

@@ -48,6 +48,10 @@ func CoreShapesDataSource() *schema.Resource {
 								Type: schema.TypeString,
 							},
 						},
+						"billing_type": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
 						"gpu_description": {
 							Type:     schema.TypeString,
 							Computed: true,
@@ -56,10 +60,22 @@ func CoreShapesDataSource() *schema.Resource {
 							Type:     schema.TypeInt,
 							Computed: true,
 						},
+						"is_billed_for_stopped_instance": {
+							Type:     schema.TypeBool,
+							Computed: true,
+						},
+						"is_flexible": {
+							Type:     schema.TypeBool,
+							Computed: true,
+						},
 						"is_live_migration_supported": {
 							Type:     schema.TypeBool,
 							Computed: true,
 						},
+						"is_subcore": {
+							Type:     schema.TypeBool,
+							Computed: true,
+						},
 						"local_disk_description": {
 							Type:     schema.TypeString,
 							Computed: true,
@@ -335,6 +351,37 @@ func CoreShapesDataSource() *schema.Resource {
 							Type:     schema.TypeString,
 							Computed: true,
 						},
+						"quota_names": {
+							Type:     schema.TypeList,
+							Computed: true,
+							Elem: &schema.Schema{
+								Type: schema.TypeString,
+							},
+						},
+						"recommended_alternatives": {
+							Type:     schema.TypeList,
+							Computed: true,
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									// Required
+
+									// Optional
+
+									// Computed
+									"shape_name": {
+										Type:     schema.TypeString,
+										Computed: true,
+									},
+								},
+							},
+						},
+						"resize_compatible_shapes": {
+							Type:     schema.TypeList,
+							Computed: true,
+							Elem: &schema.Schema{
+								Type: schema.TypeString,
+							},
+						},
 					},
 				},
 			},
@@ -419,6 +466,8 @@ func (s *CoreShapesDataSourceCrud) SetData() error {
 
 		shape["baseline_ocpu_utilizations"] = bous
 
+		shape["billing_type"] = r.BillingType
+
 		if r.GpuDescription != nil {
 			shape["gpu_description"] = *r.GpuDescription
 		}
@@ -427,10 +476,22 @@ func (s *CoreShapesDataSourceCrud) SetData() error {
 			shape["gpus"] = *r.Gpus
 		}
 
+		if r.IsBilledForStoppedInstance != nil {
+			shape["is_billed_for_stopped_instance"] = *r.IsBilledForStoppedInstance
+		}
+
+		if r.IsFlexible != nil {
+			shape["is_flexible"] = *r.IsFlexible
+		}
+
 		if r.IsLiveMigrationSupported != nil {
 			shape["is_live_migration_supported"] = *r.IsLiveMigrationSupported
 		}
 
+		if r.IsSubcore != nil {
+			shape["is_subcore"] = *r.IsSubcore
+		}
+
 		if r.LocalDiskDescription != nil {
 			shape["local_disk_description"] = *r.LocalDiskDescription
 		}
@@ -501,6 +562,16 @@ func (s *CoreShapesDataSourceCrud) SetData() error {
 			shape["processor_description"] = *r.ProcessorDescription
 		}
 
+		shape["quota_names"] = r.QuotaNames
+
+		recommendedAlternatives := []interface{}{}
+		for _, item := range r.RecommendedAlternatives {
+			recommendedAlternatives = append(recommendedAlternatives, ShapeAlternativeObjectToMap(item))
+		}
+		shape["recommended_alternatives"] = recommendedAlternatives
+
+		shape["resize_compatible_shapes"] = r.ResizeCompatibleShapes
+
 		resources = append(resources, shape)
 	}
 
@@ -515,6 +586,16 @@ func (s *CoreShapesDataSourceCrud) SetData() error {
 	return nil
 }
 
+func ShapeAlternativeObjectToMap(obj oci_core.ShapeAlternativeObject) map[string]interface{} {
+	result := map[string]interface{}{}
+
+	if obj.ShapeName != nil {
+		result["shape_name"] = string(*obj.ShapeName)
+	}
+
+	return result
+}
+
 func ShapeMaxVnicAttachmentOptionsToMap(obj *oci_core.ShapeMaxVnicAttachmentOptions) map[string]interface{} {
 	result := map[string]interface{}{}
 

website/docs/d/core_instance_configuration.html.markdown

@@ -65,7 +65,9 @@ The following attributes are exported:
 				Allowed values:
 				* `0`: Represents Lower Cost option.
 				* `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. 
 		* `volume_id` - The OCID of the volume.
 	* `instance_type` - The type of instance details. Supported instanceType is compute 
 	* `launch_details` - Instance launch details for creating an instance from an instance configuration. Use the `sourceDetails` parameter to specify whether a boot volume or an image should be used to launch a new instance.
@@ -201,11 +203,11 @@ The following attributes are exported:
 			If you provide the parameter, the instance is created with the platform configuration that you specify. For any values that you omit, the instance uses the default configuration values for the `shape` that you specify. If you don't provide the parameter, the default values for the `shape` are used.
 
 			Each shape only supports certain configurable values. If the values that you provide are not valid for the specified `shape`, an error is returned. 
-			* `is_measured_boot_enabled` - Whether the Measured Boot is to be enabled on the instance 
-			* `is_secure_boot_enabled` - Whether the Secure Boot is to be enabled on the instance 
-			* `is_trusted_platform_module_enabled` - Whether the Trusted Platform Module (TPM) is to be enabled on the instance 
-			* `numa_nodes_per_socket` - The number of NUMA nodes per socket. 
-			* `type` - The type of platform being configured. (Supported types=[INTEL_VM, AMD_MILAN_BM, AMD_ROME_BM, INTEL_SKYLAKE_BM])
+			* `is_measured_boot_enabled` - Whether the Measured Boot feature is enabled on the instance. 
+			* `is_secure_boot_enabled` - Whether Secure Boot is enabled on the instance. 
+			* `is_trusted_platform_module_enabled` - Whether the Trusted Platform Module (TPM) is enabled on the instance. 
+			* `numa_nodes_per_socket` - The number of NUMA nodes per socket (NPS). 
+			* `type` - The type of platform being configured. 
 		* `preemptible_instance_config` - Configuration options for preemptible instances. 
 			* `preemption_action` - The action to run when the preemptible instance is interrupted for eviction. 
 				* `preserve_boot_volume` - Whether to preserve the boot volume that was used to launch the preemptible instance when the instance is terminated. Defaults to false if not specified. 

website/docs/d/core_instance_configurations.html.markdown

@@ -72,7 +72,9 @@ The following attributes are exported:
 				Allowed values:
 				* `0`: Represents Lower Cost option.
 				* `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. 
 		* `volume_id` - The OCID of the volume.
 	* `instance_type` - The type of instance details. Supported instanceType is compute 
 	* `launch_details` - Instance launch details for creating an instance from an instance configuration. Use the `sourceDetails` parameter to specify whether a boot volume or an image should be used to launch a new instance.
@@ -208,11 +210,11 @@ The following attributes are exported:
 			If you provide the parameter, the instance is created with the platform configuration that you specify. For any values that you omit, the instance uses the default configuration values for the `shape` that you specify. If you don't provide the parameter, the default values for the `shape` are used.
 
 			Each shape only supports certain configurable values. If the values that you provide are not valid for the specified `shape`, an error is returned. 
-			* `is_measured_boot_enabled` - Whether the Measured Boot is to be enabled on the instance 
-			* `is_secure_boot_enabled` - Whether the Secure Boot is to be enabled on the instance 
-			* `is_trusted_platform_module_enabled` - Whether the Trusted Platform Module (TPM) is to be enabled on the instance 
-			* `numa_nodes_per_socket` - The number of NUMA nodes per socket. 
-			* `type` - The type of platform being configured. (Supported types=[INTEL_VM, AMD_MILAN_BM, AMD_ROME_BM, INTEL_SKYLAKE_BM])
+			* `is_measured_boot_enabled` - Whether the Measured Boot feature is enabled on the instance. 
+			* `is_secure_boot_enabled` - Whether Secure Boot is enabled on the instance. 
+			* `is_trusted_platform_module_enabled` - Whether the Trusted Platform Module (TPM) is enabled on the instance. 
+			* `numa_nodes_per_socket` - The number of NUMA nodes per socket (NPS). 
+			* `type` - The type of platform being configured. 
 		* `preemptible_instance_config` - Configuration options for preemptible instances. 
 			* `preemption_action` - The action to run when the preemptible instance is interrupted for eviction. 
 				* `preserve_boot_volume` - Whether to preserve the boot volume that was used to launch the preemptible instance when the instance is terminated. Defaults to false if not specified. 

website/docs/d/core_internet_gateways.html.markdown

@@ -56,5 +56,5 @@ The following attributes are exported:
 * `id` - The internet gateway's Oracle ID ([OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm)).
 * `state` - The internet gateway's current state.
 * `time_created` - The date and time the internet gateway was created, in the format defined by [RFC3339](https://tools.ietf.org/html/rfc3339).  Example: `2016-08-25T21:10:29.600Z` 
-* `vcn_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the VCN the internet gateway belongs to.
+* `vcn_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the VCN the Internet Gateway belongs to.
 

website/docs/d/core_shapes.html.markdown

@@ -47,11 +47,15 @@ The following attributes are exported:
 The following attributes are exported:
 
 * `baseline_ocpu_utilizations` - For a subcore burstable VM, the supported baseline OCPU utilization for instances that use this shape. 
+* `billing_type` - How instances that use this shape are charged. 
 * `gpu_description` - A short description of the graphics processing unit (GPU) available for this shape.
 
 	If the shape does not have any GPUs, this field is `null`. 
 * `gpus` - The number of GPUs available for this shape. 
+* `is_billed_for_stopped_instance` - Whether billing continues when the instances that use this shape are in the stopped state. 
+* `is_flexible` - Whether the shape supports creating flexible instances. A [flexible shape](https://docs.cloud.oracle.com/iaas/Content/Compute/References/computeshapes.htm#flexible) is a shape that lets you customize the number of OCPUs and the amount of memory when launching or resizing your instance. 
 * `is_live_migration_supported` - Whether Live Migration is currently supported for this shape. 
+* `is_subcore` - Whether the shape supports creating subcore or burstable instances. A [burstable instance](https://docs.cloud.oracle.com/iaas/Content/Compute/References/burstable-instances.htm) is a virtual machine (VM) instance that provides a baseline level of CPU performance with the ability to burst to a higher level to support occasional spikes in usage. 
 * `local_disk_description` - A short description of the local disks available for this shape.
 
 	If the shape does not have any local disks, this field is `null`. 
@@ -105,4 +109,8 @@ The following attributes are exported:
 		* `is_default_enabled` - Indicates whether Trusted Platform Module is to be enabled by default 
 	* `type` - The type of platform being configured. (Supported types=[INTEL_VM, AMD_MILAN_BM, AMD_ROME_BM, INTEL_SKYLAKE_BM]) 
 * `processor_description` - A short description of the shape's processor (CPU). 
+* `quota_names` - The list of of compartment quotas for the shape. 
+* `recommended_alternatives` - The list of shapes and shape details (if applicable) that Oracle recommends that you use as an alternative to the current shape. 
+	* `shape_name` - The name of the shape. 
+* `resize_compatible_shapes` - The list of compatible shapes that this shape can be changed to. For more information, see [Changing the Shape of an Instance](https://docs.cloud.oracle.com/iaas/Content/Compute/Tasks/resizinginstances.htm). 
 

website/docs/r/core_boot_volume.html.markdown

@@ -62,7 +62,7 @@ The following arguments are supported:
 * `defined_tags` - (Optional) (Updatable) Defined tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Operations.CostCenter": "42"}` 
 * `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"}` 
-* `is_auto_tune_enabled` - (Optional) (Updatable) 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_auto_tune_enabled` - (Optional) (Updatable) Specifies whether the auto-tune performance is enabled for this boot volume.
 * `kms_key_id` - (Optional) (Updatable) The OCID of the Key Management key to assign as the master encryption key for the boot volume. 
 * `size_in_gbs` - (Optional) (Updatable) The size of the volume in GBs.
 * `source_details` - (Required) 
@@ -72,7 +72,9 @@ The following arguments are supported:
 
 	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. 
 * `boot_volume_replicas_deletion` - (Optional) (updatable) The boolean value, if you have replicas and want to disable replicas set this argument to true and remove `boot_volume_replicas` in representation at the same time. If you want to enable a new replicas, remove this argument and use `boot_volume_replicas` again.
 
 
@@ -95,7 +97,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. This field is deprecated. Use the `DetachedVolumeAutotunePolicy` instead to enable the volume for detached autotune. 
+* `is_auto_tune_enabled` - Specifies whether the auto-tune performance is enabled for this boot volume.
 * `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.
@@ -111,7 +113,9 @@ 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. 
 * `boot_volume_replicas_deletion` - The boolean value, if you have replicas and want to disable replicas set this argument to true and remove `boot_volume_replicas` in representation at the same time. If you want to enable a new replicas, remove this argument and use `boot_volume_replicas` again.
 
 ## Timeouts