use the constant value as default location, refactor to location_code

Author: tamirse

datacrunch/instances/instances.py

@@ -1,5 +1,6 @@
 from typing import List, Union, Optional, Dict
 from datacrunch.helpers import stringify_class_object_properties
+from datacrunch.constants import Locations
 
 INSTANCES_ENDPOINT = '/instances'
 
@@ -24,7 +25,7 @@ def __init__(self,
                  storage: dict,
                  os_volume_id: str,
                  gpu_memory: dict,
-                 location: str = "FIN-01",
+                 location: str = Locations.FIN_01,
                  startup_script_id: str = None,
                  is_spot: bool = False
                  ) -> None:
@@ -392,7 +393,7 @@ def create(self,
             "startup_script_id": startup_script_id,
             "hostname": hostname,
             "description": description,
-            "location": location,
+            "location_code": location,
             "os_volume": os_volume,
             "volumes": volumes,
             "existing_volumes": existing_volumes,

datacrunch/volumes/volumes.py

@@ -1,5 +1,5 @@
 from typing import List, Union, Optional
-from datacrunch.constants import VolumeActions
+from datacrunch.constants import VolumeActions, Locations
 from datacrunch.helpers import stringify_class_object_properties
 
 VOLUMES_ENDPOINT = '/volumes'
@@ -17,7 +17,7 @@ def __init__(self,
                  is_os_volume: bool,
                  created_at: str,
                  target: str = None,
-                 location: str = "FIN-01",
+                 location: str = Locations.FIN_01,
                  instance_id: str = None,
                  ssh_key_ids: List[str] = [],
                  deleted_at: str = None,
@@ -260,7 +260,7 @@ def create(self,
             "name": name,
             "size": size,
             "instance_id": instance_id,
-            "location": location
+            "location_code": location
         }
         id = self._http_client.post(VOLUMES_ENDPOINT, json=payload).text
         volume = self.get_by_id(id)

tests/unit_tests/instances/test_instances.py

@@ -50,7 +50,7 @@
         },
         "hostname": INSTANCE_HOSTNAME,
         "description": INSTANCE_DESCRIPTION,
-        "location": INSTANCE_LOCATION,
+        "location_code": INSTANCE_LOCATION,
         "price_per_hour": INSTANCE_PRICE_PER_HOUR,
         "instance_type": INSTANCE_TYPE,
         "image": INSTANCE_IMAGE,
@@ -63,6 +63,7 @@
 PAYLOAD_SPOT = PAYLOAD
 PAYLOAD_SPOT[0]["is_spot"] = True
 
+
 class TestInstancesService:
     @pytest.fixture
     def instances_service(self, http_client):
@@ -397,7 +398,8 @@ def test_action_successful(self, instances_service, endpoint):
         )
 
         # act
-        result = instances_service.action(id_list=[INSTANCE_ID], action=Actions.SHUTDOWN)
+        result = instances_service.action(
+            id_list=[INSTANCE_ID], action=Actions.SHUTDOWN)
 
         # assert
         assert result is None
@@ -415,7 +417,8 @@ def test_action_failed(self, instances_service, endpoint):
 
         # act
         with pytest.raises(APIException) as excinfo:
-            instances_service.action(id_list=[INSTANCE_ID], action="fluxturcate")
+            instances_service.action(
+                id_list=[INSTANCE_ID], action="fluxturcate")
 
         # assert
         assert excinfo.value.code == INVALID_REQUEST
@@ -424,7 +427,8 @@ def test_action_failed(self, instances_service, endpoint):
 
     def test_is_available_successful(self, instances_service):
         # arrange - add response mock
-        url = instances_service._http_client._base_url + '/instance-availability/' + INSTANCE_TYPE
+        url = instances_service._http_client._base_url + \
+            '/instance-availability/' + INSTANCE_TYPE
         responses.add(
             responses.GET,
             url,
@@ -441,7 +445,8 @@ def test_is_available_successful(self, instances_service):
 
     def test_is_spot_available_successful(self, instances_service):
         # arrange - add response mock
-        url = instances_service._http_client._base_url + '/instance-availability/' + INSTANCE_TYPE + '?isSpot=true'
+        url = instances_service._http_client._base_url + \
+            '/instance-availability/' + INSTANCE_TYPE + '?isSpot=true'
         responses.add(
             responses.GET,
             url,
@@ -450,7 +455,8 @@ def test_is_spot_available_successful(self, instances_service):
         )
 
         # act
-        is_available = instances_service.is_available(INSTANCE_TYPE, is_spot=True)
+        is_available = instances_service.is_available(
+            INSTANCE_TYPE, is_spot=True)
 
         # assert
         assert is_available is True
@@ -473,4 +479,4 @@ def test_is_available_failed(self, instances_service):
         # assert
         assert excinfo.value.code == INVALID_REQUEST
         assert excinfo.value.message == INVALID_REQUEST_MESSAGE
-        assert responses.assert_call_count(url, 1) is True
+        assert responses.assert_call_count(url, 1) is True

tests/unit_tests/volumes/test_volumes.py

@@ -39,7 +39,7 @@
     "name": NVME_VOL_NAME,
     "size": NVME_VOL_SIZE,
     "type": NVME,
-    "location": FIN1,
+    "location_code": FIN1,
     "is_os_volume": True,
     "created_at": NVME_VOL_CREATED_AT,
     "target": TARGET_VDA,
@@ -53,7 +53,7 @@
     "name": HDD_VOL_NAME,
     "size": HDD_VOL_SIZE,
     "type": HDD,
-    "location": FIN1,
+    "location_code": FIN1,
     "is_os_volume": False,
     "created_at": HDD_VOL_CREATED_AT,
     "target": None,