Support for E3 Flex Notebooks added to datascience

srishtipmishra · srishtipmishra · commit 0a24476e69db · 2021-05-21T09:45:23.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@
 - Support charge for Container Images and Generic Artifacts 
 - Support for Generic Artifacts Service
 - Support Update `DrgAttachment` of types `Virtual_Circuit`, `RPC` and `IPSec`
+- Support for E3 Flex Notebooks added to `datascience`
 
 ## 4.27.0 (May 19, 2021)
 
diff --git a/examples/datascience/main.tf b/examples/datascience/main.tf
@@ -72,6 +72,11 @@ resource "oci_datascience_notebook_session" "tf_notebook_session" {
     subnet_id = oci_core_subnet.tf_subnet.id
     #Optional
     #block_storage_size_in_gbs = var.notebook_session_notebook_session_configuration_details_block_storage_size_in_gbs
+    #notebook_session_shape_config_details {
+    #  #Required
+    #  ocpus = var.notebook_session_notebook_session_configuration_details_notebook_session_shape_config_details_opcus
+    #  memory_in_gbs = var.notebook_session_notebook_session_configuration_details_notebook_session_shape_config_details_memory_in_gbs
+    #}
   }
 
   project_id = oci_datascience_project.tf_project.id
diff --git a/oci/datascience_notebook_session_flex_test.go b/oci/datascience_notebook_session_flex_test.go
diff --git a/oci/datascience_notebook_session_resource.go b/oci/datascience_notebook_session_resource.go
@@ -57,6 +57,32 @@ func DatascienceNotebookSessionResource() *schema.Resource {
 							Optional: true,
 							Computed: true,
 						},
+						"notebook_session_shape_config_details": {
+							Type:     schema.TypeList,
+							Optional: true,
+							Computed: true,
+							MaxItems: 1,
+							MinItems: 1,
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									// Required
+
+									// Optional
+									"memory_in_gbs": {
+										Type:     schema.TypeFloat,
+										Optional: true,
+										Computed: true,
+									},
+									"ocpus": {
+										Type:     schema.TypeFloat,
+										Optional: true,
+										Computed: true,
+									},
+
+									// Computed
+								},
+							},
+						},
 
 						// Computed
 					},
@@ -427,6 +453,17 @@ func (s *DatascienceNotebookSessionResourceCrud) mapToNotebookSessionConfigurati
 		result.BlockStorageSizeInGBs = &tmp
 	}
 
+	if notebookSessionShapeConfigDetails, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "notebook_session_shape_config_details")); ok {
+		if tmpList := notebookSessionShapeConfigDetails.([]interface{}); len(tmpList) > 0 {
+			fieldKeyFormatNextLevel := fmt.Sprintf("%s.%d.%%s", fmt.Sprintf(fieldKeyFormat, "notebook_session_shape_config_details"), 0)
+			tmp, err := s.mapToNotebookSessionShapeConfigDetails(fieldKeyFormatNextLevel)
+			if err != nil {
+				return result, fmt.Errorf("unable to convert notebook_session_shape_config_details, encountered error: %v", err)
+			}
+			result.NotebookSessionShapeConfigDetails = &tmp
+		}
+	}
+
 	if shape, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "shape")); ok {
 		tmp := shape.(string)
 		result.Shape = &tmp
@@ -447,6 +484,10 @@ func NotebookSessionConfigurationDetailsToMap(obj *oci_datascience.NotebookSessi
 		result["block_storage_size_in_gbs"] = int(*obj.BlockStorageSizeInGBs)
 	}
 
+	if obj.NotebookSessionShapeConfigDetails != nil {
+		result["notebook_session_shape_config_details"] = []interface{}{NotebookSessionShapeConfigDetailsToMap(obj.NotebookSessionShapeConfigDetails)}
+	}
+
 	if obj.Shape != nil {
 		result["shape"] = string(*obj.Shape)
 	}
@@ -458,6 +499,36 @@ func NotebookSessionConfigurationDetailsToMap(obj *oci_datascience.NotebookSessi
 	return result
 }
 
+func (s *DatascienceNotebookSessionResourceCrud) mapToNotebookSessionShapeConfigDetails(fieldKeyFormat string) (oci_datascience.NotebookSessionShapeConfigDetails, error) {
+	result := oci_datascience.NotebookSessionShapeConfigDetails{}
+
+	if memoryInGBs, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "memory_in_gbs")); ok {
+		tmp := float32(memoryInGBs.(float64))
+		result.MemoryInGBs = &tmp
+	}
+
+	if ocpus, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "ocpus")); ok {
+		tmp := float32(ocpus.(float64))
+		result.Ocpus = &tmp
+	}
+
+	return result, nil
+}
+
+func NotebookSessionShapeConfigDetailsToMap(obj *oci_datascience.NotebookSessionShapeConfigDetails) map[string]interface{} {
+	result := map[string]interface{}{}
+
+	if obj.MemoryInGBs != nil {
+		result["memory_in_gbs"] = float32(*obj.MemoryInGBs)
+	}
+
+	if obj.Ocpus != nil {
+		result["ocpus"] = float32(*obj.Ocpus)
+	}
+
+	return result
+}
+
 func (s *DatascienceNotebookSessionResourceCrud) updateCompartment(compartment interface{}) error {
 	changeCompartmentRequest := oci_datascience.ChangeNotebookSessionCompartmentRequest{}
 
diff --git a/oci/datascience_notebook_session_shape_test.go b/oci/datascience_notebook_session_shape_test.go
@@ -53,6 +53,7 @@ func TestDatascienceNotebookSessionShapeResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet(datasourceName, "notebook_session_shapes.0.core_count"),
 					resource.TestCheckResourceAttrSet(datasourceName, "notebook_session_shapes.0.memory_in_gbs"),
 					resource.TestCheckResourceAttrSet(datasourceName, "notebook_session_shapes.0.name"),
+					resource.TestCheckResourceAttrSet(datasourceName, "notebook_session_shapes.0.shape_series"),
 				),
 			},
 		},
