Bug Fix - Support for New Compute Shapes (VM.DenseIO.E4.Flex)

Author: Shrey Kapoor

examples/big_data_service/main.tf

@@ -83,7 +83,7 @@ variable "bds_instance_nodes_shape" {
 }
 
 variable "bds_instance_worker_node_shape" {
-  default = "VM.Standard2.4"
+  default = "VM.DenseIO.E4.Flex"
 }
 
 variable "bds_instance_compute_only_worker_node_shape" {
@@ -229,8 +229,12 @@ resource "oci_bds_bds_instance" "test_bds_instance" {
     shape = var.bds_instance_worker_node_shape
 
     subnet_id                = var.subnet_id
-    block_volume_size_in_gbs = var.bds_instance_worker_nodes_block_volume_size_in_gbs
     number_of_nodes          = 4
+     shape_config {
+          memory_in_gbs = 128
+          ocpus         = 8
+          nvmes         = 1
+     }
   }
 
   edge_node {

internal/integrationtest/bds_odh_instance_resource_test.go

@@ -65,7 +65,7 @@ var (
 		"kerberos_realm_name":      acctest.Representation{RepType: acctest.Optional, Create: `BDSCLOUDSERVICE.ORACLE.COM`},
 		"master_node":              acctest.RepresentationGroup{RepType: acctest.Required, Group: bdsInstanceNodeFlexShapeRepresentation},
 		"util_node":                acctest.RepresentationGroup{RepType: acctest.Required, Group: bdsInstanceNodeFlexShapeRepresentation},
-		"worker_node":              acctest.RepresentationGroup{RepType: acctest.Required, Group: bdsInstanceNodesOdhWorkerRepresentation},
+		"worker_node":              acctest.RepresentationGroup{RepType: acctest.Required, Group: bdsInstanceNodeDenseShapeRepresentation},
 		"bootstrap_script_url":     acctest.Representation{RepType: acctest.Optional, Create: `${var.bootstrap_script_url}`, Update: `${var.bootstrap_script_urlU}`},
 		"compute_only_worker_node": acctest.RepresentationGroup{RepType: acctest.Required, Group: bdsInstanceNodeFlexShapeRepresentation},
 		"edge_node":                acctest.RepresentationGroup{RepType: acctest.Required, Group: bdsInstanceNodeFlexShapeRepresentation},
@@ -126,6 +126,12 @@ var (
 		"number_of_nodes":          acctest.Representation{RepType: acctest.Required, Create: `2`},
 		"shape_config":             acctest.RepresentationGroup{RepType: acctest.Required, Group: bdsInstanceNodesShapeConfigRepresentation},
 	}
+	bdsInstanceNodeDenseShapeRepresentation = map[string]interface{}{
+		"shape":           acctest.Representation{RepType: acctest.Required, Create: `VM.DenseIO.E4.Flex`},
+		"subnet_id":       acctest.Representation{RepType: acctest.Required, Create: `${var.subnet_id}`},
+		"number_of_nodes": acctest.Representation{RepType: acctest.Required, Create: `3`, Update: `4`},
+		"shape_config":    acctest.RepresentationGroup{RepType: acctest.Required, Group: bdsInstanceNodesDenseShapeConfigRepresentation},
+	}
 	bdsInstanceNodeFlex3ShapeRepresentation = map[string]interface{}{
 		"shape":                    acctest.Representation{RepType: acctest.Required, Create: `VM.Standard3.Flex`},
 		"subnet_id":                acctest.Representation{RepType: acctest.Required, Create: `${var.subnet_id}`},
@@ -137,6 +143,12 @@ var (
 		"memory_in_gbs": acctest.Representation{RepType: acctest.Required, Create: `32`},
 		"ocpus":         acctest.Representation{RepType: acctest.Required, Create: `3`},
 	}
+
+	bdsInstanceNodesDenseShapeConfigRepresentation = map[string]interface{}{
+		"memory_in_gbs": acctest.Representation{RepType: acctest.Required, Create: `128`},
+		"ocpus":         acctest.Representation{RepType: acctest.Required, Create: `8`},
+		"nvmes":         acctest.Representation{RepType: acctest.Required, Create: `1`},
+	}
 	bdsInstanceOdhWithAddMasterUtilRepresentation = acctest.RepresentationCopyWithNewProperties(bdsInstanceOdhRepresentation,
 		map[string]interface{}{
 			// Master & Util shape should be same
@@ -355,7 +367,6 @@ func TestResourceBdsOdhInstance(t *testing.T) {
 						"is_kafka_configured": acctest.Representation{RepType: acctest.Required, Create: `false`, Update: `false`},
 						"cluster_profile":     acctest.Representation{RepType: acctest.Optional, Create: `HADOOP_EXTENDED`, Update: `HADOOP_EXTENDED`},
 						"display_name":        acctest.Representation{RepType: acctest.Required, Create: `hadext1`, Update: `hadext1`},
-						"kafka_broker_node":   acctest.RepresentationGroup{RepType: acctest.Required, Group: bdsInstanceKafkaBrokerNodeFlexShapeRepresentation},
 					})),
 			Check: resource.ComposeAggregateTestCheckFunc(
 				resource.TestCheckResourceAttr(resourceName, "cluster_admin_password", "T3JhY2xlVGVhbVVTQSExMjM="),

internal/service/bds/bds_bds_instance_resource.go

@@ -127,7 +127,6 @@ func BdsBdsInstanceResource() *schema.Resource {
 										Type:     schema.TypeInt,
 										Optional: true,
 										Computed: true,
-										ForceNew: true,
 									},
 								},
 							},
@@ -190,7 +189,6 @@ func BdsBdsInstanceResource() *schema.Resource {
 										Type:     schema.TypeInt,
 										Optional: true,
 										Computed: true,
-										ForceNew: true,
 									},
 								},
 							},
@@ -217,8 +215,9 @@ func BdsBdsInstanceResource() *schema.Resource {
 						},
 
 						"block_volume_size_in_gbs": {
-							Type:             schema.TypeString,
-							Optional:         true,
+							Type:     schema.TypeString,
+							Optional: true,
+							//Computed:         true,
 							ValidateFunc:     tfresource.ValidateInt64TypeString,
 							DiffSuppressFunc: tfresource.Int64StringDiffSuppressFunction,
 						},
@@ -251,7 +250,6 @@ func BdsBdsInstanceResource() *schema.Resource {
 										Type:     schema.TypeInt,
 										Optional: true,
 										Computed: true,
-										ForceNew: true,
 									},
 
 									// Computed
@@ -315,7 +313,6 @@ func BdsBdsInstanceResource() *schema.Resource {
 										Type:     schema.TypeInt,
 										Optional: true,
 										Computed: true,
-										ForceNew: true,
 									},
 
 									// Computed
@@ -380,7 +377,6 @@ func BdsBdsInstanceResource() *schema.Resource {
 										Type:     schema.TypeInt,
 										Optional: true,
 										Computed: true,
-										ForceNew: true,
 									},
 
 									// Computed
@@ -443,7 +439,6 @@ func BdsBdsInstanceResource() *schema.Resource {
 										Type:     schema.TypeInt,
 										Optional: true,
 										Computed: true,
-										ForceNew: true,
 									},
 
 									// Computed
@@ -763,6 +758,10 @@ func BdsBdsInstanceResource() *schema.Resource {
 							Type:     schema.TypeInt,
 							Computed: true,
 						},
+						"nvmes": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
 						"memory_in_gbs": {
 							Type:     schema.TypeInt,
 							Computed: true,
@@ -2684,8 +2683,9 @@ func BdsNodeToTemplateMap(obj oci_bds.Node) map[string]interface{} {
 			totalSize += *item.VolumeSizeInGBs
 		}
 	}
-	result["block_volume_size_in_gbs"] = strconv.FormatInt(totalSize, 10)
-
+	if totalSize != 0 {
+		result["block_volume_size_in_gbs"] = strconv.FormatInt(totalSize, 10)
+	}
 	if obj.Shape != nil {
 		result["shape"] = string(*obj.Shape)
 	}
@@ -2700,6 +2700,9 @@ func BdsNodeToTemplateMap(obj oci_bds.Node) map[string]interface{} {
 		shapeConfigMap := map[string]interface{}{}
 		shapeConfigMap["ocpus"] = int(*obj.Ocpus)
 		shapeConfigMap["memory_in_gbs"] = int(*obj.MemoryInGBs)
+		if result["shape"] == "VM.DenseIO.E4.Flex" {
+			shapeConfigMap["nvmes"] = int(*obj.Nvmes)
+		}
 		result["shape_config"] = []interface{}{shapeConfigMap}
 	}