Fix mocking in test_resources

python/tests/test_resources.py

@@ -384,7 +384,7 @@ def test_get_default_resource_limits_no_hard_limit_and_lower_than_default(
             resources.ComponentResources._get_default_resource_limits
         )
         mock_get_serving_res_limits = mocker.patch(
-            "hsml.client.get_serving_resource_limits",
+            "hopsworks_common.client.get_serving_resource_limits",
             return_value=no_limit_res,  # no upper limit
         )
 
@@ -408,7 +408,7 @@ def test_get_default_resource_limits_no_hard_limit_and_higher_than_default(
             resources.ComponentResources._get_default_resource_limits
         )
         mock_get_serving_res_limits = mocker.patch(
-            "hsml.client.get_serving_resource_limits",
+            "hopsworks_common.client.get_serving_resource_limits",
             return_value=no_limit_res,  # no upper limit
         )
 
@@ -432,7 +432,7 @@ def test_get_default_resource_limits_with_higher_hard_limit_and_lower_than_defau
             resources.ComponentResources._get_default_resource_limits
         )
         mock_get_serving_res_limits = mocker.patch(
-            "hsml.client.get_serving_resource_limits",
+            "hopsworks_common.client.get_serving_resource_limits",
             return_value=hard_limit_res,  # upper limit
         )
 
@@ -456,7 +456,7 @@ def test_get_default_resource_limits_with_higher_hard_limit_and_higher_than_defa
             resources.ComponentResources._get_default_resource_limits
         )
         mock_get_serving_res_limits = mocker.patch(
-            "hsml.client.get_serving_resource_limits",
+            "hopsworks_common.client.get_serving_resource_limits",
             return_value=hard_limit_res,  # upper limit
         )
 
@@ -481,7 +481,7 @@ def test_get_default_resource_limits_with_lower_hard_limit_and_lower_than_defaul
             resources.ComponentResources._get_default_resource_limits
         )
         mock_get_serving_res_limits = mocker.patch(
-            "hsml.client.get_serving_resource_limits",
+            "hopsworks_common.client.get_serving_resource_limits",
             return_value=hard_limit_res,  # upper limit
         )
 
@@ -506,7 +506,7 @@ def test_get_default_resource_limits_with_lower_hard_limit_and_higher_than_defau
             resources.ComponentResources._get_default_resource_limits
         )
         mock_get_serving_res_limits = mocker.patch(
-            "hsml.client.get_serving_resource_limits",
+            "hopsworks_common.client.get_serving_resource_limits",
             return_value=hard_limit_res,  # upper limit
         )
 
@@ -527,7 +527,7 @@ def test_validate_resources_no_hard_limits_valid_resources(self, mocker):
         requests = resources.Resources(cores=1, memory=1024, gpus=0)
         limits = resources.Resources(cores=2, memory=2048, gpus=1)
         mock_get_serving_res_limits = mocker.patch(
-            "hsml.client.get_serving_resource_limits",
+            "hopsworks_common.client.get_serving_resource_limits",
             return_value=no_limit_res,  # upper limit
         )
 
@@ -543,7 +543,7 @@ def test_validate_resources_no_hard_limit_invalid_cores_request(self, mocker):
         requests = resources.Resources(cores=0, memory=1024, gpus=0)
         limits = resources.Resources(cores=2, memory=2048, gpus=1)
         mock_get_serving_res_limits = mocker.patch(
-            "hsml.client.get_serving_resource_limits",
+            "hopsworks_common.client.get_serving_resource_limits",
             return_value=no_limit_res,  # upper limit
         )
 
@@ -563,7 +563,7 @@ def test_validate_resources_no_hard_limit_invalid_memory_request(self, mocker):
         requests = resources.Resources(cores=1, memory=0, gpus=0)
         limits = resources.Resources(cores=2, memory=2048, gpus=1)
         mock_get_serving_res_limits = mocker.patch(
-            "hsml.client.get_serving_resource_limits",
+            "hopsworks_common.client.get_serving_resource_limits",
             return_value=no_limit_res,  # upper limit
         )
 
