fix for ocpu_count in cloud vm cluster

Author: varmax2511

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 4.58.0 (Unreleased)
+
+### Bug Fix
+- Reverting `ocpu_count` to be `optional` in `oci_database_cloud_vm_cluster`
+
 ## 4.57.0 (December 15, 2021)
 
 ### Added

oci/database_autonomous_container_database_dataguard_association_test.go

@@ -101,7 +101,7 @@ var (
 func TestDatabaseAutonomousContainerDatabaseDataguardAssociationResource_basic(t *testing.T) {
 	// sshaagar: Commenting AEI test as not needed post migration.
 	// DISALLOWED_API.launchAutonomousExadataInfrastructure
-	t.Skip("Skipping Test for TeamCity")
+	t.Skip("Skipping Test from execution on a regular test run")
 
 	httpreplay.SetScenario("TestDatabaseAutonomousContainerDatabaseDataguardAssociationResource_basic")
 	defer httpreplay.SaveScenario()

oci/database_cloud_vm_cluster_resource.go

@@ -50,10 +50,6 @@ func DatabaseCloudVmClusterResource() *schema.Resource {
 				Type:     schema.TypeInt,
 				Required: true,
 			},
-			"ocpu_count": {
-				Type:     schema.TypeFloat,
-				Required: true,
-			},
 			"display_name": {
 				Type:     schema.TypeString,
 				Required: true,
@@ -155,6 +151,11 @@ func DatabaseCloudVmClusterResource() *schema.Resource {
 					Type: schema.TypeString,
 				},
 			},
+			"ocpu_count": {
+				Type:     schema.TypeFloat,
+				Optional: true,
+				Computed: true,
+			},
 			"scan_listener_port_tcp": {
 				Type:     schema.TypeInt,
 				Optional: true,
@@ -433,16 +434,16 @@ func (s *DatabaseCloudVmClusterResourceCrud) Create() error {
 		request.CpuCoreCount = &tmp
 	}
 
-	if ocpuCount, ok := s.D.GetOkExists("ocpu_count"); ok {
-		tmp := float32(ocpuCount.(float64))
-		request.OcpuCount = &tmp
-	}
-
 	if dataStoragePercentage, ok := s.D.GetOkExists("data_storage_percentage"); ok {
 		tmp := dataStoragePercentage.(int)
 		request.DataStoragePercentage = &tmp
 	}
 
+	if ocpuCount, ok := s.D.GetOkExists("ocpu_count"); ok {
+		tmp := float32(ocpuCount.(float64))
+		request.OcpuCount = &tmp
+	}
+
 	if definedTags, ok := s.D.GetOkExists("defined_tags"); ok {
 		convertedDefinedTags, err := mapToDefinedTags(definedTags.(map[string]interface{}))
 		if err != nil {
@@ -611,11 +612,6 @@ func (s *DatabaseCloudVmClusterResourceCrud) Update() error {
 		request.CpuCoreCount = &tmp
 	}
 
-	if ocpuCount, ok := s.D.GetOkExists("ocpu_count"); ok && s.D.HasChange("ocpu_count") {
-		tmp := float32(ocpuCount.(float64))
-		request.OcpuCount = &tmp
-	}
-
 	if definedTags, ok := s.D.GetOkExists("defined_tags"); ok {
 		convertedDefinedTags, err := mapToDefinedTags(definedTags.(map[string]interface{}))
 		if err != nil {
@@ -651,6 +647,11 @@ func (s *DatabaseCloudVmClusterResourceCrud) Update() error {
 		}
 	}
 
+	if ocpuCount, ok := s.D.GetOkExists("ocpu_count"); ok && s.D.HasChange("ocpu_count") {
+		tmp := float32(ocpuCount.(float64))
+		request.OcpuCount = &tmp
+	}
+
 	if sshPublicKeys, ok := s.D.GetOkExists("ssh_public_keys"); ok {
 		interfaces := sshPublicKeys.([]interface{})
 		tmp := make([]string, len(interfaces))

oci/database_cloud_vm_cluster_test.go

@@ -61,6 +61,7 @@ var (
 		"is_sparse_diskgroup_enabled":     Representation{RepType: Optional, Create: `false`},
 		"license_model":                   Representation{RepType: Optional, Create: `LICENSE_INCLUDED`},
 		"nsg_ids":                         Representation{RepType: Optional, Create: []string{`${oci_core_network_security_group.test_network_security_group.id}`}},
+		"ocpu_count":                      Representation{RepType: Optional, Create: `4.0`, Update: `4.0`},
 		"scan_listener_port_tcp":          Representation{RepType: Optional, Create: `1521`},
 		"scan_listener_port_tcp_ssl":      Representation{RepType: Optional, Create: `2484`},
 		"time_zone":                       Representation{RepType: Optional, Create: `US/Pacific`},
@@ -253,6 +254,7 @@ func TestDatabaseCloudVmClusterResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(resourceName, "is_local_backup_enabled", "true"),
 				resource.TestCheckResourceAttr(resourceName, "is_sparse_diskgroup_enabled", "false"),
 				resource.TestCheckResourceAttr(resourceName, "license_model", "LICENSE_INCLUDED"),
+				resource.TestCheckResourceAttr(resourceName, "ocpu_count", "4"),
 				resource.TestCheckResourceAttrSet(resourceName, "shape"),
 				resource.TestCheckResourceAttr(resourceName, "ssh_public_keys.#", "1"),
 				resource.TestCheckResourceAttrSet(resourceName, "state"),
@@ -295,6 +297,7 @@ func TestDatabaseCloudVmClusterResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(resourceName, "is_local_backup_enabled", "true"),
 				resource.TestCheckResourceAttr(resourceName, "is_sparse_diskgroup_enabled", "false"),
 				resource.TestCheckResourceAttr(resourceName, "license_model", "LICENSE_INCLUDED"),
+				resource.TestCheckResourceAttr(resourceName, "ocpu_count", "4"),
 				resource.TestCheckResourceAttr(resourceName, "scan_listener_port_tcp", "1521"),
 				resource.TestCheckResourceAttr(resourceName, "scan_listener_port_tcp_ssl", "2484"),
 				resource.TestCheckResourceAttrSet(resourceName, "shape"),
@@ -334,6 +337,7 @@ func TestDatabaseCloudVmClusterResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(resourceName, "is_local_backup_enabled", "true"),
 				resource.TestCheckResourceAttr(resourceName, "is_sparse_diskgroup_enabled", "false"),
 				resource.TestCheckResourceAttr(resourceName, "license_model", "LICENSE_INCLUDED"),
+				resource.TestCheckResourceAttr(resourceName, "ocpu_count", "4"),
 				resource.TestCheckResourceAttrSet(resourceName, "shape"),
 				resource.TestCheckResourceAttr(resourceName, "ssh_public_keys.#", "1"),
 				resource.TestCheckResourceAttrSet(resourceName, "state"),
@@ -381,6 +385,7 @@ func TestDatabaseCloudVmClusterResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(datasourceName, "cloud_vm_clusters.0.license_model", "LICENSE_INCLUDED"),
 				resource.TestCheckResourceAttrSet(datasourceName, "cloud_vm_clusters.0.listener_port"),
 				resource.TestCheckResourceAttrSet(datasourceName, "cloud_vm_clusters.0.node_count"),
+				resource.TestCheckResourceAttr(datasourceName, "cloud_vm_clusters.0.ocpu_count", "4"),
 				resource.TestCheckResourceAttrSet(datasourceName, "cloud_vm_clusters.0.scan_dns_name"),
 				resource.TestCheckResourceAttrSet(datasourceName, "cloud_vm_clusters.0.shape"),
 				resource.TestCheckResourceAttr(datasourceName, "cloud_vm_clusters.0.ssh_public_keys.#", "1"),
@@ -417,6 +422,7 @@ func TestDatabaseCloudVmClusterResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(singularDatasourceName, "license_model", "LICENSE_INCLUDED"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "listener_port"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "node_count"),
+				resource.TestCheckResourceAttr(singularDatasourceName, "ocpu_count", "4"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "scan_dns_name"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "shape"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "ssh_public_keys.#", "1"),

website/docs/r/database_cloud_vm_cluster.html.markdown

@@ -39,6 +39,7 @@ resource "oci_database_cloud_vm_cluster" "test_cloud_vm_cluster" {
 	is_sparse_diskgroup_enabled = var.cloud_vm_cluster_is_sparse_diskgroup_enabled
 	license_model = var.cloud_vm_cluster_license_model
 	nsg_ids = var.cloud_vm_cluster_nsg_ids
+	ocpu_count = var.cloud_vm_cluster_ocpu_count
 	scan_listener_port_tcp = var.cloud_vm_cluster_scan_listener_port_tcp
 	scan_listener_port_tcp_ssl = var.cloud_vm_cluster_scan_listener_port_tcp_ssl
 	time_zone = var.cloud_vm_cluster_time_zone
@@ -78,6 +79,7 @@ The following arguments are supported:
 * `license_model` - (Optional) (Updatable) The Oracle license model that applies to the cloud VM cluster. The default is BRING_YOUR_OWN_LICENSE. 
 * `nsg_ids` - (Optional) (Updatable) A list of the [OCIDs](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the network security groups (NSGs) that this resource belongs to. Setting this to an empty array after the list is created removes the resource from all NSGs. For more information about NSGs, see [Security Rules](https://docs.cloud.oracle.com/iaas/Content/Network/Concepts/securityrules.htm). **NsgIds restrictions:**
 	* Autonomous Databases with private access require at least 1 Network Security Group (NSG). The nsgIds array cannot be empty. 
+* `ocpu_count` - (Optional) (Updatable) The number of OCPU cores to enable for a cloud VM cluster. Only 1 decimal place is allowed for the fractional part.	
 * `scan_listener_port_tcp` - (Optional) The TCP Single Client Access Name (SCAN) port. The default port is 1521.
 * `scan_listener_port_tcp_ssl` - (Optional) The TCPS Single Client Access Name (SCAN) port. The default port is 2484.
 * `ssh_public_keys` - (Required) (Updatable) The public key portion of one or more key pairs used for SSH access to the cloud VM cluster.
@@ -127,6 +129,7 @@ The following attributes are exported:
 * `node_count` - The number of nodes in the cloud VM cluster. 
 * `nsg_ids` - A list of the [OCIDs](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the network security groups (NSGs) that this resource belongs to. Setting this to an empty array after the list is created removes the resource from all NSGs. For more information about NSGs, see [Security Rules](https://docs.cloud.oracle.com/iaas/Content/Network/Concepts/securityrules.htm). **NsgIds restrictions:**
 	* Autonomous Databases with private access require at least 1 Network Security Group (NSG). The nsgIds array cannot be empty. 
+* `ocpu_count` - The number of OCPU cores to enable on the cloud VM cluster. Only 1 decimal place is allowed for the fractional part.
 * `scan_dns_name` - The FQDN of the DNS record for the SCAN IP addresses that are associated with the cloud VM cluster. 
 * `scan_dns_record_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the DNS record for the SCAN IP addresses that are associated with the cloud VM cluster. 
 * `scan_ip_ids` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the Single Client Access Name (SCAN) IP addresses associated with the cloud VM cluster. SCAN IP addresses are typically used for load balancing and are not assigned to any interface. Oracle Clusterware directs the requests to the appropriate nodes in the cluster.