Updated methods for 0.7

Author: Clark Perkins

setup.py

@@ -99,6 +99,11 @@ def test_python_version():
             'Programming Language :: Python :: 2',
             'Programming Language :: Python :: 2.6',
             'Programming Language :: Python :: 2.7',
+            'Programming Language :: Python :: 3',
+            'Programming Language :: Python :: 3.2',
+            'Programming Language :: Python :: 3.3',
+            'Programming Language :: Python :: 3.4',
+            'Programming Language :: Python :: 3.5',
             'Topic :: System :: Clustering',
             'Topic :: System :: Distributed Computing',
         ]

stackdio/client/__init__.py

@@ -15,10 +15,9 @@
 # limitations under the License.
 #
 
-import json
 import logging
 
-from .http import use_admin_auth, endpoint
+from .http import get, post, patch
 from .exceptions import BlueprintException, StackException, IncompatibleVersionException
 
 from .blueprint import BlueprintMixin
@@ -61,59 +60,25 @@ def __init__(self, protocol="https", host="localhost", port=443,
             raise IncompatibleVersionException('Server version {0}.{1}.{2} not '
                                                'supported.'.format(**self.version))
 
-    @endpoint("")
+    @get('')
     def get_root(self):
-        """Get the api root"""
-        return self._get(endpoint, jsonify=True)
+        pass
 
-    @endpoint("version/")
+    @get('version/')
     def get_version(self):
-        return self._get(endpoint, jsonify=True)['version']
+        pass
 
-    @use_admin_auth
-    @endpoint("security_groups/")
+    @get_version.response
+    def get_version(self, resp):
+        return resp['version']
+
+    @post('cloud/security_groups/')
     def create_security_group(self, name, description, cloud_provider, is_default=True):
         """Create a security group"""
 
-        data = {
+        return {
             "name": name,
             "description": description,
             "cloud_provider": cloud_provider,
             "is_default": is_default
         }
-        return self._post(endpoint, data=json.dumps(data), jsonify=True)
-
-    @endpoint("user/")
-    def get_public_key(self):
-        """Get the public key for the logged in user"""
-        return self._get(endpoint, jsonify=True)['settings']['public_key']
-
-    @endpoint("settings/")
-    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"""
-
-        if isinstance(public_key, file):
-            public_key = public_key.read()
-        elif isinstance(public_key, str) and os.path.exists(public_key):
-            public_key = open(public_key, "r").read()
-
-        data = {
-            "public_key": public_key
-        }
-        return self._put(endpoint, data=json.dumps(data), jsonify=True)
-
-    @endpoint("instance_sizes/")
-    def get_instance_id(self, instance_id, provider_type="ec2"):
-        """Get the id for an instance_id. The instance_id parameter is the
-        provider name (e.g. m1.large). The id returned is the stackd.io id
-        for use in API calls (e.g. 1)."""
-
-        result = self._get(endpoint, jsonify=True)
-        for instance in result['results']:
-            if instance.get("instance_id") == instance_id and \
-               instance.get("provider_type") == provider_type:
-                return instance.get("id")
-
-        raise StackException("Instance type %s from provider %s not found" %
-                             (instance_id, provider_type))

stackdio/client/account.py

@@ -15,24 +15,22 @@
 # limitations under the License.
 #
 
-import json
-
-from .http import HttpMixin, endpoint
+from .http import HttpMixin, get, post, delete
 
 
 class AccountMixin(HttpMixin):
 
-    @endpoint("cloud/providers/")
+    @get('cloud/providers/', paginate=True)
     def list_providers(self):
         """List all providers"""
-        return self._get(endpoint, jsonify=True)['results']
+        pass
 
-    @endpoint("cloud/providers/")
-    def search_providers(self, provider_id):
-        """List all providers"""
-        return self._get(endpoint, jsonify=True)['results']
+    @get('cloud/providers/', paginate=True)
+    def search_providers(self, **kwargs):
+        """Search for a provider"""
+        pass
 
-    @endpoint("cloud/accounts/")
+    @post('cloud/accounts/')
     def create_account(self, **kwargs):
         """Create an account"""
 
@@ -52,24 +50,24 @@ def create_account(self, **kwargs):
         for key in form_data.keys():
             form_data[key] = kwargs.get(key)
 
-        return self._post(endpoint, data=json.dumps(form_data), jsonify=True)
+        return form_data
 
-    @endpoint("accounts/")
+    @get('cloud/accounts/', paginate=True)
     def list_accounts(self):
         """List all account"""
-        return self._get(endpoint, jsonify=True)['results']
+        pass
 
-    @endpoint("accounts/{account_id}/")
-    def get_account(self, account_id, none_on_404=False):
+    @get('cloud/accounts/{account_id}/')
+    def get_account(self, account_id):
         """Return the account that matches the given id"""
-        return self._get(endpoint, jsonify=True, none_on_404=none_on_404)
+        pass
 
-    @endpoint("accounts/")
-    def search_accounts(self, account_id):
+    @get('cloud/accounts/')
+    def search_accounts(self, **kwargs):
         """List all accounts"""
-        return self._get(endpoint, jsonify=True)['results']
+        pass
 
-    @endpoint("accounts/{account_id}/")
+    @delete('cloud/accounts/{account_id}/')
     def delete_account(self, account_id):
         """List all accounts"""
-        return self._delete(endpoint, jsonify=True)['results']
+        pass

stackdio/client/blueprint.py

@@ -15,17 +15,19 @@
 # limitations under the License.
 #
 
-import json
-
-from .http import HttpMixin, endpoint
+from .exceptions import BlueprintException
+from .http import HttpMixin, get, post, delete
 
 
 class BlueprintMixin(HttpMixin):
 
-    @endpoint("blueprints/")
-    def create_blueprint(self, blueprint, provider="ec2"):
+    @post('blueprints/')
+    def create_blueprint(self, blueprint):
         """Create a blueprint"""
 
+        if 'host_definitions' not in blueprint:
+            raise BlueprintException('Blueprints must contain a list of host_definitions')
+
         formula_map = {}
 
         if 'formula_versions' in blueprint:
@@ -50,27 +52,24 @@ def create_blueprint(self, blueprint, provider="ec2"):
 
         # check the provided blueprint to see if we need to look up any ids
         for host in blueprint['host_definitions']:
-            for component in host['formula_components']:
+            for component in host.get('formula_components', []):
                 if component['sls_path'] in formula_map:
                     component['formula'] = formula_map[component['sls_path']]
 
-        return self._post(endpoint, data=json.dumps(blueprint), jsonify=True, raise_for_status=False)
+        return blueprint
 
-    @endpoint("blueprints/")
+    @get('blueprints/', paginate=True)
     def list_blueprints(self):
-        """Return info for a specific blueprint_id"""
-        return self._get(endpoint, jsonify=True)['results']
+        pass
 
-    @endpoint("blueprints/{blueprint_id}/")
-    def get_blueprint(self, blueprint_id, none_on_404=False):
-        """Return info for a specific blueprint_id"""
-        return self._get(endpoint, jsonify=True, none_on_404=none_on_404)
+    @get('blueprints/{blueprint_id}/')
+    def get_blueprint(self, blueprint_id):
+        pass
 
-    @endpoint("blueprints/")
+    @get('blueprints/', paginate=True)
     def search_blueprints(self, **kwargs):
-        """Return info for a specific blueprint_id"""
-        return self._get(endpoint, params=kwargs, jsonify=True)['results']
+        pass
 
-    @endpoint("blueprints/{blueprint_id}")
+    @delete('blueprints/{blueprint_id}')
     def delete_blueprint(self, blueprint_id):
-        return self._delete(endpoint, jsonify=True)
+        pass

stackdio/client/formula.py

@@ -15,42 +15,48 @@
 # limitations under the License.
 #
 
-import json
-
-from .http import HttpMixin, endpoint
+from .http import HttpMixin, get, post, delete
 
 
 class FormulaMixin(HttpMixin):
-    @endpoint("formulas/")
-    def import_formula(self, formula_uri, public=True):
+    @post('formulas/')
+    def import_formula(self, formula_uri, git_username=None, git_password=None, access_token=None):
         """Import a formula"""
         data = {
-            "uri": formula_uri,
-            "public": public,
+            'uri': formula_uri,
         }
-        return self._post(endpoint, data=json.dumps(data), jsonify=True)
 
-    @endpoint("formulas/")
+        if git_username:
+            data['git_username'] = git_username
+            data['git_password'] = git_password
+            data['access_token'] = False
+        elif access_token:
+            data['git_username'] = access_token
+            data['access_token'] = True
+
+        return data
+
+    @get('formulas/', paginate=True)
     def list_formulas(self):
         """Return all formulas"""
-        return self._get(endpoint, jsonify=True)['results']
+        pass
 
-    @endpoint("formulas/{formula_id}/")
-    def get_formula(self, formula_id, none_on_404=False):
+    @get('formulas/{formula_id}/')
+    def get_formula(self, formula_id):
         """Get a formula with matching id"""
-        return self._get(endpoint, jsonify=True, none_on_404=none_on_404)
+        pass
 
-    @endpoint("formulas/")
+    @get('formulas/', paginate=True)
     def search_formulas(self, **kwargs):
         """Get a formula with matching id"""
-        return self._get(endpoint, params=kwargs, jsonify=True)['results']
+        pass
 
-    @endpoint("formulas/{formula_id}/")
+    @delete('formulas/{formula_id}/')
     def delete_formula(self, formula_id):
         """Delete formula with matching id"""
-        return self._delete(endpoint, jsonify=True)
+        pass
 
-    @endpoint("formulas/{formula_id}/action/")
+    @post('formulas/{formula_id}/action/')
     def update_formula(self, formula_id):
-        """Delete formula with matching id"""
-        return self._post(endpoint, json.dumps({"action": "update"}), jsonify=True)
+        """Update the formula"""
+        return {"action": "update"}