Added - Platform Config support for AMD Milan GPU

Author: Terraform Team Automation

internal/integrationtest/core_instance_resource_test.go

@@ -38,8 +38,8 @@ var (
 		"is_secure_boot_enabled":                         acctest.Representation{RepType: acctest.Required, Create: `true`},
 		"is_symmetric_multi_threading_enabled":           acctest.Representation{RepType: acctest.Required, Create: `false`},
 		"is_trusted_platform_module_enabled":             acctest.Representation{RepType: acctest.Required, Create: `true`},
-		"numa_nodes_per_socket":                          acctest.Representation{RepType: acctest.Required, Create: `NPS1`},
-		"percentage_of_cores_enabled":                    acctest.Representation{RepType: acctest.Required, Create: `25`},
+		"numa_nodes_per_socket":                          acctest.Representation{RepType: acctest.Required, Create: `NPS4`},
+		"percentage_of_cores_enabled":                    acctest.Representation{RepType: acctest.Required, Create: `50`},
 	}
 	instanceBMRomeShieldedPlatformConfigRepresentation = map[string]interface{}{
 		"type":                                           acctest.Representation{RepType: acctest.Required, Create: `AMD_ROME_BM`},
@@ -1689,8 +1689,8 @@ func TestAccResourceCoreInstance_BM_Milan_instance_resource(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "platform_config.0.is_secure_boot_enabled", "true"),
 					resource.TestCheckResourceAttr(resourceName, "platform_config.0.is_symmetric_multi_threading_enabled", "false"),
 					resource.TestCheckResourceAttr(resourceName, "platform_config.0.is_trusted_platform_module_enabled", "true"),
-					resource.TestCheckResourceAttr(resourceName, "platform_config.0.numa_nodes_per_socket", "NPS1"),
-					resource.TestCheckResourceAttr(resourceName, "platform_config.0.percentage_of_cores_enabled", "25"),
+					resource.TestCheckResourceAttr(resourceName, "platform_config.0.numa_nodes_per_socket", "NPS4"),
+					resource.TestCheckResourceAttr(resourceName, "platform_config.0.percentage_of_cores_enabled", "50"),
 
 					func(ts *terraform.State) (err error) {
 						return err
@@ -1715,8 +1715,8 @@ func TestAccResourceCoreInstance_BM_Milan_instance_resource(t *testing.T) {
 					resource.TestCheckResourceAttr(datasourceName, "instances.0.platform_config.0.is_secure_boot_enabled", "true"),
 					resource.TestCheckResourceAttr(datasourceName, "instances.0.platform_config.0.is_symmetric_multi_threading_enabled", "false"),
 					resource.TestCheckResourceAttr(datasourceName, "instances.0.platform_config.0.is_trusted_platform_module_enabled", "true"),
-					resource.TestCheckResourceAttr(datasourceName, "instances.0.platform_config.0.numa_nodes_per_socket", "NPS1"),
-					resource.TestCheckResourceAttr(datasourceName, "instances.0.platform_config.0.percentage_of_cores_enabled", "25"),
+					resource.TestCheckResourceAttr(datasourceName, "instances.0.platform_config.0.numa_nodes_per_socket", "NPS4"),
+					resource.TestCheckResourceAttr(datasourceName, "instances.0.platform_config.0.percentage_of_cores_enabled", "50"),
 				),
 			},
 			// verify singular datasource
@@ -1763,8 +1763,8 @@ func TestAccResourceCoreInstance_BM_Milan_instance_resource(t *testing.T) {
 					resource.TestCheckResourceAttr(singularDatasourceName, "platform_config.0.is_secure_boot_enabled", "true"),
 					resource.TestCheckResourceAttr(singularDatasourceName, "platform_config.0.is_symmetric_multi_threading_enabled", "false"),
 					resource.TestCheckResourceAttr(singularDatasourceName, "platform_config.0.is_trusted_platform_module_enabled", "true"),
-					resource.TestCheckResourceAttr(singularDatasourceName, "platform_config.0.numa_nodes_per_socket", "NPS1"),
-					resource.TestCheckResourceAttr(singularDatasourceName, "platform_config.0.percentage_of_cores_enabled", "25"),
+					resource.TestCheckResourceAttr(singularDatasourceName, "platform_config.0.numa_nodes_per_socket", "NPS4"),
+					resource.TestCheckResourceAttr(singularDatasourceName, "platform_config.0.percentage_of_cores_enabled", "50"),
 					resource.TestCheckResourceAttr(singularDatasourceName, "platform_config.0.type", "AMD_MILAN_BM"),
 				),
 			},

