Added - Support for Mount File System in Data Science Jobs and Notebooks

Author: Terraform Team Automation

examples/datascience/job/job.tf

@@ -27,6 +27,17 @@ resource "oci_datascience_project" "job" {
   compartment_id = var.compartment_ocid
 }
 
+resource "oci_core_subnet" "tf_subnet" {
+  cidr_block     = "10.0.1.0/24"
+  compartment_id = var.compartment_ocid
+  vcn_id         = oci_core_vcn.tf_vcn.id
+}
+
+resource "oci_core_vcn" "tf_vcn" {
+  cidr_block     = "10.0.0.0/16"
+  compartment_id = var.compartment_ocid
+}
+
 resource "oci_datascience_job" "job" {
   compartment_id               = var.compartment_ocid
   project_id                   = oci_datascience_project.job.id
@@ -41,9 +52,10 @@ resource "oci_datascience_job" "job" {
   }
 
   job_infrastructure_configuration_details {
-    job_infrastructure_type   = "ME_STANDALONE"
-    shape_name                = "VM.Standard2.2"
+    job_infrastructure_type   = "STANDALONE"
+    shape_name                = "VM.Standard3.Flex"
     block_storage_size_in_gbs = 100
+    subnet_id = oci_core_subnet.tf_subnet.id
 
     # Optional
     job_shape_config_details {
@@ -75,7 +87,7 @@ data "oci_datascience_jobs" "by_compartment" {
 resource "oci_datascience_job_run" "sync" {
   compartment_id = var.compartment_ocid
   project_id     = oci_datascience_project.job.id
-  job_id         = oci_datascience_project.job.id
+  job_id         = oci_datascience_job.job.id
   asynchronous   = false
 }
 
@@ -84,7 +96,7 @@ resource "oci_datascience_job_run" "sync" {
 resource "oci_datascience_job_run" "async" {
   compartment_id = var.compartment_ocid
   project_id     = oci_datascience_project.job.id
-  job_id         = oci_datascience_project.job.id
+  job_id         = oci_datascience_job.job.id
   asynchronous   = true
 }
 

internal/integrationtest/datascience_job_test.go

@@ -74,9 +74,9 @@ var (
 	}
 	DatascienceJobJobInfrastructureConfigurationDetailsRepresentation = map[string]interface{}{
 		"block_storage_size_in_gbs": acctest.Representation{RepType: acctest.Required, Create: `50`, Update: `100`},
-		"job_infrastructure_type":   acctest.Representation{RepType: acctest.Required, Create: `ME_STANDALONE`},
-		"shape_name":                acctest.Representation{RepType: acctest.Required, Create: `VM.Standard2.2`},
-		"job_shape_config_details":  acctest.RepresentationGroup{RepType: acctest.Optional, Group: jobJobInfrastructureConfigurationDetailsJobShapeConfigDetailsRepresentation},
+		"job_infrastructure_type":   acctest.Representation{RepType: acctest.Required, Create: `STANDALONE`},
+		"shape_name":                acctest.Representation{RepType: acctest.Required, Create: `VM.Standard2.1`},
+		"subnet_id":                 acctest.Representation{RepType: acctest.Required, Create: `${oci_core_subnet.test_subnet.id}`},
 	}
 
 	ignoreMlJobDefinedTagsChangesRepresentation = map[string]interface{}{
@@ -94,12 +94,10 @@ var (
 		"artifact_content_disposition":             acctest.Representation{RepType: acctest.Required, Create: `attachment; filename=job-artifact.py`},
 		"lifecycle":                                acctest.RepresentationGroup{RepType: acctest.Required, Group: ignoreMlJobDefinedTagsChangesRepresentation},
 	}
-	jobJobInfrastructureConfigurationDetailsJobShapeConfigDetailsRepresentation = map[string]interface{}{
-		"memory_in_gbs": acctest.Representation{RepType: acctest.Optional, Create: `1.0`, Update: `1.1`},
-		"ocpus":         acctest.Representation{RepType: acctest.Optional, Create: `1.0`, Update: `2.0`},
-	}
 
-	DatascienceJobResourceDependencies = acctest.GenerateDataSourceFromRepresentationMap("oci_core_shapes", "test_shapes", acctest.Required, acctest.Create, CoreCoreShapeDataSourceRepresentation) +
+	DatascienceJobResourceDependencies = acctest.GenerateResourceFromRepresentationMap("oci_core_subnet", "test_subnet", acctest.Required, acctest.Create, CoreSubnetRepresentation) +
+		acctest.GenerateResourceFromRepresentationMap("oci_core_vcn", "test_vcn", acctest.Required, acctest.Create, CoreVcnRepresentation) +
+		acctest.GenerateDataSourceFromRepresentationMap("oci_core_shapes", "test_shapes", acctest.Required, acctest.Create, CoreCoreShapeDataSourceRepresentation) +
 		acctest.GenerateResourceFromRepresentationMap("oci_datascience_project", "test_project", acctest.Required, acctest.Create, DatascienceProjectRepresentation) +
 		DefinedTagsDependencies
 )
@@ -264,7 +262,6 @@ func TestDatascienceJobResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(datasourceName, "display_name", "displayName2"),
 					resource.TestCheckResourceAttrSet(datasourceName, "project_id"),
 					resource.TestCheckResourceAttr(datasourceName, "state", "ACTIVE"),
-
 					resource.TestCheckResourceAttr(datasourceName, "jobs.#", "1"),
 					resource.TestCheckResourceAttr(datasourceName, "jobs.0.compartment_id", compartmentId),
 					resource.TestCheckResourceAttr(datasourceName, "jobs.0.display_name", "displayName2"),

internal/integrationtest/datascience_notebook_session_test.go

@@ -129,6 +129,7 @@ var (
 		acctest.GenerateResourceFromRepresentationMap("oci_core_subnet", "test_subnet", acctest.Required, acctest.Create, CoreSubnetRepresentation) +
 		acctest.GenerateResourceFromRepresentationMap("oci_core_vcn", "test_vcn", acctest.Required, acctest.Create, CoreVcnRepresentation) +
 		acctest.GenerateResourceFromRepresentationMap("oci_datascience_project", "test_project", acctest.Required, acctest.Create, DatascienceProjectRepresentation) +
+		AvailabilityDomainConfig +
 		DefinedTagsDependencies
 )