Fixed unit test.

Author: lu-ohai

tests/unitary/default_setup/model_deployment/test_oci_datascience_model_deployment.py

@@ -5,14 +5,12 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 import oci
-import pytest
 from unittest.mock import MagicMock, patch
 from oci.data_science.models import (
     ModelDeployment,
 )
 from ads.common.oci_datascience import OCIDataScienceMixin
 from ads.common.oci_mixin import OCIModelMixin
-from ads.model.deployment.common.utils import State
 
 from ads.model.service.oci_datascience_model_deployment import (
     ACTIVATE_WORKFLOW_STEPS,
@@ -75,7 +73,6 @@
         },
     },
     "model_deployment_url": "model_deployment_url",
-    "deployment_mode": "deployment_mode",
 }
 
 
@@ -119,7 +116,7 @@ def test_activate_with_waiting(self):
                 response.data = data
                 mock_get.return_value = response
                 with patch.object(
-                    OCIDataScienceModelDeployment, "_wait_for_progress_completion"
+                    OCIDataScienceModelDeployment, "_wait_for_work_request"
                 ) as mock_wait:
                     with patch.object(
                         OCIDataScienceModelDeployment, "sync"
@@ -131,12 +128,8 @@ def test_activate_with_waiting(self):
 
                         mock_activate.assert_called_with(self.mock_model_deployment.id)
                         mock_wait.assert_called_with(
-                            State.ACTIVE.name,
-                            ACTIVATE_WORKFLOW_STEPS,
-                            [State.FAILED.name, State.INACTIVE.name],
                             "test",
-                            State._from_str("INACTIVE"),
-                            self.mock_model_deployment.id,
+                            ACTIVATE_WORKFLOW_STEPS,
                             1,
                             1,
                         )
@@ -176,7 +169,7 @@ def test_deactivate_with_waiting(self):
                 response.data = data
                 mock_get.return_value = response
                 with patch.object(
-                    OCIDataScienceModelDeployment, "_wait_for_progress_completion"
+                    OCIDataScienceModelDeployment, "_wait_for_work_request"
                 ) as mock_wait:
                     with patch.object(
                         OCIDataScienceModelDeployment, "sync"
@@ -190,18 +183,13 @@ def test_deactivate_with_waiting(self):
                             self.mock_model_deployment.id
                         )
                         mock_wait.assert_called_with(
-                            State.INACTIVE.name,
-                            DEACTIVATE_WORKFLOW_STEPS,
-                            [State.FAILED.name],
                             "test",
-                            State._from_str("ACTIVE"),
-                            self.mock_model_deployment.id,
+                            DEACTIVATE_WORKFLOW_STEPS,
                             1,
                             1,
                         )
                         mock_sync.assert_called()
 
-    @pytest.mark.skip(reason="OCI SDK's support for BYOC hasn't GA yet.")
     def test_create(self):
         with patch.object(
             oci.data_science.DataScienceClient,
@@ -234,7 +222,6 @@ def test_create(self):
                         mock_update_from_oci_model.assert_called()
                         mock_sync.assert_called()
 
-    @pytest.mark.skip(reason="OCI SDK's support for BYOC hasn't GA yet.")
     def test_create_with_waiting(self):
         with patch.object(
             oci.data_science.DataScienceClient,
@@ -256,7 +243,7 @@ def test_create_with_waiting(self):
                     )
                     mock_to_oci_mode.return_value = oci_model_deployment
                     with patch.object(
-                        OCIDataScienceModelDeployment, "_wait_for_progress_completion"
+                        OCIDataScienceModelDeployment, "_wait_for_work_request"
                     ) as mock_wait:
                         with patch("json.loads") as mock_json_load:
                             create_model_deployment_details = MagicMock()
@@ -278,12 +265,8 @@ def test_create_with_waiting(self):
                                 )
                                 mock_update_from_oci_model.assert_called()
                                 mock_wait.assert_called_with(
-                                    State.ACTIVE.name,
-                                    CREATE_WORKFLOW_STEPS,
-                                    [State.FAILED.name, State.INACTIVE.name],
                                     "test",
-                                    State._from_str("UNKNOWN"),
-                                    self.mock_model_deployment.id,
+                                    CREATE_WORKFLOW_STEPS,                                    
                                     1,
                                     1,
                                 )
@@ -371,7 +354,7 @@ def test_delete_with_waiting(self):
             }
             mock_delete.return_value = response
             with patch.object(
-                OCIDataScienceModelDeployment, "_wait_for_progress_completion"
+                OCIDataScienceModelDeployment, "_wait_for_work_request"
             ) as mock_wait:
                 with patch.object(
                     oci.data_science.DataScienceClient, "get_model_deployment"
@@ -390,12 +373,8 @@ def test_delete_with_waiting(self):
 
                         mock_delete.assert_called_with(self.mock_model_deployment.id)
                         mock_wait.assert_called_with(
-                            State.DELETED.name,
-                            DELETE_WORKFLOW_STEPS,
-                            [State.FAILED.name, State.INACTIVE.name],
                             "test",
-                            State._from_str("ACTIVE"),
-                            self.mock_model_deployment.id,
+                            DELETE_WORKFLOW_STEPS,
                             1,
                             1,
                         )