diff --git a/oci/datascience_notebook_session_shapes_data_source.go b/oci/datascience_notebook_session_shapes_data_source.go
@@ -45,6 +45,10 @@ func DatascienceNotebookSessionShapesDataSource() *schema.Resource {
 							Type:     schema.TypeString,
 							Computed: true,
 						},
+						"shape_series": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
 					},
 				},
 			},
@@ -124,6 +128,8 @@ func (s *DatascienceNotebookSessionShapesDataSourceCrud) SetData() error {
 			notebookSessionShape["name"] = *r.Name
 		}
 
+		notebookSessionShape["shape_series"] = r.ShapeSeries
+
 		resources = append(resources, notebookSessionShape)
 	}
 
diff --git a/website/docs/d/datascience_notebook_session.html.markdown b/website/docs/d/datascience_notebook_session.html.markdown
@@ -41,6 +41,9 @@ The following attributes are exported:
 * `lifecycle_details` - Details about the state of the notebook session.
 * `notebook_session_configuration_details` - Details for the notebook session configuration.
 	* `block_storage_size_in_gbs` - A notebook session instance is provided with a block storage volume. This specifies the size of the volume in GBs. 
+	* `notebook_session_shape_config_details` - Details for the notebook session shape configuration.
+		* `memory_in_gbs` - A notebook session instance of type VM.Standard.E3.Flex allows memory to be specified. This specifies the size of the memory in GBs. 
+		* `ocpus` - A notebook session instance of type VM.Standard.E3.Flex allows the ocpu count to be specified. 
 	* `shape` - The shape used to launch the notebook session compute instance.  The list of available shapes in a given compartment can be retrieved using the `ListNotebookSessionShapes` endpoint. 
 	* `subnet_id` - A notebook session instance is provided with a VNIC for network access.  This specifies the [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the subnet to create a VNIC in.  The subnet should be in a VCN with a NAT gateway for egress to the internet. 
 * `notebook_session_url` - The URL to interact with the notebook session.
diff --git a/website/docs/d/datascience_notebook_session_shapes.html.markdown b/website/docs/d/datascience_notebook_session_shapes.html.markdown
@@ -41,4 +41,5 @@ The following attributes are exported:
 * `core_count` - The number of cores associated with this notebook session shape. 
 * `memory_in_gbs` - The amount of memory in GBs associated with this notebook session shape. 
 * `name` - The name of the notebook session shape. 
+* `shape_series` - The family that the compute shape belongs to. 
 
diff --git a/website/docs/d/datascience_notebook_sessions.html.markdown b/website/docs/d/datascience_notebook_sessions.html.markdown
@@ -59,6 +59,9 @@ The following attributes are exported:
 * `lifecycle_details` - Details about the state of the notebook session.
 * `notebook_session_configuration_details` - Details for the notebook session configuration.
 	* `block_storage_size_in_gbs` - A notebook session instance is provided with a block storage volume. This specifies the size of the volume in GBs. 
+	* `notebook_session_shape_config_details` - Details for the notebook session shape configuration.
+		* `memory_in_gbs` - A notebook session instance of type VM.Standard.E3.Flex allows memory to be specified. This specifies the size of the memory in GBs. 
+		* `ocpus` - A notebook session instance of type VM.Standard.E3.Flex allows the ocpu count to be specified. 
 	* `shape` - The shape used to launch the notebook session compute instance.  The list of available shapes in a given compartment can be retrieved using the `ListNotebookSessionShapes` endpoint. 
 	* `subnet_id` - A notebook session instance is provided with a VNIC for network access.  This specifies the [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the subnet to create a VNIC in.  The subnet should be in a VCN with a NAT gateway for egress to the internet. 
 * `notebook_session_url` - The URL to interact with the notebook session.
diff --git a/website/docs/r/datascience_notebook_session.html.markdown b/website/docs/r/datascience_notebook_session.html.markdown
@@ -25,6 +25,12 @@ resource "oci_datascience_notebook_session" "test_notebook_session" {
 
 		#Optional
 		block_storage_size_in_gbs = var.notebook_session_notebook_session_configuration_details_block_storage_size_in_gbs
+		notebook_session_shape_config_details {
+
+			#Optional
+			memory_in_gbs = var.notebook_session_notebook_session_configuration_details_notebook_session_shape_config_details_memory_in_gbs
+			ocpus = var.notebook_session_notebook_session_configuration_details_notebook_session_shape_config_details_ocpus
+		}
 	}
 	project_id = oci_datascience_project.test_project.id
 
@@ -45,6 +51,9 @@ The following arguments are supported:
 * `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. See [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). Example: `{"Department": "Finance"}` 
 * `notebook_session_configuration_details` - (Required) (Updatable) Details for the notebook session configuration.
 	* `block_storage_size_in_gbs` - (Optional) (Updatable) A notebook session instance is provided with a block storage volume. This specifies the size of the volume in GBs. 
+	* `notebook_session_shape_config_details` - (Optional) (Updatable) Details for the notebook session shape configuration.
+		* `memory_in_gbs` - (Optional) (Updatable) A notebook session instance of type VM.Standard.E3.Flex allows memory to be specified. This specifies the size of the memory in GBs. 
+		* `ocpus` - (Optional) (Updatable) A notebook session instance of type VM.Standard.E3.Flex allows the ocpu count to be specified. 
 	* `shape` - (Required) (Updatable) The shape used to launch the notebook session compute instance.  The list of available shapes in a given compartment can be retrieved using the `ListNotebookSessionShapes` endpoint. 
 	* `subnet_id` - (Required) (Updatable) A notebook session instance is provided with a VNIC for network access.  This specifies the [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the subnet to create a VNIC in.  The subnet should be in a VCN with a NAT gateway for egress to the internet. 
 * `project_id` - (Required) The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the project to associate with the notebook session.
@@ -66,6 +75,9 @@ The following attributes are exported:
 * `lifecycle_details` - Details about the state of the notebook session.
 * `notebook_session_configuration_details` - Details for the notebook session configuration.
 	* `block_storage_size_in_gbs` - A notebook session instance is provided with a block storage volume. This specifies the size of the volume in GBs. 
+	* `notebook_session_shape_config_details` - Details for the notebook session shape configuration.
+		* `memory_in_gbs` - A notebook session instance of type VM.Standard.E3.Flex allows memory to be specified. This specifies the size of the memory in GBs. 
+		* `ocpus` - A notebook session instance of type VM.Standard.E3.Flex allows the ocpu count to be specified. 
 	* `shape` - The shape used to launch the notebook session compute instance.  The list of available shapes in a given compartment can be retrieved using the `ListNotebookSessionShapes` endpoint. 
 	* `subnet_id` - A notebook session instance is provided with a VNIC for network access.  This specifies the [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the subnet to create a VNIC in.  The subnet should be in a VCN with a NAT gateway for egress to the internet. 
 * `notebook_session_url` - The URL to interact with the notebook session.
