fixed unit tests

Author: Aryanag2

tests/unitary/with_extras/aqua/test_deployment.py

@@ -2954,70 +2954,54 @@ def test_from_create_model_deployment_details(self):
         )
 
 
-@patch("ads.aqua.app.default_signer")
-class TestSingleModelParamResolution(unittest.TestCase):
-    """Tests strictly for the SMM parameter resolution logic in Single Model."""
-
+class TestSingleModelParamResolution(TestAquaDeployment):
     def setUp(self):
-        self.app = AquaDeploymentApp()
-        self.app.region = "us-ashburn-1"
+        super().setUp()
 
-        # Mock internal helpers to avoid real API calls
         self.app.get_container_config = MagicMock()
         self.app.get_container_image = MagicMock(return_value="docker/image:latest")
+
         mock_shape = MagicMock()
         mock_shape.name = "VM.GPU.A10.1"
         self.app.list_shapes = MagicMock(return_value=[mock_shape])
 
-        # Mock the SMM Defaults (What happens if user sends nothing)
         self.mock_config = MagicMock()
-        # Assume default SMM config is "--default-param 100"
         self.mock_config.configuration.get.return_value.parameters.get.return_value = (
             "--default-param 100"
         )
         self.app.get_deployment_config = MagicMock(return_value=self.mock_config)
 
-        # Mock Container Defaults (The mandatory left-side params)
         self.mock_container_item = MagicMock()
         self.mock_container_item.spec.cli_param = "--mandatory-param 1"
-        # Ensure restricted params are empty by default for this mock
         self.mock_container_item.spec.restricted_params = []
         self.app.get_container_config_item = MagicMock(
             return_value=self.mock_container_item
         )
 
-    @patch("ads.aqua.modeldeployment.deployment.ModelDeployment")
-    @patch("ads.aqua.modeldeployment.deployment.AquaModelApp")
-    def test_case_1_none_loads_defaults(self, mock_model_app, mock_deploy, mock_signer):
-        """Case 1: User input None -> Should load SMM defaults."""
+    @patch("ads.model.deployment.model_deployment.ModelDeployment")
+    @patch("ads.aqua.model.AquaModelApp")
+    def test_case_1_none_loads_defaults(self, mock_model_app, mock_deploy):
         details = CreateModelDeploymentDetails(
             model_id="ocid1.model...",
             instance_shape="VM.GPU.A10.1",
-            # PARAMS is missing (None)
             env_var={},
         )
 
-        # Mock the internal call to capture arguments
         with patch.object(self.app, "_create_deployment") as mock_create_internal:
             self.app.create(create_deployment_details=details)
 
             call_args = mock_create_internal.call_args[1]
             final_params = call_args["env_var"]["PARAMS"]
 
-            # Should have Mandatory + SMM Default
             self.assertIn("--mandatory-param 1", final_params)
             self.assertIn("--default-param 100", final_params)
 
-    @patch("ads.aqua.modeldeployment.deployment.ModelDeployment")
-    @patch("ads.aqua.modeldeployment.deployment.AquaModelApp")
-    def test_case_2_empty_clears_defaults(
-        self, mock_model_app, mock_deploy, mock_signer
-    ):
-        """Case 2: User input Empty String -> Should clear SMM defaults."""
+    @patch("ads.model.deployment.model_deployment.ModelDeployment")
+    @patch("ads.aqua.model.AquaModelApp")
+    def test_case_2_empty_clears_defaults(self, mock_model_app, mock_deploy):
         details = CreateModelDeploymentDetails(
             model_id="ocid1.model...",
             instance_shape="VM.GPU.A10.1",
-            # PARAMS is explicitly empty
             env_var={"PARAMS": ""},
         )
 
