Changed name back to stackdio, removed accepted_version things

Author: Clark Perkins

setup.py

@@ -53,7 +53,7 @@ def test_python_version():
     # Call the setup method from setuptools that does all the heavy lifting
     # of packaging stackdio-client
     setup(
-        name='stackdio-client',
+        name='stackdio',
         version=__version__,
         url='http://stackd.io',
         author='Digital Reasoning Systems, Inc.',
@@ -67,7 +67,7 @@ def test_python_version():
         install_requires=requirements,
         dependency_links=[],
         classifiers=[
-            'Development Status :: 3 - Alpha',
+            'Development Status :: 4 - Beta',
             'Environment :: Web Environment',
             'Framework :: Django',
             'Intended Audience :: Developers',

stackdio/client/__init__.py

@@ -19,7 +19,7 @@
 import logging
 
 from .http import use_admin_auth, endpoint
-from .exceptions import BlueprintException, StackException
+from .exceptions import BlueprintException, StackException, IncompatibleVersionException
 
 from .blueprint import BlueprintMixin
 from .formula import FormulaMixin
@@ -57,6 +57,10 @@ def __init__(self, protocol="https", host="localhost", port=443,
 
         _, self.version = _parse_version_string(self.get_version())
 
+        if self.version[0] != 0 or self.version[1] != 7:
+            raise IncompatibleVersionException('Server version {0}.{1}.{2} not '
+                                               'supported.'.format(**self.version))
+
     @endpoint("")
     def get_root(self):
         """Get the api root"""

stackdio/client/account.py

@@ -17,9 +17,7 @@
 
 import json
 
-from .exceptions import StackException
-from .http import HttpMixin, endpoint, use_admin_auth
-from .version import accepted_versions, deprecated
+from .http import HttpMixin, endpoint
 
 
 class AccountMixin(HttpMixin):
@@ -29,26 +27,11 @@ def list_providers(self):
         """List all providers"""
         return self._get(endpoint, jsonify=True)['results']
 
-    @accepted_versions(">=0.6.1")
     @endpoint("cloud/providers/")
     def search_providers(self, provider_id):
         """List all providers"""
         return self._get(endpoint, jsonify=True)['results']
 
-    @deprecated
-    @accepted_versions("<0.7")
-    @endpoint("cloud/providers/")
-    def get_provider_id(self, type_name):
-        """Get the id for the provider specified by type_name"""
-
-        result = self._get(endpoint, jsonify=True)
-        for provider in result['results']:
-            if provider.get("type_name") == type_name:
-                return provider.get("id")
-
-        raise StackException("Provider type %s not found" % type_name)
-
-    @use_admin_auth
     @endpoint("cloud/accounts/")
     def create_account(self, **kwargs):
         """Create an account"""
@@ -81,7 +64,6 @@ def get_account(self, account_id, none_on_404=False):
         """Return the account that matches the given id"""
         return self._get(endpoint, jsonify=True, none_on_404=none_on_404)
 
-    @accepted_versions(">=0.6.1")
     @endpoint("accounts/")
     def search_accounts(self, account_id):
         """List all accounts"""
@@ -91,17 +73,3 @@ def search_accounts(self, account_id):
     def delete_account(self, account_id):
         """List all accounts"""
         return self._delete(endpoint, jsonify=True)['results']
-
-    @deprecated
-    @accepted_versions("<0.7")
-    def get_account_id(self, slug, title=False):
-        """Get the id for a account that matches slug. If title is True will
-        look at title instead."""
-
-        accounts = self.list_accounts()
-
-        for account in accounts:
-            if account.get("slug" if not title else "title") == slug:
-                return account.get("id")
-
-        raise StackException("Provider %s not found" % slug)

stackdio/client/blueprint.py

@@ -17,9 +17,7 @@
 
 import json
 
-from .exceptions import StackException
 from .http import HttpMixin, endpoint
-from .version import accepted_versions, deprecated
 
 
 class BlueprintMixin(HttpMixin):
@@ -76,15 +74,3 @@ def search_blueprints(self, **kwargs):
     @endpoint("blueprints/{blueprint_id}")
     def delete_blueprint(self, blueprint_id):
         return self._delete(endpoint, jsonify=True)
-
-    @deprecated
-    @accepted_versions("<0.7")
-    def get_blueprint_id(self, title):
-        """Get the id for a blueprint that matches title"""
-
-        blueprints = self.search_blueprints(title=title)
-
-        if not len(blueprints):
-            raise StackException("Blueprint %s not found" % title)
-
-        return blueprints[0]['id']

stackdio/client/exceptions.py

@@ -15,6 +15,7 @@
 # limitations under the License.
 #
 
+
 class StackException(Exception):
     pass
 

stackdio/client/formula.py

@@ -17,7 +17,6 @@
 
 import json
 
-from .exceptions import StackException
 from .http import HttpMixin, endpoint
 
 
@@ -55,23 +54,3 @@ def delete_formula(self, formula_id):
     def update_formula(self, formula_id):
         """Delete formula with matching id"""
         return self._post(endpoint, json.dumps({"action": "update"}), jsonify=True)
-
-    def get_formula_id(self, title):
-        """Find a stack id"""
-
-        formulas = self.list_formulas()
-        for formula in formulas:
-            if formula.get("title") == title:
-                return formula.get("id")
-
-        raise StackException("Formula %s not found" % title)
-
-    def get_component_id(self, formula, component_title):
-        """Get the id for a component from formula_id that matches title"""
-
-        for component in formula.get("components"):
-            if component.get("title") == component_title:
-                return component.get("id")
-
-        raise StackException("Component %s not found for formula %s" %
-                             (component_title, formula.get("title")))

stackdio/client/http.py

@@ -122,8 +122,6 @@ def __init__(self, auth=None, verify=True):
             from requests.packages.urllib3 import disable_warnings
             disable_warnings()
 
-
-
     def _request(self, verb, url, quiet=False,
                  none_on_404=False, jsonify=False, raise_for_status=True,
                  *args, **kwargs):

stackdio/client/image.py

@@ -17,15 +17,12 @@
 
 import json
 
-from .exceptions import StackException
-from .http import HttpMixin, endpoint, use_admin_auth
-from .version import accepted_versions, deprecated
+from .http import HttpMixin, endpoint
 
 
 class ImageMixin(HttpMixin):
 
-    @use_admin_auth
-    @endpoint("image/")
+    @endpoint("cloud/images/")
     def create_image(self, title, image_id, ssh_user, cloud_provider,
                        default_instance_size=None):
         """Create a image"""
@@ -38,41 +35,22 @@ def create_image(self, title, image_id, ssh_user, cloud_provider,
         }
         return self._post(endpoint, data=json.dumps(data), jsonify=True)
 
-
-    @endpoint("images/")
+    @endpoint("cloud/images/")
     def list_images(self):
         """List all images"""
         return self._get(endpoint, jsonify=True)['results']
 
-
-    @endpoint("images/{image_id}/")
+    @endpoint("cloud/images/{image_id}/")
     def get_image(self, image_id, none_on_404=False):
         """Return the image that matches the given id"""
         return self._get(endpoint, jsonify=True, none_on_404=none_on_404)
 
-
-    @accepted_versions(">=0.6.1")
-    @endpoint("images/")
+    @endpoint("cloud/images/")
     def search_images(self, image_id):
         """List all images"""
         return self._get(endpoint, jsonify=True)['results']
 
-
-    @endpoint("images/{image_id}/")
+    @endpoint("cloud/images/{image_id}/")
     def delete_image(self, image_id):
         """Delete the image with the given id"""
         return self._delete(endpoint, jsonify=True)['results']
-
-
-    @deprecated
-    @accepted_versions("<0.7")
-    def get_image_id(self, slug, title=False):
-        """Get the id for a image that matches slug. If title is True will look
-        at title instead."""
-
-        images = self.list_images()
-        for image in images:
-            if image.get("slug" if not title else "title") == slug:
-                return image.get("id")
-
-        raise StackException("Profile %s not found" % slug)

stackdio/client/region.py

@@ -15,83 +15,30 @@
 # limitations under the License.
 #
 
-from .exceptions import StackException
 from .http import HttpMixin, endpoint
-from .version import accepted_versions, deprecated
 
 
 class RegionMixin(HttpMixin):
-
-
-    @accepted_versions(">=0.6.1")
-    @endpoint("regions/")
-    def list_regions(self):
+    @endpoint("cloud/providers/{provider_name}/regions/")
+    def list_regions(self, provider_name):
         return self._get(endpoint, jsonify=True)['results']
 
-
-    @endpoint("regions/{region_id}")
-    def get_region(self, region_id, none_on_404=False):
+    @endpoint("cloud/providers/{provider_name}/regions/{region_id}")
+    def get_region(self, provider_name, region_id, none_on_404=False):
         return self._get(endpoint, jsonify=True, none_on_404=none_on_404)
 
-
-    @accepted_versions(">=0.6.1")
-    @endpoint("regions/")
-    def search_regions(self, **kwargs):
+    @endpoint("cloud/providers/{provider_name}/regions/")
+    def search_regions(self, provider_name, **kwargs):
         return self._get(endpoint, params=kwargs, jsonify=True)['results']
 
-
-    @deprecated
-    @accepted_versions(">=0.6", "<0.7")
-    @endpoint("regions/")
-    def get_region_id(self, title, type_name="ec2"):
-        """Get a zone id for title"""
-
-        provider_type = self.get_provider_type(type_name)
-        params = {
-            "title": title,
-            "provider_type": provider_type["id"]
-        }
-        result = self._get(endpoint, params=params, jsonify=True)
-        if len(result['results']) == 1:
-            return result['results'][0]['id']
-
-        raise StackException("Zone %s not found for %s" % (title, type_name))
-
-
-    @accepted_versions("!=0.6")
-    @endpoint("zones/")
+    @endpoint("cloud/providers/{provider_name}/zones/")
     def list_zones(self):
         return self._get(endpoint, jsonify=True)['results']
 
-    @endpoint("zones/{zone_id}")
-    def get_zone(self, zone_id, none_on_404=False):
+    @endpoint("cloud/providers/{provider_name}/zones/{zone_id}")
+    def get_zone(self, provider_name, zone_id, none_on_404=False):
         return self._get(endpoint, jsonify=True, none_on_404=none_on_404)
 
-    @accepted_versions(">=0.6.1")
-    @endpoint("zones/")
-    def search_zones(self, **kwargs):
+    @endpoint("cloud/providers/{provider_name}/zones/")
+    def search_zones(self, provider_name, **kwargs):
         return self._get(endpoint, params=kwargs, jsonify=True)['results']
-
-
-    @deprecated
-    @accepted_versions("!=0.6", "<0.7")
-    @endpoint("zones/")
-    def get_zone_id(self, title, type_name="ec2"):
-        """Get a zone id for title"""
-
-        result = self._get(endpoint, jsonify=True)
-
-        type_id = self.get_provider_type_id(type_name)
-        for zone in result['results']:
-            if zone.get("title") == title:
-                if 'region' in zone:
-                    # For version 0.6.1
-                    region = self._get(zone['region'], jsonify=True)
-                    if region.get("provider_type") == type_id:
-                        return zone.get("id")
-                elif 'provider_type' in zone:
-                    # For versions 0.5.*
-                    if zone['provider_type'] == type_id:
-                        return zone.get("id")
-
-        raise StackException("Zone %s not found for %s" % (title, type_name))

stackdio/client/settings.py

@@ -23,7 +23,7 @@
 
 class SettingsMixin(HttpMixin):
 
-    @endpoint("settings/")
+    @endpoint("user/")
     def set_public_key(self, public_key):
         """Upload a public key for our user. public_key can be the actual key, a
         file handle, or a path to a key file"""
@@ -35,6 +35,8 @@ def set_public_key(self, public_key):
             public_key = open(public_key, "r").read()
 
         data = {
-            "public_key": public_key
+            "settings": {
+                "public_key": public_key,
+            }
         }
-        return self._put(endpoint, data=json.dumps(data), jsonify=True)
+        return self._patch(endpoint, data=json.dumps(data), jsonify=True)