Skip to content

Commit fb4e882

Browse files
Gurbaz SinghMaxrovr
Gurbaz Singh
authored and
Maxrovr
committed
Added - Support for ODSC - Enable Burstable for Data Science Notebooks, ML Jobs, and ML Pipeline
1 parent 10dd714 commit fb4e882

25 files changed

+418
-377
lines changed

‎internal/integrationtest/datascience_job_test.go‎

Lines changed: 99 additions & 40 deletions
Large diffs are not rendered by default.

‎internal/integrationtest/datascience_notebook_session_test.go‎

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ var (
8686
}
8787

8888
notebookSessionConfigDetailsRepresentation = map[string]interface{}{
89-
"shape": acctest.Representation{RepType: acctest.Required, Create: `VM.Standard2.1`},
89+
"shape": acctest.Representation{RepType: acctest.Required, Create: `VM.Standard.E4.Flex`},
9090
"block_storage_size_in_gbs": acctest.Representation{RepType: acctest.Optional, Create: `100`},
91-
"notebook_session_shape_config_details": acctest.RepresentationGroup{RepType: acctest.Optional, Group: notebookSessionConfigDetailsShapeConfigDetailsRepresentation},
91+
"notebook_session_shape_config_details": acctest.RepresentationGroup{RepType: acctest.Required, Group: notebookSessionConfigDetailsShapeConfigDetailsRepresentation},
9292
"private_endpoint_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_datascience_private_endpoint.test_data_science_private_endpoint.id}`},
9393
"subnet_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_core_subnet.test_subnet.id}`},
9494
}
@@ -111,8 +111,9 @@ var (
111111
}
112112

113113
notebookSessionConfigDetailsShapeConfigDetailsRepresentation = map[string]interface{}{
114-
"memory_in_gbs": acctest.Representation{RepType: acctest.Optional, Create: `1.0`},
115-
"ocpus": acctest.Representation{RepType: acctest.Optional, Create: `1.0`},
114+
"cpu_baseline": acctest.Representation{RepType: acctest.Optional, Create: `BASELINE_1_8`, Update: `BASELINE_1_2`},
115+
"ocpus": acctest.Representation{RepType: acctest.Required, Create: `2.0`, Update: `4.0`},
116+
"memory_in_gbs": acctest.Representation{RepType: acctest.Required, Create: `14.0`, Update: `28.0`},
116117
}
117118