internal/integrationtest/core_instance_test.go

@@ -149,7 +149,7 @@ resource "oci_core_instance" "test_instance" {
 data "oci_kms_keys" "test_keys_dependency" {
     #Required
     compartment_id = "${var.tenancy_ocid}"
-    management_endpoint = "${var.management_endpoint}"
+    management_endpoint = "${data.oci_kms_vault.test_vault.management_endpoint}"
     algorithm = "AES"
 
     filter {
@@ -160,7 +160,7 @@ data "oci_kms_keys" "test_keys_dependency" {
 data "oci_kms_keys" "test_keys_dependency_RSA" {
     #Required
     compartment_id = "${var.tenancy_ocid}"
-    management_endpoint = "${var.management_endpoint}"
+    management_endpoint = "${data.oci_kms_vault.test_vault.management_endpoint}"
     algorithm = "RSA"
 
     filter {

internal/service/core/core_instance_configuration_resource.go

@@ -661,6 +661,7 @@ func CoreInstanceConfigurationResource() *schema.Resource {
 													DiffSuppressFunc: tfresource.EqualIgnoreCaseSuppressDiff,
 													ValidateFunc: validation.StringInSlice([]string{
 														"AMD_MILAN_BM",
+														"AMD_MILAN_BM_GPU",
 														"AMD_ROME_BM",
 														"AMD_ROME_BM_GPU",
 														"AMD_VM",
@@ -1797,7 +1798,7 @@ func (s *CoreInstanceConfigurationResourceCrud) mapToInstanceConfigurationInstan
 	if ok {
 		instanceType = instanceTypeRaw.(string)
 	} else {
-		instanceType = "" // default value
+		instanceType = "compute" // default value
 	}
 	switch strings.ToLower(instanceType) {
 	case strings.ToLower("compute"):
@@ -2385,6 +2386,44 @@ func (s *CoreInstanceConfigurationResourceCrud) mapToInstanceConfigurationLaunch
 			details.IsTrustedPlatformModuleEnabled = &tmp
 		}
 		baseObject = details
+	case strings.ToLower("AMD_MILAN_BM_GPU"):
+		details := oci_core.InstanceConfigurationAmdMilanBmGpuLaunchInstancePlatformConfig{}
+		if areVirtualInstructionsEnabled, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "are_virtual_instructions_enabled")); ok {
+			tmp := areVirtualInstructionsEnabled.(bool)
+			details.AreVirtualInstructionsEnabled = &tmp
+		}
+		if isAccessControlServiceEnabled, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "is_access_control_service_enabled")); ok {
+			tmp := isAccessControlServiceEnabled.(bool)
+			details.IsAccessControlServiceEnabled = &tmp
+		}
+		if isInputOutputMemoryManagementUnitEnabled, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "is_input_output_memory_management_unit_enabled")); ok {
+			tmp := isInputOutputMemoryManagementUnitEnabled.(bool)
+			details.IsInputOutputMemoryManagementUnitEnabled = &tmp
+		}
+		if isSymmetricMultiThreadingEnabled, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "is_symmetric_multi_threading_enabled")); ok {
+			tmp := isSymmetricMultiThreadingEnabled.(bool)
+			details.IsSymmetricMultiThreadingEnabled = &tmp
+		}
+		if numaNodesPerSocket, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "numa_nodes_per_socket")); ok {
+			details.NumaNodesPerSocket = oci_core.InstanceConfigurationAmdMilanBmGpuLaunchInstancePlatformConfigNumaNodesPerSocketEnum(numaNodesPerSocket.(string))
+		}
+		if isMeasuredBootEnabled, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "is_measured_boot_enabled")); ok {
+			tmp := isMeasuredBootEnabled.(bool)
+			details.IsMeasuredBootEnabled = &tmp
+		}
+		if isMemoryEncryptionEnabled, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "is_memory_encryption_enabled")); ok {
+			tmp := isMemoryEncryptionEnabled.(bool)
+			details.IsMemoryEncryptionEnabled = &tmp
+		}
+		if isSecureBootEnabled, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "is_secure_boot_enabled")); ok {
+			tmp := isSecureBootEnabled.(bool)
+			details.IsSecureBootEnabled = &tmp
+		}
+		if isTrustedPlatformModuleEnabled, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "is_trusted_platform_module_enabled")); ok {
+			tmp := isTrustedPlatformModuleEnabled.(bool)
+			details.IsTrustedPlatformModuleEnabled = &tmp
+		}
+		baseObject = details
 	case strings.ToLower("AMD_ROME_BM"):
 		details := oci_core.InstanceConfigurationAmdRomeBmLaunchInstancePlatformConfig{}
 		if areVirtualInstructionsEnabled, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "are_virtual_instructions_enabled")); ok {
@@ -2589,6 +2628,26 @@ func InstanceConfigurationLaunchInstancePlatformConfigToMap(obj *oci_core.Instan
 		if v.PercentageOfCoresEnabled != nil {
 			result["percentage_of_cores_enabled"] = int(*v.PercentageOfCoresEnabled)
 		}
+	case oci_core.InstanceConfigurationAmdMilanBmGpuLaunchInstancePlatformConfig:
+		result["type"] = "AMD_MILAN_BM_GPU"
+
+		if v.AreVirtualInstructionsEnabled != nil {
+			result["are_virtual_instructions_enabled"] = bool(*v.AreVirtualInstructionsEnabled)
+		}
+
+		if v.IsAccessControlServiceEnabled != nil {
+			result["is_access_control_service_enabled"] = bool(*v.IsAccessControlServiceEnabled)
+		}
+
+		if v.IsInputOutputMemoryManagementUnitEnabled != nil {
+			result["is_input_output_memory_management_unit_enabled"] = bool(*v.IsInputOutputMemoryManagementUnitEnabled)
+		}
+
+		if v.IsSymmetricMultiThreadingEnabled != nil {
+			result["is_symmetric_multi_threading_enabled"] = bool(*v.IsSymmetricMultiThreadingEnabled)
+		}
+
+		result["numa_nodes_per_socket"] = string(v.NumaNodesPerSocket)
 	case oci_core.InstanceConfigurationAmdRomeBmLaunchInstancePlatformConfig:
 		result["type"] = "AMD_ROME_BM"
 

internal/service/core/core_instance_resource.go

@@ -398,6 +398,7 @@ func CoreInstanceResource() *schema.Resource {
 							DiffSuppressFunc: tfresource.EqualIgnoreCaseSuppressDiff,
 							ValidateFunc: validation.StringInSlice([]string{
 								"AMD_MILAN_BM",
+								"AMD_MILAN_BM_GPU",
 								"AMD_ROME_BM",
 								"AMD_ROME_BM_GPU",
 								"AMD_VM",
@@ -2051,6 +2052,44 @@ func (s *CoreInstanceResourceCrud) mapToLaunchInstancePlatformConfig(fieldKeyFor
 			details.IsTrustedPlatformModuleEnabled = &tmp
 		}
 		baseObject = details
+	case strings.ToLower("AMD_MILAN_BM_GPU"):
+		details := oci_core.AmdMilanBmGpuLaunchInstancePlatformConfig{}
+		if areVirtualInstructionsEnabled, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "are_virtual_instructions_enabled")); ok {
+			tmp := areVirtualInstructionsEnabled.(bool)
+			details.AreVirtualInstructionsEnabled = &tmp
+		}
+		if isAccessControlServiceEnabled, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "is_access_control_service_enabled")); ok {
+			tmp := isAccessControlServiceEnabled.(bool)
+			details.IsAccessControlServiceEnabled = &tmp
+		}
+		if isInputOutputMemoryManagementUnitEnabled, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "is_input_output_memory_management_unit_enabled")); ok {
+			tmp := isInputOutputMemoryManagementUnitEnabled.(bool)
+			details.IsInputOutputMemoryManagementUnitEnabled = &tmp
+		}
+		if isSymmetricMultiThreadingEnabled, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "is_symmetric_multi_threading_enabled")); ok {
+			tmp := isSymmetricMultiThreadingEnabled.(bool)
+			details.IsSymmetricMultiThreadingEnabled = &tmp
+		}
+		if numaNodesPerSocket, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "numa_nodes_per_socket")); ok {
+			details.NumaNodesPerSocket = oci_core.AmdMilanBmGpuLaunchInstancePlatformConfigNumaNodesPerSocketEnum(numaNodesPerSocket.(string))
+		}
+		if isMeasuredBootEnabled, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "is_measured_boot_enabled")); ok {
+			tmp := isMeasuredBootEnabled.(bool)
+			details.IsMeasuredBootEnabled = &tmp
+		}
+		if isMemoryEncryptionEnabled, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "is_memory_encryption_enabled")); ok {
+			tmp := isMemoryEncryptionEnabled.(bool)
+			details.IsMemoryEncryptionEnabled = &tmp
+		}
+		if isSecureBootEnabled, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "is_secure_boot_enabled")); ok {
+			tmp := isSecureBootEnabled.(bool)
+			details.IsSecureBootEnabled = &tmp
+		}
+		if isTrustedPlatformModuleEnabled, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "is_trusted_platform_module_enabled")); ok {
+			tmp := isTrustedPlatformModuleEnabled.(bool)
+			details.IsTrustedPlatformModuleEnabled = &tmp
+		}
+		baseObject = details
 	case strings.ToLower("AMD_ROME_BM"):
 		details := oci_core.AmdRomeBmLaunchInstancePlatformConfig{}
 		if areVirtualInstructionsEnabled, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "are_virtual_instructions_enabled")); ok {
@@ -2268,6 +2307,42 @@ func PlatformConfigToMap(obj *oci_core.PlatformConfig) map[string]interface{} {
 			result["is_secure_boot_enabled"] = bool(*v.IsSecureBootEnabled)
 		}
 
+		if v.IsTrustedPlatformModuleEnabled != nil {
+			result["is_trusted_platform_module_enabled"] = bool(*v.IsTrustedPlatformModuleEnabled)
+		}
+	case oci_core.AmdMilanBmGpuPlatformConfig:
+		result["type"] = "AMD_MILAN_BM_GPU"
+
+		if v.AreVirtualInstructionsEnabled != nil {
+			result["are_virtual_instructions_enabled"] = bool(*v.AreVirtualInstructionsEnabled)
+		}
+
+		if v.IsAccessControlServiceEnabled != nil {
+			result["is_access_control_service_enabled"] = bool(*v.IsAccessControlServiceEnabled)
+		}
+
+		if v.IsInputOutputMemoryManagementUnitEnabled != nil {
+			result["is_input_output_memory_management_unit_enabled"] = bool(*v.IsInputOutputMemoryManagementUnitEnabled)
+		}
+
+		if v.IsSymmetricMultiThreadingEnabled != nil {
+			result["is_symmetric_multi_threading_enabled"] = bool(*v.IsSymmetricMultiThreadingEnabled)
+		}
+
+		result["numa_nodes_per_socket"] = string(v.NumaNodesPerSocket)
+
+		if v.IsMeasuredBootEnabled != nil {
+			result["is_measured_boot_enabled"] = bool(*v.IsMeasuredBootEnabled)
+		}
+
+		if v.IsMemoryEncryptionEnabled != nil {
+			result["is_memory_encryption_enabled"] = bool(*v.IsMemoryEncryptionEnabled)
+		}
+
+		if v.IsSecureBootEnabled != nil {
+			result["is_secure_boot_enabled"] = bool(*v.IsSecureBootEnabled)
+		}
+
 		if v.IsTrustedPlatformModuleEnabled != nil {
 			result["is_trusted_platform_module_enabled"] = bool(*v.IsTrustedPlatformModuleEnabled)
 		}

website/docs/d/core_cluster_network.html.markdown

@@ -67,7 +67,7 @@ The following attributes are exported:
 			Example: `[FAULT-DOMAIN-1, FAULT-DOMAIN-2, FAULT-DOMAIN-3]` 
 		* `primary_subnet_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the primary subnet to place instances. 
 		* `secondary_vnic_subnets` - The set of secondary VNIC data for instances in the pool.
-			* `display_name` - The display name of the VNIC. This is also use to match against the instance configuration defined secondary VNIC. 
+			* `display_name` - The display name of the VNIC. This is also used to match against the instance configuration defined secondary VNIC. 
 			* `subnet_id` - The subnet [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) for the secondary VNIC.
 	* `size` - The number of instances that should be in the instance pool.
 	* `state` - The current state of the instance pool.
@@ -76,7 +76,7 @@ The following attributes are exported:
 	* `availability_domain` - The availability domain to place instances.  Example: `Uocm:PHX-AD-1` 
 	* `primary_subnet_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the primary subnet to place instances. 
 	* `secondary_vnic_subnets` - The set of secondary VNIC data for instances in the pool.
-		* `display_name` - The display name of the VNIC. This is also use to match against the instance configuration defined secondary VNIC. 
+		* `display_name` - The display name of the VNIC. This is also used to match against the instance configuration defined secondary VNIC. 
 		* `subnet_id` - The subnet [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) for the secondary VNIC.
 * `state` - The current state of the cluster network.
 * `time_created` - The date and time the resource was created, in the format defined by [RFC3339](https://tools.ietf.org/html/rfc3339).  Example: `2016-08-25T21:10:29.600Z` 

website/docs/d/core_cluster_networks.html.markdown

@@ -79,7 +79,7 @@ The following attributes are exported:
 			Example: `[FAULT-DOMAIN-1, FAULT-DOMAIN-2, FAULT-DOMAIN-3]` 
 		* `primary_subnet_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the primary subnet to place instances. 
 		* `secondary_vnic_subnets` - The set of secondary VNIC data for instances in the pool.
-			* `display_name` - The display name of the VNIC. This is also use to match against the instance configuration defined secondary VNIC. 
+			* `display_name` - The display name of the VNIC. This is also used to match against the instance configuration defined secondary VNIC. 
 			* `subnet_id` - The subnet [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) for the secondary VNIC.
 	* `size` - The number of instances that should be in the instance pool.
 	* `state` - The current state of the instance pool.
@@ -88,7 +88,7 @@ The following attributes are exported:
 	* `availability_domain` - The availability domain to place instances.  Example: `Uocm:PHX-AD-1` 
 	* `primary_subnet_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the primary subnet to place instances. 
 	* `secondary_vnic_subnets` - The set of secondary VNIC data for instances in the pool.
-		* `display_name` - The display name of the VNIC. This is also use to match against the instance configuration defined secondary VNIC. 
+		* `display_name` - The display name of the VNIC. This is also used to match against the instance configuration defined secondary VNIC. 
 		* `subnet_id` - The subnet [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) for the secondary VNIC.
 * `state` - The current state of the cluster network.
 * `time_created` - The date and time the resource was created, in the format defined by [RFC3339](https://tools.ietf.org/html/rfc3339).  Example: `2016-08-25T21:10:29.600Z` 

website/docs/d/core_instance.html.markdown

@@ -68,7 +68,7 @@ The following attributes are exported:
 * `boot_volume_id` - The OCID of the attached boot volume. If the `source_type` is `bootVolume`, this will be the same OCID as the `source_id`.
 * `capacity_reservation_id` - The OCID of the compute capacity reservation this instance is launched under. When this field contains an empty string or is null, the instance is not currently in a capacity reservation. For more information, see [Capacity Reservations](https://docs.cloud.oracle.com/iaas/Content/Compute/Tasks/reserve-capacity.htm#default).
 * `compartment_id` - The OCID of the compartment that contains the instance.
-* `dedicated_vm_host_id` - The OCID of dedicated VM host. 
+* `dedicated_vm_host_id` - The OCID of the dedicated virtual machine host that the instance is placed on. 
 * `defined_tags` - 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` - A user-friendly name. Does not have to be unique, and it's changeable. Avoid entering confidential information. 
 * `extended_metadata` - Additional metadata key/value pairs that you provide. They serve the same purpose and functionality as fields in the `metadata` object.