Refactored test.

Author: lu-ohai

tests/unitary/default_setup/model_deployment/test_model_deployment_v2.py

@@ -79,7 +79,6 @@
                 model_deployment_instance_shape_config_details=ModelDeploymentInstanceShapeConfigDetails(
                     ocpus=10, memory_in_gbs=36
                 ),
-                subnet_id="fakeid.subnet.oc1.iad.xxx"
             ),
             scaling_policy=FixedSizeScalingPolicy(instance_count=5),
             bandwidth_mbps=5,
@@ -129,7 +128,6 @@
                 "replica": 5,
                 "shape_name": "VM.Standard.E4.Flex",
                 "shape_config_details": {"ocpus": 10, "memoryInGBs": 36},
-                "subnet_id": "fakeid.subnet.oc1.iad.xxx",
                 "web_concurrency": 10,
                 "access_log": {
                     "logGroupId": "fakeid.loggroup.oc1.iad.xxx",
@@ -150,7 +148,7 @@
                 "entrypoint": ["python", "/opt/ds/model/deployed_model/api.py"],
                 "server_port": 5000,
                 "health_check_port": 5000,
-                "env": {"WEB_CONCURRENCY": 10},
+                "env": {"WEB_CONCURRENCY": "10"},
                 "input_stream_ids": ["123", "456"],
                 "output_stream_ids": ["321", "654"],
                 "model_uri": "fakeid.datasciencemodel.oc1.iad.xxx",
@@ -186,10 +184,9 @@
       shapeConfigDetails:
         memoryInGBs: 36
         ocpus: 10
-      subnetId: fakeid.subnet.oc1.iad.xxx
       replica: 5
       bandwidthMbps: 5
-      webConcurrency: 5
+      webConcurrency: 10
   runtime:
     kind: runtime
     type: container
@@ -200,56 +197,48 @@
       entrypoint: ["python", "/opt/ds/model/deployed_model/api.py"]
       serverPort: 5000
       healthCheckPort: 5000
-      env:
-        key: value
       inputStreamIds: ["123", "456"]
       outputStreamIds: ["321", "654"]
       deploymentMode: STREAM_ONLY
 """
 
+infrastructure = (
+    ModelDeploymentInfrastructure()
+    .with_bandwidth_mbps(5)
+    .with_compartment_id("fakeid.compartment.oc1..xxx")
+    .with_project_id("fakeid.datascienceproject.oc1.iad.xxx")
+    .with_replica(5)
+    .with_shape_name("VM.Standard.E4.Flex")
+    .with_shape_config_details(ocpus=10, memory_in_gbs=36)
+    .with_web_concurrency(10)
+    .with_access_log(
+        log_group_id="fakeid.loggroup.oc1.iad.xxx",
+        log_id="fakeid.log.oc1.iad.xxx",
+    )
+    .with_predict_log(
+        log_group_id="fakeid.loggroup.oc1.iad.xxx",
+        log_id="fakeid.log.oc1.iad.xxx",
+    )
+)
 
-class ModelDeploymentBYOCTestCase(unittest.TestCase):
-    def initialize_model_deployment(self):
-        infrastructure = (
-            ModelDeploymentInfrastructure()
-            .with_bandwidth_mbps(5)
-            .with_compartment_id("fakeid.compartment.oc1..xxx")
-            .with_project_id("fakeid.datascienceproject.oc1.iad.xxx")
-            .with_replica(5)
-            .with_shape_name("VM.Standard.E4.Flex")
-            .with_shape_config_details(ocpus=10, memory_in_gbs=36)
-            .with_subnet_id("fakeid.subnet.oc1.iad.xxx")
-            .with_web_concurrency(10)
-            .with_access_log(
-                log_group_id="fakeid.loggroup.oc1.iad.xxx",
-                log_id="fakeid.log.oc1.iad.xxx",
-            )
-            .with_predict_log(
-                log_group_id="fakeid.loggroup.oc1.iad.xxx",
-                log_id="fakeid.log.oc1.iad.xxx",
-            )
-        )
+runtime = (
+    ModelDeploymentContainerRuntime()
+    .with_image("iad.ocir.io/ociodscdev/ml_flask_app_demo:1.0.0")
+    .with_image_digest(
+        "sha256:243590ea099af4019b6afc104b8a70b9552f0b001b37d0442f8b5a399244681c"
+    )
+    .with_entrypoint(["python", "/opt/ds/model/deployed_model/api.py"])
+    .with_server_port(5000)
+    .with_health_check_port(5000)
+    .with_input_stream_ids(["123", "456"])
+    .with_output_stream_ids(["321", "654"])
+    .with_model_uri("fakeid.datasciencemodel.oc1.iad.xxx")
+    .with_deployment_mode("STREAM_ONLY")
+)
 
-        runtime = (
-            ModelDeploymentContainerRuntime()
-            .with_image("iad.ocir.io/ociodscdev/ml_flask_app_demo:1.0.0")
-            .with_image_digest(
-                "sha256:243590ea099af4019b6afc104b8a70b9552f0b001b37d0442f8b5a399244681c"
-            )
-            .with_entrypoint(["python", "/opt/ds/model/deployed_model/api.py"])
-            .with_server_port(5000)
-            .with_health_check_port(5000)
-            .with_env(
-                {
-                    "WEB_CONCURRENCY": 10,
-                }
-            )
-            .with_input_stream_ids(["123", "456"])
-            .with_output_stream_ids(["321", "654"])
-            .with_model_uri("fakeid.datasciencemodel.oc1.iad.xxx")
-            .with_deployment_mode("STREAM_ONLY")
-        )
 
+class ModelDeploymentBYOCTestCase(unittest.TestCase):
+    def initialize_model_deployment(self):
         model_deployment = (
             ModelDeployment()
             .with_display_name("Generic Model Deployment With Small Artifact")
@@ -263,46 +252,6 @@ def initialize_model_deployment(self):
         return model_deployment
 
     def initialize_model_deployment_from_spec(self):
-        infrastructure = (
-            ModelDeploymentInfrastructure()
-            .with_bandwidth_mbps(5)
-            .with_compartment_id("fakeid.compartment.oc1..xxx")
-            .with_project_id("fakeid.datascienceproject.oc1.iad.xxx")
-            .with_replica(5)
-            .with_shape_name("VM.Standard.E4.Flex")
-            .with_shape_config_details(ocpus=10, memory_in_gbs=36)
-            .with_subnet_id("fakeid.subnet.oc1.iad.xxx")
-            .with_web_concurrency(10)
-            .with_access_log(
-                log_group_id="fakeid.loggroup.oc1.iad.xxx",
-                log_id="fakeid.log.oc1.iad.xxx",
-            )
-            .with_predict_log(
-                log_group_id="fakeid.loggroup.oc1.iad.xxx",
-                log_id="fakeid.log.oc1.iad.xxx",
-            )
-        )
-
-        runtime = (
-            ModelDeploymentContainerRuntime()
-            .with_image("iad.ocir.io/ociodscdev/ml_flask_app_demo:1.0.0")
-            .with_image_digest(
-                "sha256:243590ea099af4019b6afc104b8a70b9552f0b001b37d0442f8b5a399244681c"
-            )
-            .with_entrypoint(["python", "/opt/ds/model/deployed_model/api.py"])
-            .with_server_port(5000)
-            .with_health_check_port(5000)
-            .with_env(
-                {
-                    "WEB_CONCURRENCY": 10,
-                }
-            )
-            .with_input_stream_ids(["123", "456"])
-            .with_output_stream_ids(["321", "654"])
-            .with_model_uri("fakeid.datasciencemodel.oc1.iad.xxx")
-            .with_deployment_mode("STREAM_ONLY")
-        )
-
         return ModelDeployment(
             spec={
                 "display_name": "Generic Model Deployment With Small Artifact",
@@ -315,46 +264,6 @@ def initialize_model_deployment_from_spec(self):
         )
 
     def initialize_model_deployment_from_kwargs(self):
-        infrastructure = (
-            ModelDeploymentInfrastructure()
-            .with_bandwidth_mbps(5)
-            .with_compartment_id("fakeid.compartment.oc1..xxx")
-            .with_project_id("fakeid.datascienceproject.oc1.iad.xxx")
-            .with_replica(5)
-            .with_shape_name("VM.Standard.E4.Flex")
-            .with_shape_config_details(ocpus=10, memory_in_gbs=36)
-            .with_subnet_id("fakeid.subnet.oc1.iad.xxx")
-            .with_web_concurrency(10)
-            .with_access_log(
-                log_group_id="fakeid.loggroup.oc1.iad.xxx",
-                log_id="fakeid.log.oc1.iad.xxx",
-            )
-            .with_predict_log(
-                log_group_id="fakeid.loggroup.oc1.iad.xxx",
-                log_id="fakeid.log.oc1.iad.xxx",
-            )
-        )
-
-        runtime = (
-            ModelDeploymentContainerRuntime()
-            .with_image("iad.ocir.io/ociodscdev/ml_flask_app_demo:1.0.0")
-            .with_image_digest(
-                "sha256:243590ea099af4019b6afc104b8a70b9552f0b001b37d0442f8b5a399244681c"
-            )
-            .with_entrypoint(["python", "/opt/ds/model/deployed_model/api.py"])
-            .with_server_port(5000)
-            .with_health_check_port(5000)
-            .with_env(
-                {
-                    "WEB_CONCURRENCY": 10,
-                }
-            )
-            .with_input_stream_ids(["123", "456"])
-            .with_output_stream_ids(["321", "654"])
-            .with_model_uri("fakeid.datasciencemodel.oc1.iad.xxx")
-            .with_deployment_mode("STREAM_ONLY")
-        )
-
         return ModelDeployment(
             display_name="Generic Model Deployment With Small Artifact",
             description="The model deployment description",
@@ -383,7 +292,7 @@ def test_initialize_model_deployment(self):
 
         temp_runtime = temp_model_deployment.runtime
         assert temp_runtime.environment_config_type == "OCIR_CONTAINER"
-        assert temp_runtime.env == {"WEB_CONCURRENCY": 10}
+        assert temp_runtime.env == {"WEB_CONCURRENCY": "10"}
         assert temp_runtime.deployment_mode == "STREAM_ONLY"
         assert temp_runtime.input_stream_ids == ["123", "456"]
         assert temp_runtime.output_stream_ids == ["321", "654"]
@@ -410,7 +319,6 @@ def test_initialize_model_deployment(self):
             "ocpus": 10,
             "memoryInGBs": 36,
         }
-        assert temp_infrastructure.subnet_id == "fakeid.subnet.oc1.iad.xxx"
         assert temp_infrastructure.replica == 5
         assert temp_infrastructure.access_log == {
             "logGroupId": "fakeid.loggroup.oc1.iad.xxx",
@@ -468,7 +376,6 @@ def test_model_deployment_to_dict(self):
                         "replica": 5,
                         "shapeName": "VM.Standard.E4.Flex",
                         "shapeConfigDetails": {"ocpus": 10, "memoryInGBs": 36},
-                        "subnetId": "fakeid.subnet.oc1.iad.xxx",
                         "webConcurrency": 10,
                         "accessLog": {
                             "logGroupId": "fakeid.loggroup.oc1.iad.xxx",
@@ -489,7 +396,7 @@ def test_model_deployment_to_dict(self):
                         "entrypoint": ["python", "/opt/ds/model/deployed_model/api.py"],
                         "serverPort": 5000,
                         "healthCheckPort": 5000,
-                        "env": {"WEB_CONCURRENCY": 10},
+                        "env": {"WEB_CONCURRENCY": "10"},
                         "inputStreamIds": ["123", "456"],
                         "outputStreamIds": ["321", "654"],
                         "modelUri": "fakeid.datasciencemodel.oc1.iad.xxx",
@@ -525,7 +432,6 @@ def test_build_model_deployment_configuration_details(self, mock_prepare_artifac
                         "ocpus": 10,
                         "memoryInGBs": 36,
                     },
-                    "subnetId": "fakeid.subnet.oc1.iad.xxx",
                 },
                 "modelId": "fakeid.datasciencemodel.oc1.iad.xxx",
                 "scalingPolicy": {"policyType": "FIXED_SIZE", "instanceCount": 5},
@@ -689,7 +595,6 @@ def test_build_model_deployment_details(self, mock_prepare_artifact):
             instance_configuration.model_deployment_instance_shape_config_details.memory_in_gbs
             == model_deployment.infrastructure.shape_config_details["memoryInGBs"]
         )
-        assert instance_configuration.subnet_id == model_deployment.infrastructure.subnet_id
 
         scaling_policy = model_configuration_details.scaling_policy
         assert isinstance(scaling_policy, FixedSizeScalingPolicy)
@@ -790,7 +695,6 @@ def test_update_from_oci_model(self):
             infrastructure.shape_config_details["memoryInGBs"]
             == instance_configuration.model_deployment_instance_shape_config_details.memory_in_gbs
         )
-        assert infrastructure.subnet_id == instance_configuration.subnet_id
         assert infrastructure.replica == scaling_policy.instance_count
 
         category_log_details = OCI_MODEL_DEPLOYMENT_RESPONSE.category_log_details
@@ -853,55 +757,6 @@ def test_model_deployment_from_yaml(self):
         )
         assert isinstance(model_deployment_from_yaml.runtime, ModelDeploymentRuntime)
 
-        assert model_deployment_from_yaml.to_dict() == {
-            "kind": "deployment",
-            "type": "modelDeployment",
-            "spec": {
-                "displayName": "Generic Model Deployment With Small Artifact",
-                "description": "The model deployment description",
-                "definedTags": {"key1": {"skey1": "value1"}},
-                "freeformTags": {"key1": "value1"},
-                "infrastructure": {
-                    "kind": "infrastructure",
-                    "type": "datascienceModelDeployment",
-                    "spec": {
-                        "bandwidthMbps": 5,
-                        "compartmentId": "fakeid.compartment.oc1..xxx",
-                        "projectId": "fakeid.datascienceproject.oc1.iad.xxx",
-                        "replica": 5,
-                        "shapeName": "VM.Standard.E4.Flex",
-                        "shapeConfigDetails": {"ocpus": 10, "memoryInGBs": 36},
-                        "subnetId": "fakeid.subnet.oc1.iad.xxx",
-                        "accessLog": {
-                            "logGroupId": "fakeid.loggroup.oc1.iad.xxx",
-                            "logId": "fakeid.log.oc1.iad.xxx",
-                        },
-                        "predictLog": {
-                            "logGroupId": "fakeid.loggroup.oc1.iad.xxx",
-                            "logId": "fakeid.log.oc1.iad.xxx",
-                        },
-                        "webConcurrency": 5,
-                    },
-                },
-                "runtime": {
-                    "kind": "runtime",
-                    "type": "container",
-                    "spec": {
-                        "image": "iad.ocir.io/ociodscdev/ml_flask_app_demo:1.0.0",
-                        "imageDigest": "sha256:243590ea099af4019b6afc104b8a70b9552f0b001b37d0442f8b5a399244681c",
-                        "entrypoint": ["python", "/opt/ds/model/deployed_model/api.py"],
-                        "serverPort": 5000,
-                        "healthCheckPort": 5000,
-                        "env": {"key": "value"},
-                        "inputStreamIds": ["123", "456"],
-                        "outputStreamIds": ["321", "654"],
-                        "modelUri": "fakeid.datasciencemodel.oc1.iad.xxx",
-                        "deploymentMode": "STREAM_ONLY",
-                    },
-                },
-            },
-        }
-
     def test_model_deployment_from_dict(self):
         new_model_deployment = ModelDeployment.from_dict(
             copy.deepcopy(OCI_MODEL_DEPLOYMENT_DICT)
@@ -1038,7 +893,6 @@ def test_update_model_deployment_details(self, mock_prepare_artifact):
             instance_configuration.model_deployment_instance_shape_config_details.memory_in_gbs
             == model_deployment.infrastructure.shape_config_details["memoryInGBs"]
         )
-        assert instance_configuration.subnet_id == model_deployment.infrastructure.subnet_id
 
         scaling_policy = model_configuration_details.scaling_policy
         assert isinstance(scaling_policy, FixedSizeScalingPolicy)
@@ -1090,7 +944,6 @@ def test_extract_from_oci_model(self):
                 "replica": 5,
                 "shapeName": "VM.Standard.E4.Flex",
                 "shapeConfigDetails": {"ocpus": 10, "memoryInGBs": 36},
-                "subnetId": "fakeid.subnet.oc1.iad.xxx",
                 "accessLog": {
                     "logGroupId": "fakeid.loggroup.oc1.iad.xxx",
                     "logId": "fakeid.log.oc1.iad.xxx",
@@ -1398,3 +1251,10 @@ def test_list_df(self, mock_list):
             project_id="test_project_id",
         )
         assert isinstance(df, pandas.DataFrame)
+
+    def test_model_deployment_with_subnet_id(self):
+        model_deployment = self.initialize_model_deployment()
+        assert model_deployment.infrastructure.subnet_id == None
+
+        model_deployment.infrastructure.with_subnet_id("test_id")
+        assert model_deployment.infrastructure.subnet_id == "test_id"