118119
definedTagsIgnoreRepresentation = map[string]interface{}{
@@ -186,8 +187,11 @@ func TestDatascienceNotebookSessionWithConfigDetailsResource_basic(t *testing.T)
186187
resource.TestCheckResourceAttrSet(resourceName, "id"),
187188
resource.TestCheckResourceAttr(resourceName, "notebook_session_config_details.#", "1"),
188189
resource.TestCheckResourceAttr(resourceName, "notebook_session_config_details.0.block_storage_size_in_gbs", "100"),
190+
resource.TestCheckResourceAttr(resourceName, "notebook_session_config_details.0.notebook_session_shape_config_details.#", "1"),
191+
resource.TestCheckResourceAttr(resourceName, "notebook_session_config_details.0.notebook_session_shape_config_details.0.cpu_baseline", "BASELINE_1_8"),
192+
resource.TestCheckResourceAttr(resourceName, "notebook_session_config_details.0.notebook_session_shape_config_details.0.memory_in_gbs", "14"),
193+
resource.TestCheckResourceAttr(resourceName, "notebook_session_config_details.0.notebook_session_shape_config_details.0.ocpus", "2"),
189194
resource.TestCheckResourceAttrSet(resourceName, "notebook_session_config_details.0.private_endpoint_id"),
190-
resource.TestCheckResourceAttr(resourceName, "notebook_session_config_details.0.shape", "VM.Standard2.1"),
191195
resource.TestCheckResourceAttrSet(resourceName, "project_id"),
192196
resource.TestCheckResourceAttrSet(resourceName, "state"),
193197
resource.TestCheckResourceAttrSet(resourceName, "time_created"),
@@ -243,9 +247,13 @@ func TestDatascienceNotebookSessionWithConfigDetailsResource_basic(t *testing.T)
243247
resource.TestCheckResourceAttrSet(resourceName, "id"),
244248
resource.TestCheckResourceAttr(resourceName, "notebook_session_config_details.#", "1"),
245249
resource.TestCheckResourceAttr(resourceName, "notebook_session_config_details.0.block_storage_size_in_gbs", "100"),
246-
resource.TestCheckResourceAttr(resourceName, "notebook_session_config_details.0.notebook_session_shape_config_details.#", "0"),
250+
resource.TestCheckResourceAttr(resourceName, "notebook_session_config_details.0.notebook_session_shape_config_details.#", "1"),
251+
resource.TestCheckResourceAttr(resourceName, "notebook_session_config_details.0.notebook_session_shape_config_details.0.cpu_baseline", "BASELINE_1_8"),
252+
resource.TestCheckResourceAttr(resourceName, "notebook_session_config_details.0.notebook_session_shape_config_details.0.memory_in_gbs", "14"),
253+
resource.TestCheckResourceAttr(resourceName, "notebook_session_config_details.0.notebook_session_shape_config_details.0.ocpus", "2"),
247254
resource.TestCheckResourceAttrSet(resourceName, "notebook_session_config_details.0.private_endpoint_id"),
248-
resource.TestCheckResourceAttr(resourceName, "notebook_session_config_details.0.shape", "VM.Standard2.1"),
255+
resource.TestCheckResourceAttrSet(resourceName, "notebook_session_configuration_details.0.private_endpoint_id"),
256+
resource.TestCheckResourceAttrSet(resourceName, "notebook_session_configuration_details.0.subnet_id"),
249257
resource.TestCheckResourceAttrSet(resourceName, "project_id"),
250258
resource.TestCheckResourceAttrSet(resourceName, "state"),
251259
resource.TestCheckResourceAttrSet(resourceName, "time_created"),
@@ -272,9 +280,13 @@ func TestDatascienceNotebookSessionWithConfigDetailsResource_basic(t *testing.T)
272280
resource.TestCheckResourceAttrSet(resourceName, "id"),
273281
resource.TestCheckResourceAttr(resourceName, "notebook_session_config_details.#", "1"),
274282
resource.TestCheckResourceAttr(resourceName, "notebook_session_config_details.0.block_storage_size_in_gbs", "100"),
275-
resource.TestCheckResourceAttr(resourceName, "notebook_session_config_details.0.notebook_session_shape_config_details.#", "0"),
283+
resource.TestCheckResourceAttr(resourceName, "notebook_session_config_details.0.notebook_session_shape_config_details.#", "1"),
284+
resource.TestCheckResourceAttr(resourceName, "notebook_session_config_details.0.notebook_session_shape_config_details.0.cpu_baseline", "BASELINE_1_8"),
285+
resource.TestCheckResourceAttr(resourceName, "notebook_session_config_details.0.notebook_session_shape_config_details.0.memory_in_gbs", "14"),
286+
resource.TestCheckResourceAttr(resourceName, "notebook_session_config_details.0.notebook_session_shape_config_details.0.ocpus", "2"),
276287
resource.TestCheckResourceAttrSet(resourceName, "notebook_session_config_details.0.private_endpoint_id"),
277-
resource.TestCheckResourceAttr(resourceName, "notebook_session_config_details.0.shape", "VM.Standard2.1"),
288+
resource.TestCheckResourceAttr(resourceName, "notebook_session_config_details.0.shape", "VM.Standard.E4.Flex"),
289+
resource.TestCheckResourceAttrSet(resourceName, "notebook_session_config_details.0.subnet_id"),
278290
resource.TestCheckResourceAttrSet(resourceName, "project_id"),
279291
resource.TestCheckResourceAttrSet(resourceName, "state"),
280292
resource.TestCheckResourceAttrSet(resourceName, "time_created"),
@@ -303,8 +315,8 @@ func TestDatascienceNotebookSessionWithConfigDetailsResource_basic(t *testing.T)
303315
resource.TestCheckResourceAttrSet(singularDatasourceName, "id"),
304316
resource.TestCheckResourceAttr(singularDatasourceName, "notebook_session_config_details.#", "1"),
305317
resource.TestCheckResourceAttr(singularDatasourceName, "notebook_session_config_details.0.block_storage_size_in_gbs", "100"),
306-
resource.TestCheckResourceAttr(singularDatasourceName, "notebook_session_config_details.0.notebook_session_shape_config_details.#", "0"),
307-
resource.TestCheckResourceAttr(singularDatasourceName, "notebook_session_config_details.0.shape", "VM.Standard2.1"),
318+
resource.TestCheckResourceAttr(singularDatasourceName, "notebook_session_config_details.0.notebook_session_shape_config_details.#", "1"),
319+
resource.TestCheckResourceAttr(singularDatasourceName, "notebook_session_config_details.0.shape", "VM.Standard.E4.Flex"),
308320
resource.TestCheckResourceAttrSet(singularDatasourceName, "notebook_session_url"),
309321
resource.TestCheckResourceAttrSet(singularDatasourceName, "state"),
310322
resource.TestCheckResourceAttrSet(singularDatasourceName, "time_created"),
@@ -455,6 +467,7 @@ func TestDatascienceNotebookSessionWithConfigurationDetailsResource_basic(t *tes
455467
resource.TestCheckResourceAttr(datasourceName, "notebook_sessions.0.display_name", "displayName2"),
456468
resource.TestCheckResourceAttr(datasourceName, "notebook_sessions.0.freeform_tags.%", "1"),
457469
resource.TestCheckResourceAttrSet(datasourceName, "notebook_sessions.0.id"),
470+
resource.TestCheckResourceAttr(datasourceName, "notebook_sessions.0.notebook_session_config_details.#", "1"),
458471
resource.TestCheckResourceAttr(datasourceName, "notebook_sessions.0.notebook_session_config_details.0.block_storage_size_in_gbs", "100"),
459472
resource.TestCheckResourceAttr(datasourceName, "notebook_sessions.0.notebook_session_config_details.0.shape", "VM.Standard2.1"),
460473
resource.TestCheckResourceAttrSet(datasourceName, "notebook_sessions.0.notebook_session_url"),
@@ -476,6 +489,8 @@ func TestDatascienceNotebookSessionWithConfigurationDetailsResource_basic(t *tes
476489
resource.TestCheckResourceAttr(singularDatasourceName, "display_name", "displayName2"),
477490
resource.TestCheckResourceAttr(singularDatasourceName, "freeform_tags.%", "1"),
478491
resource.TestCheckResourceAttrSet(singularDatasourceName, "id"),
492+
resource.TestCheckResourceAttr(singularDatasourceName, "notebook_session_configuration_details.0.block_storage_size_in_gbs", "100"),
493+
resource.TestCheckResourceAttr(singularDatasourceName, "notebook_session_configuration_details.0.shape", "VM.Standard2.1"),
479494
resource.TestCheckResourceAttrSet(singularDatasourceName, "notebook_session_url"),
480495
resource.TestCheckResourceAttrSet(singularDatasourceName, "state"),
481496
resource.TestCheckResourceAttrSet(singularDatasourceName, "time_created"),

0 commit comments

Comments
 (0)