@@ -585,7 +585,7 @@ def test_validate_resources_no_hard_limit_invalid_gpus_request(self, mocker):
         )  # 0 gpus is accepted
         limits = resources.Resources(cores=2, memory=2048, gpus=1)
         mock_get_serving_res_limits = mocker.patch(
-            "hsml.client.get_serving_resource_limits",
+            "hopsworks_common.client.get_serving_resource_limits",
             return_value=no_limit_res,  # upper limit
         )
 
@@ -606,7 +606,7 @@ def test_validate_resources_no_hard_limit_cores_request_out_of_range(self, mocke
         requests = resources.Resources(cores=2, memory=1024, gpus=0)
         limits = resources.Resources(cores=1, memory=2048, gpus=1)
         mock_get_serving_res_limits = mocker.patch(
-            "hsml.client.get_serving_resource_limits",
+            "hopsworks_common.client.get_serving_resource_limits",
             return_value=no_limit_res,  # upper limit
         )
 
@@ -629,7 +629,7 @@ def test_validate_resources_no_hard_limit_invalid_memory_request_out_of_range(
         requests = resources.Resources(cores=1, memory=2048, gpus=0)
         limits = resources.Resources(cores=2, memory=1024, gpus=1)
         mock_get_serving_res_limits = mocker.patch(
-            "hsml.client.get_serving_resource_limits",
+            "hopsworks_common.client.get_serving_resource_limits",
             return_value=no_limit_res,  # upper limit
         )
 
@@ -652,7 +652,7 @@ def test_validate_resources_no_hard_limit_invalid_gpus_request_out_of_range(
         requests = resources.Resources(cores=1, memory=1024, gpus=2)
         limits = resources.Resources(cores=2, memory=2048, gpus=1)
         mock_get_serving_res_limits = mocker.patch(
-            "hsml.client.get_serving_resource_limits",
+            "hopsworks_common.client.get_serving_resource_limits",
             return_value=no_limit_res,  # upper limit
         )
 
@@ -673,7 +673,7 @@ def test_validate_resources_with_hard_limit_valid_resources(self, mocker):
         requests = resources.Resources(cores=1, memory=1024, gpus=0)
         limits = resources.Resources(cores=2, memory=2048, gpus=1)
         mock_get_serving_res_limits = mocker.patch(
-            "hsml.client.get_serving_resource_limits",
+            "hopsworks_common.client.get_serving_resource_limits",
             return_value=hard_limit_res,  # upper limit
         )
 
@@ -689,7 +689,7 @@ def test_validate_resources_with_hard_limit_invalid_cores_limit(self, mocker):
         requests = resources.Resources(cores=2, memory=1024, gpus=0)
         limits = resources.Resources(cores=0, memory=2048, gpus=1)
         mock_get_serving_res_limits = mocker.patch(
-            "hsml.client.get_serving_resource_limits",
+            "hopsworks_common.client.get_serving_resource_limits",
             return_value=hard_limit_res,  # upper limit
         )
 
@@ -709,7 +709,7 @@ def test_validate_resources_with_hard_limit_invalid_memory_limit(self, mocker):
         requests = resources.Resources(cores=2, memory=1024, gpus=0)
         limits = resources.Resources(cores=1, memory=0, gpus=1)
         mock_get_serving_res_limits = mocker.patch(
-            "hsml.client.get_serving_resource_limits",
+            "hopsworks_common.client.get_serving_resource_limits",
             return_value=hard_limit_res,  # upper limit
         )
 
@@ -727,7 +727,7 @@ def test_validate_resources_with_hard_limit_invalid_gpus_limit(self, mocker):
         requests = resources.Resources(cores=2, memory=1024, gpus=0)
         limits = resources.Resources(cores=1, memory=2048, gpus=-1)
         mock_get_serving_res_limits = mocker.patch(
-            "hsml.client.get_serving_resource_limits",
+            "hopsworks_common.client.get_serving_resource_limits",
             return_value=hard_limit_res,  # upper limit
         )
 
@@ -747,7 +747,7 @@ def test_validate_resources_with_hard_limit_invalid_cores_request(self, mocker):
         requests = resources.Resources(cores=2, memory=1024, gpus=0)
         limits = resources.Resources(cores=4, memory=2048, gpus=1)
         mock_get_serving_res_limits = mocker.patch(
-            "hsml.client.get_serving_resource_limits",
+            "hopsworks_common.client.get_serving_resource_limits",
             return_value=hard_limit_res,  # upper limit
         )
 
@@ -768,7 +768,7 @@ def test_validate_resources_with_hard_limit_invalid_memory_request(self, mocker)
         requests = resources.Resources(cores=2, memory=1024, gpus=0)
         limits = resources.Resources(cores=3, memory=4076, gpus=1)
         mock_get_serving_res_limits = mocker.patch(
-            "hsml.client.get_serving_resource_limits",
+            "hopsworks_common.client.get_serving_resource_limits",
             return_value=hard_limit_res,  # upper limit
         )
 
@@ -789,7 +789,7 @@ def test_validate_resources_with_hard_limit_invalid_gpus_request(self, mocker):
         requests = resources.Resources(cores=2, memory=1024, gpus=0)
         limits = resources.Resources(cores=3, memory=2048, gpus=4)
         mock_get_serving_res_limits = mocker.patch(
-            "hsml.client.get_serving_resource_limits",
+            "hopsworks_common.client.get_serving_resource_limits",
             return_value=hard_limit_res,  # upper limit
         )
 
@@ -808,7 +808,7 @@ def test_validate_resources_with_hard_limit_invalid_gpus_request(self, mocker):
 
     def test_from_response_json_predictor_resources(self, mocker, backend_fixtures):
         mocker.patch(
-            "hsml.client.get_serving_resource_limits",
+            "hopsworks_common.client.get_serving_resource_limits",
             return_value=SERVING_RESOURCE_LIMITS,
         )
         json = backend_fixtures["resources"][
@@ -831,7 +831,7 @@ def test_from_response_json_predictor_resources_specific_keys(
         self, mocker, backend_fixtures
     ):
         mocker.patch(
-            "hsml.client.get_serving_resource_limits",
+            "hopsworks_common.client.get_serving_resource_limits",
             return_value=SERVING_RESOURCE_LIMITS,
         )
         json = backend_fixtures["resources"][
@@ -854,7 +854,7 @@ def test_from_response_json_predictor_resources_specific_keys(
 
     def test_from_response_json_transformer_resources(self, mocker, backend_fixtures):
         mocker.patch(
-            "hsml.client.get_serving_resource_limits",
+            "hopsworks_common.client.get_serving_resource_limits",
             return_value=SERVING_RESOURCE_LIMITS,
         )
         json = backend_fixtures["resources"][
@@ -877,7 +877,7 @@ def test_from_response_json_transformer_resources_specific_keys(
         self, mocker, backend_fixtures
     ):
         mocker.patch(
-            "hsml.client.get_serving_resource_limits",
+            "hopsworks_common.client.get_serving_resource_limits",
             return_value=SERVING_RESOURCE_LIMITS,
         )
         json = backend_fixtures["resources"][
@@ -900,7 +900,7 @@ def test_from_response_json_transformer_resources_default_limits(
         self, mocker, backend_fixtures
     ):
         mocker.patch(
-            "hsml.client.get_serving_resource_limits",
+            "hopsworks_common.client.get_serving_resource_limits",
             return_value=SERVING_RESOURCE_LIMITS,
         )
         mocker.patch(