Merge pull request #10 from DataCrunch-io/feature/add-spot-support-for-availability-check

Feature/add spot support for availability check

Author: tamirse

.github/workflows/code_style.yml

@@ -8,10 +8,10 @@ on: [push, pull_request]
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.6, 3.7, 3.8, 3.9, '3.10', 3.11]
 
     steps:
       - uses: actions/checkout@v2

.github/workflows/unit_tests.yml

@@ -8,10 +8,10 @@ on: [push, pull_request]
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.6, 3.7, 3.8, 3.9, '3.10', 3.11]
 
     steps:
       - uses: actions/checkout@v2
@@ -30,7 +30,7 @@ jobs:
         run: |
           pytest --cov=datacrunch
 
-      - name: "Upload coverage to Codecov"
+      - name: 'Upload coverage to Codecov'
         uses: codecov/codecov-action@v1
         with:
           fail_ci_if_error: true

CHANGELOG.rst

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+* Added support for checking availability for a spot instance
+* Updated two github actions to run on fixed version of ubuntu because the latest one is missing python 3.6
+* Added more version of python to be used on two github actions 
+
 v1.0.10 (2022-10-18)
 -------------------
 

datacrunch/instances/instances.py

@@ -375,7 +375,7 @@ def create(self,
         :param is_spot: Is spot instance
         :type is_spot: bool, optional
         :param coupon: coupon code
-        :type is_spot: str, optional
+        :type coupon: str, optional
         :return: the new instance object
         :rtype: id
         """
@@ -418,13 +418,16 @@ def action(self, id_list: Union[List[str], str], action: str, volume_ids: Option
         self._http_client.put(INSTANCES_ENDPOINT, json=payload)
         return
 
-    def is_available(self, instance_type: str) -> bool:
+    def is_available(self, instance_type: str, is_spot: bool = None) -> bool:
         """Returns True if a specific instance type is now available for deployment
 
         :param instance_type: instance type
         :type instance_type: str
+        :param is_spot: Is spot instance
+        :type is_spot: bool, optional
         :return: True if available to deploy, False otherwise
         :rtype: bool
         """
-        url = f'/instance-availability/{instance_type}'
+        query_param = '?isSpot=true' if is_spot else ''
+        url = f'/instance-availability/{instance_type}{query_param}'
         return self._http_client.get(url).json()

tests/unit_tests/instances/test_instances.py

@@ -439,6 +439,23 @@ def test_is_available_successful(self, instances_service):
         assert is_available is True
         assert responses.assert_call_count(url, 1) is True
 
+    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'
+        responses.add(
+            responses.GET,
+            url,
+            json=True,
+            status=200
+        )
+
+        # act
+        is_available = instances_service.is_available(INSTANCE_TYPE, is_spot=True)
+
+        # assert
+        assert is_available is True
+        assert responses.assert_call_count(url, 1) is True
+
     def test_is_available_failed(self, instances_service):
         # arrange - add response mock
         url = instances_service._http_client._base_url + '/instance-availability/x'