refactor some more

Author: tamirse

datacrunch/instances/instances.py

@@ -350,7 +350,7 @@ def create(self,
                hostname: str,
                description: str,
                ssh_key_ids: list = [],
-               location: str = "FIN-01",
+               location: str = Locations.FIN_01,
                startup_script_id: str = None,
                volumes: List[Dict] = None,
                existing_volumes: List[str] = None,

datacrunch/volumes/volumes.py

@@ -238,7 +238,7 @@ def create(self,
                name: str,
                size: int,
                instance_id: str = None,
-               location: str = "FIN1",
+               location: str = Locations.FIN_01,
                ) -> Volume:
         """Create new volume
 
@@ -250,7 +250,7 @@ def create(self,
         :type size: int
         :param instance_id: Instance id to be attached to, defaults to None
         :type instance_id: str, optional
-        :param location: datacenter location, defaults to "FIN1"
+        :param location: datacenter location, defaults to "FIN-01"
         :type location: str, optional
         :return: the new volume object
         :rtype: Volume

tests/unit_tests/instances/test_instances.py

@@ -3,7 +3,7 @@
 
 from datacrunch.exceptions import APIException
 from datacrunch.instances.instances import InstancesService, Instance
-from datacrunch.constants import Actions, ErrorCodes
+from datacrunch.constants import Actions, ErrorCodes, Locations
 
 INVALID_REQUEST = ErrorCodes.INVALID_REQUEST
 INVALID_REQUEST_MESSAGE = 'Your existence is invalid'
@@ -18,7 +18,7 @@
 INSTANCE_DESCRIPTION = "hope you enjoy your GPU"
 INSTANCE_STATUS = 'running'
 INSTANCE_PRICE_PER_HOUR = 0.60
-INSTANCE_LOCATION = 'FIN1'
+INSTANCE_LOCATION = Locations.FIN_01
 INSTANCE_IP = '1.2.3.4'
 INSTANCE_CREATED_AT = "whatchalookingatboy?"
 INSTANCE_OS_VOLUME = {"name": "os volume", "size": 50}

tests/unit_tests/volumes/test_volumes.py

@@ -3,14 +3,13 @@
 
 from datacrunch.exceptions import APIException
 from datacrunch.volumes.volumes import VolumesService, Volume
-from datacrunch.constants import VolumeStatus, VolumeTypes, VolumeActions, ErrorCodes
+from datacrunch.constants import VolumeStatus, VolumeTypes, VolumeActions, ErrorCodes, Locations
 
 INVALID_REQUEST = ErrorCodes.INVALID_REQUEST
 INVALID_REQUEST_MESSAGE = 'Your existence is invalid'
 
 INSTANCE_ID = "4fee633c-b119-4447-af9c-70ba17675fc5"
 
-FIN1 = "FIN1"
 NVME = "NVMe"
 HDD = "HDD"
 TARGET_VDA = "vda"
@@ -39,7 +38,7 @@
     "name": NVME_VOL_NAME,
     "size": NVME_VOL_SIZE,
     "type": NVME,
-    "location_code": FIN1,
+    "location_code": Locations.FIN_01,
     "is_os_volume": True,
     "created_at": NVME_VOL_CREATED_AT,
     "target": TARGET_VDA,
@@ -53,7 +52,7 @@
     "name": HDD_VOL_NAME,
     "size": HDD_VOL_SIZE,
     "type": HDD,
-    "location_code": FIN1,
+    "location_code": Locations.FIN_01,
     "is_os_volume": False,
     "created_at": HDD_VOL_CREATED_AT,
     "target": None,
@@ -82,7 +81,7 @@ def test_initialize_a_volume(self):
         assert volume.name == HDD_VOL_NAME
         assert volume.size == HDD_VOL_SIZE
         assert volume.type == HDD
-        assert volume.location == FIN1
+        assert volume.location == Locations.FIN_01
         assert volume.is_os_volume == False
         assert volume.created_at == HDD_VOL_CREATED_AT
         assert volume.target == None
@@ -113,7 +112,7 @@ def test_get_volumes(self, volumes_service, endpoint):
         assert volume_nvme.name == NVME_VOL_NAME
         assert volume_nvme.size == NVME_VOL_SIZE
         assert volume_nvme.type == NVME
-        assert volume_nvme.location == FIN1
+        assert volume_nvme.location == Locations.FIN_01
         assert volume_nvme.is_os_volume
         assert volume_nvme.created_at == NVME_VOL_CREATED_AT
         assert volume_nvme.target == TARGET_VDA
@@ -125,7 +124,7 @@ def test_get_volumes(self, volumes_service, endpoint):
         assert volume_hdd.name == HDD_VOL_NAME
         assert volume_hdd.size == HDD_VOL_SIZE
         assert volume_hdd.type == HDD
-        assert volume_hdd.location == FIN1
+        assert volume_hdd.location == Locations.FIN_01
         assert volume_hdd.is_os_volume is False
         assert volume_hdd.created_at == HDD_VOL_CREATED_AT
         assert volume_hdd.target is None
@@ -154,7 +153,7 @@ def test_get_volumes_by_status_successful(self, volumes_service, endpoint):
         assert volume_nvme.name == NVME_VOL_NAME
         assert volume_nvme.size == NVME_VOL_SIZE
         assert volume_nvme.type == NVME
-        assert volume_nvme.location == FIN1
+        assert volume_nvme.location == Locations.FIN_01
         assert volume_nvme.is_os_volume
         assert volume_nvme.created_at == NVME_VOL_CREATED_AT
         assert volume_nvme.target == TARGET_VDA
@@ -198,7 +197,7 @@ def test_get_volume_by_id_successful(self, volumes_service, endpoint):
         assert volume_nvme.name == NVME_VOL_NAME
         assert volume_nvme.size == NVME_VOL_SIZE
         assert volume_nvme.type == NVME
-        assert volume_nvme.location == FIN1
+        assert volume_nvme.location == Locations.FIN_01
         assert volume_nvme.is_os_volume
         assert volume_nvme.created_at == NVME_VOL_CREATED_AT
         assert volume_nvme.target == TARGET_VDA