Merge pull request #1794 from oracle/release_gh

Releasing version 4.111.0

Author: rashik-bhasin

CHANGELOG.md

@@ -32,67 +32,11 @@ variable "compartment_ocid" {
 variable "project_ocid" {
 }
 
-variable "model_display_name" {
-  default = "terraform-testing-model"
-}
-
-variable "model_description" {
-  default = "Model for terraform testing"
-}
-
-variable "artifact_content_length" {
-}
-
-variable "model_artifact" {
-}
-
-variable "content_disposition" {
-}
-
 variable "shape" {
 }
 
-variable "model_defined_tags" {
-}
-
-variable "model_freeform_tag" {
-}
-
-variable "model_state" {
-}
-
+variable "model_id" {
 
-# A model resource configurations for creating a new model
-resource "oci_datascience_model" "tf_model" {
-  # Required
-  artifact_content_length = var.artifact_content_length
-  model_artifact          = var.model_artifact
-  compartment_id          = var.compartment_ocid
-  project_id              = var.project_ocid
-  # Optional
-  artifact_content_disposition = var.content_disposition
-  defined_tags                 = var.model_defined_tags
-  description                  = var.model_description
-  display_name                 = var.model_display_name
-  freeform_tags                = var.model_freeform_tag
-}
-
-# A data resource for the list of models in a specified compartment
-data "oci_datascience_models" "tf_models" {
-  # Required
-  compartment_id = var.compartment_ocid
-  # Optional
-  created_by   = var.user_ocid
-  display_name = oci_datascience_model.tf_model.display_name
-  id           = oci_datascience_model.tf_model.id
-  project_id   = var.project_ocid
-  state        = var.model_state
-}
-
-# The data source for a list of model deployment shapes
-data "oci_datascience_model_deployment_shapes" "tf_model_deployment_shapes" {
-  # Required
-  compartment_id = var.compartment_ocid
 }
 
 variable "model_deployment_display_name" {
@@ -143,6 +87,40 @@ variable "model_deployment_model_configuration_details_instance_configuration_mo
 }
 
 variable "model_deployment_state" {
+  default = "ACTIVE"
+}
+
+# these variables for BYOC option
+variable "model_byoc_id" {
+}
+
+variable "model_deployment_byoc_display_name" {
+  default = "terraform-testing-model-deployment_byoc"
+}
+
+variable "model_deployment_model_deployment_configuration_details_environment_configuration_details_environment_configuration_type" {
+  default = "OCIR_CONTAINER"
+}
+
+variable "model_deployment_model_deployment_configuration_details_environment_configuration_details_cmd" {
+}
+
+variable "model_deployment_model_deployment_configuration_details_environment_configuration_details_entrypoint" {
+}
+
+variable "model_deployment_model_deployment_configuration_details_environment_configuration_details_environment_variables" {
+}
+
+variable "model_deployment_model_deployment_configuration_details_environment_configuration_details_health_check_port" {
+}
+
+variable "model_deployment_model_deployment_configuration_details_environment_configuration_details_image" {
+}
+
+variable "model_deployment_model_deployment_configuration_details_environment_configuration_details_image_digest" {
+}
+
+variable "model_deployment_model_deployment_configuration_details_environment_configuration_details_server_port" {
 }
 
 # A model deployment resource configurations for creating a new model deployment
@@ -166,7 +144,7 @@ resource "oci_datascience_model_deployment" "tf_model_deployment" {
           ocpus         = var.model_deployment_model_configuration_details_instance_configuration_model_deployment_instance_shape_config_details_ocpus
         }
       }
-      model_id = oci_datascience_model.tf_model.id
+      model_id = var.model_id
 
       # Optional
       bandwidth_mbps = var.model_deployment_model_deployment_configuration_details_model_configuration_details_bandwidth_mbps
@@ -195,10 +173,81 @@ resource "oci_datascience_model_deployment" "tf_model_deployment" {
     }
   }
   # Optional
