WIP

Author: tamirse

datacrunch/constants.py

@@ -55,6 +55,14 @@ def __init__(self):
         return
 
 
+class Locations:
+    FIN_01 = "FIN-01"
+    ICE_01 = "ICE-01"
+
+    def __init__(self):
+        return
+
+
 class ErrorCodes:
     INVALID_REQUEST = "invalid_request"
     UNAUTHORIZED_REQUEST = "unauthorized_request"
@@ -85,6 +93,9 @@ def __init__(self, base_url, version):
         self.volume_types: VolumeTypes = VolumeTypes()
         """Available volume types"""
 
+        self.locations: Locations = Locations()
+        """Available locations"""
+
         self.error_codes: ErrorCodes = ErrorCodes()
         """Available error codes"""
 

datacrunch/instances/instances.py

@@ -24,7 +24,7 @@ def __init__(self,
                  storage: dict,
                  os_volume_id: str,
                  gpu_memory: dict,
-                 location: str = "FIN1",
+                 location: str = "FIN-01",
                  startup_script_id: str = None,
                  is_spot: bool = False
                  ) -> None:
@@ -62,7 +62,7 @@ def __init__(self,
         :type id: str
         :param memory: gpu memory details
         :type memory: dict
-        :param location: datacenter location, defaults to "FIN1"
+        :param location: datacenter location, defaults to "FIN-01"
         :type location: str, optional
         :param startup_script_id: startup script id, defaults to None
         :type startup_script_id: str, optional
@@ -268,6 +268,7 @@ def __str__(self) -> str:
         """
         return stringify_class_object_properties(self)
 
+
 class InstancesService:
     """A service for interacting with the instances endpoint"""
 
@@ -295,7 +296,8 @@ def get(self, status: str = None) -> List[Instance]:
             ip=instance_dict['ip'],
             status=instance_dict['status'],
             created_at=instance_dict['created_at'],
-            ssh_key_ids=instance_dict['ssh_key_ids'] if 'ssh_key_ids' in instance_dict else [],
+            ssh_key_ids=instance_dict['ssh_key_ids'] if 'ssh_key_ids' in instance_dict else [
+            ],
             startup_script_id=instance_dict['startup_script_id'] if 'startup_script_id' in instance_dict else None,
             cpu=instance_dict['cpu'],
             gpu=instance_dict['gpu'],
@@ -328,7 +330,8 @@ def get_by_id(self, id: str) -> Instance:
             ip=instance_dict['ip'],
             status=instance_dict['status'],
             created_at=instance_dict['created_at'],
-            ssh_key_ids=instance_dict['ssh_key_ids'] if 'ssh_key_ids' in instance_dict else [],
+            ssh_key_ids=instance_dict['ssh_key_ids'] if 'ssh_key_ids' in instance_dict else [
+            ],
             startup_script_id=instance_dict['startup_script_id'] if 'startup_script_id' in instance_dict else None,
             cpu=instance_dict['cpu'],
             gpu=instance_dict['gpu'],
@@ -346,7 +349,7 @@ def create(self,
                hostname: str,
                description: str,
                ssh_key_ids: list = [],
-               location: str = "FIN1",
+               location: str = "FIN-01",
                startup_script_id: str = None,
                volumes: List[Dict] = None,
                existing_volumes: List[str] = None,
@@ -365,7 +368,7 @@ def create(self,
         :type hostname: str
         :param description: instance description
         :type description: str
-        :param location: datacenter location, defaults to "FIN1"
+        :param location: datacenter location, defaults to "FIN-01"
         :type location: str, optional
         :param startup_script_id: startup script id, defaults to None
         :type startup_script_id: str, optional

datacrunch/volumes/volumes.py

@@ -17,7 +17,7 @@ def __init__(self,
                  is_os_volume: bool,
                  created_at: str,
                  target: str = None,
-                 location: str = "FIN1",
+                 location: str = "FIN-01",
                  instance_id: str = None,
                  ssh_key_ids: List[str] = [],
                  deleted_at: str = None,
@@ -40,7 +40,7 @@ def __init__(self,
         :type created_at: str
         :param target: target device e.g. vda
         :type target: str, optional
-        :param location: datacenter location, defaults to "FIN1"
+        :param location: datacenter location, defaults to "FIN-01"
         :type location: str, optional
         :param instance_id: the instance id the volume is attached to, None if detached
         :type instance_id: str