@@ -3027,21 +3011,15 @@ def test_case_2_empty_clears_defaults(
             call_args = mock_create_internal.call_args[1]
             final_params = call_args["env_var"]["PARAMS"]
 
-            # Should have Mandatory ONLY
             self.assertIn("--mandatory-param 1", final_params)
-            # SMM Default should be GONE
             self.assertNotIn("--default-param 100", final_params)
 
-    @patch("ads.aqua.modeldeployment.deployment.ModelDeployment")
-    @patch("ads.aqua.modeldeployment.deployment.AquaModelApp")
-    def test_case_3_value_overrides_defaults(
-        self, mock_model_app, mock_deploy, mock_signer
-    ):
-        """Case 3: User input Value -> Should use exact value (No Merge)."""
+    @patch("ads.model.deployment.model_deployment.ModelDeployment")
+    @patch("ads.aqua.model.AquaModelApp")
+    def test_case_3_value_overrides_defaults(self, mock_model_app, mock_deploy):
         details = CreateModelDeploymentDetails(
             model_id="ocid1.model...",
             instance_shape="VM.GPU.A10.1",
-            # PARAMS is a custom value
             env_var={"PARAMS": "--user-override 99"},
         )
 
@@ -3051,21 +3029,13 @@ def test_case_3_value_overrides_defaults(
             call_args = mock_create_internal.call_args[1]
             final_params = call_args["env_var"]["PARAMS"]
 
-            # Should have Mandatory + User Override
             self.assertIn("--mandatory-param 1", final_params)
             self.assertIn("--user-override 99", final_params)
-            # SMM Default should be GONE
             self.assertNotIn("--default-param 100", final_params)
 
-    @patch("ads.aqua.modeldeployment.deployment.ModelDeployment")
-    @patch("ads.aqua.modeldeployment.deployment.AquaModelApp")
-    def test_validation_blocks_restricted_params(
-        self, mock_model_app, mock_deploy, mock_signer
-    ):
-        """Test that restricted params cause error regardless of input source."""
-
-        # Setup: Override the container config for THIS test only
-        # We create a new mock to ensure we don't pollute other tests
+    @patch("ads.model.deployment.model_deployment.ModelDeployment")
+    @patch("ads.aqua.model.AquaModelApp")
+    def test_validation_blocks_restricted_params(self, mock_model_app, mock_deploy):
         restricted_mock_item = MagicMock()
         restricted_mock_item.spec.cli_param = "--mandatory 1"
         restricted_mock_item.spec.restricted_params = ["--seed"]
@@ -3074,7 +3044,6 @@ def test_validation_blocks_restricted_params(
             return_value=restricted_mock_item
         )
 
-        # User tries to override restricted param
         details = CreateModelDeploymentDetails(
             model_id="ocid1.model...",
             instance_shape="VM.GPU.A10.1",
@@ -3088,14 +3057,10 @@ def test_validation_blocks_restricted_params(
 
 
 class TestMultiModelParamResolution(unittest.TestCase):
-    """Tests strictly for the SMM parameter resolution logic in Multi-Model."""
-
     def setUp(self):
-        # Mock Config Summary structure
         self.mock_config_summary = MagicMock()
         self.mock_deploy_config = MagicMock()
 
-        # Set SMM Default
         self.mock_deploy_config.configuration.get.return_value.parameters.get.return_value = (
             "--smm-default 500"
         )
@@ -3106,14 +3071,10 @@ def setUp(self):
         self.mock_details = MagicMock()
         self.mock_details.instance_shape = "VM.GPU.A10.2"
 
-        # Set Container Mandatory Params
         self.container_params = "--mandatory 1"
 
     def test_case_1_none_loads_defaults(self):
-        """Case 1: params=None -> Load Defaults"""
-        model = AquaMultiModelRef(
-            model_id="ocid1...", gpu_count=1, params=None  # User sent nothing
-        )
+        model = AquaMultiModelRef(model_id="ocid1...", gpu_count=1, params=None)
 
         result = ModelGroupConfig._merge_gpu_count_params(
             model,
@@ -3127,10 +3088,7 @@ def test_case_1_none_loads_defaults(self):
         self.assertIn("--smm-default 500", result)
 
     def test_case_2_empty_clears_defaults(self):
-        """Case 2: params={} -> Clear Defaults"""
-        model = AquaMultiModelRef(
-            model_id="ocid1...", gpu_count=1, params={}  # User sent Empty Dict
-        )
+        model = AquaMultiModelRef(model_id="ocid1...", gpu_count=1, params={})
 
         result = ModelGroupConfig._merge_gpu_count_params(
             model,
@@ -3141,15 +3099,13 @@ def test_case_2_empty_clears_defaults(self):
         )
 
         self.assertIn("--mandatory 1", result)
-        # SMM Default should be missing
         self.assertNotIn("--smm-default 500", result)
 
     def test_case_3_value_overrides_defaults(self):
-        """Case 3: params={val} -> Override Defaults"""
         model = AquaMultiModelRef(
             model_id="ocid1...",
             gpu_count=1,
-            params={"--custom": "99"},  # User sent Value
+            params={"--custom": "99"},
         )
 
         result = ModelGroupConfig._merge_gpu_count_params(
@@ -3162,5 +3118,4 @@ def test_case_3_value_overrides_defaults(self):
 
         self.assertIn("--mandatory 1", result)
         self.assertIn("--custom 99", result)
-        # SMM Default should be missing
         self.assertNotIn("--smm-default 500", result)