-  defined_tags  = var.model_deployment_defined_tags
+//  defined_tags  = var.model_deployment_defined_tags
   description   = var.model_deployment_description
   display_name  = var.model_deployment_display_name
-  freeform_tags = var.model_deployment_freeform_tag
+//  freeform_tags = var.model_deployment_freeform_tag
+}
+
+
+resource "oci_datascience_model_deployment" "tf_model_deployment_byoc" {
+  # Required
+  compartment_id = var.compartment_ocid
+  model_deployment_configuration_details {
+    # Required
+    deployment_type = var.model_deployment_model_deployment_configuration_details_deployment_type
+    model_configuration_details {
+      # Required
+      instance_configuration {
+        # Required
+        instance_shape_name = var.shape
+
+        #Optional
+        model_deployment_instance_shape_config_details {
+
+          #Optional
+          memory_in_gbs = var.model_deployment_model_configuration_details_instance_configuration_model_deployment_instance_shape_config_details_memory_in_gbs
+          ocpus         = var.model_deployment_model_configuration_details_instance_configuration_model_deployment_instance_shape_config_details_ocpus
+        }
+      }
+      model_id = var.model_byoc_id
+
+      # Optional
+      bandwidth_mbps = var.model_deployment_model_deployment_configuration_details_model_configuration_details_bandwidth_mbps
+      scaling_policy {
+        # Required
+        instance_count = var.model_deployment_model_deployment_configuration_details_model_configuration_details_scaling_policy_instance_count
+        policy_type    = var.model_deployment_model_deployment_configuration_details_model_configuration_details_scaling_policy_policy_type
+      }
+    }
+
+    # Optional for BYOC
+    environment_configuration_details {
+      #Required
+      environment_configuration_type = var.model_deployment_model_deployment_configuration_details_environment_configuration_details_environment_configuration_type
+
+      #Optional
+      cmd = var.model_deployment_model_deployment_configuration_details_environment_configuration_details_cmd
+      entrypoint = var.model_deployment_model_deployment_configuration_details_environment_configuration_details_entrypoint
+      environment_variables = var.model_deployment_model_deployment_configuration_details_environment_configuration_details_environment_variables
+      health_check_port = var.model_deployment_model_deployment_configuration_details_environment_configuration_details_health_check_port
+      image = var.model_deployment_model_deployment_configuration_details_environment_configuration_details_image
+      image_digest = var.model_deployment_model_deployment_configuration_details_environment_configuration_details_image_digest
+      server_port = var.model_deployment_model_deployment_configuration_details_environment_configuration_details_server_port
+    }
+  }
+  project_id = var.project_ocid
+
+  # Optional
+  category_log_details {
+
+    # Optional
+    access {
+      # Required
+      log_group_id = var.log_group_id
+      log_id       = var.access_log_id
+    }
+    predict {
+      # Required
+      log_group_id = var.log_group_id
+      log_id       = var.predict_log_id
+    }
+  }
+  # Optional
+  //  defined_tags  = var.model_deployment_defined_tags
+  description   = var.model_deployment_description
+  display_name  = var.model_deployment_byoc_display_name
+  //  freeform_tags = var.model_deployment_freeform_tag
 }
 
 # The data resource for a list of model deployments in a specified compartment

examples/datascience/model_deployment/artifact_byoc.zip

@@ -6,4 +6,3 @@ data "oci_management_agent_management_agent_count" "test_management_agent_count"
   compartment_id = var.compartment_ocid
   group_by = ["version"]
 }
-

examples/datascience/model_deployment/model_deployment.tf

@@ -55,6 +55,12 @@ resource "oci_oce_oce_instance" "test_oce_instance" {
   instance_license_type = "BYOL"
   upgrade_schedule      = "UPGRADE_IMMEDIATELY"
   waf_primary_domain    = "oracle.com"
+  
+  timeouts {
+    create = "2h"
+    update = "60m"
+    delete = "1h"
+  }
 }
 
 data "oci_oce_oce_instances" "test_oce_instances" {