Merge pull request #7 from clarkperkins/feature/fixes-for-cli

Fixes for the CLI

Author: clarkperkins

.gitignore

@@ -52,3 +52,6 @@ docs/_build/
 
 # PyBuilder
 target/
+
+# PyCharm
+.idea/

stackdio/client/__init__.py

@@ -19,7 +19,7 @@
 import logging
 
 from .http import use_admin_auth, endpoint
-from .exceptions import StackException
+from .exceptions import BlueprintException, StackException
 
 from .blueprint import BlueprintMixin
 from .formula import FormulaMixin
@@ -57,12 +57,15 @@ def __init__(self, protocol="https", host="localhost", port=443,
 
         _, self.version = _parse_version_string(self.get_version())
 
+    @endpoint("")
+    def get_root(self):
+        """Get the api root"""
+        return self._get(endpoint, jsonify=True)
 
     @endpoint("version/")
     def get_version(self):
         return self._get(endpoint, jsonify=True)['version']
 
-
     @use_admin_auth
     @endpoint("security_groups/")
     def create_security_group(self, name, description, cloud_provider, is_default=True):
@@ -76,6 +79,25 @@ def create_security_group(self, name, description, cloud_provider, is_default=Tr
         }
         return self._post(endpoint, data=json.dumps(data), jsonify=True)
 
+    @endpoint("settings/")
+    def get_public_key(self):
+        """Get the public key for the logged in uesr"""
+        return self._get(endpoint, jsonify=True)['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"):

stackdio/client/blueprint.py

@@ -30,42 +30,43 @@ 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["hosts"]:
-            if isinstance(host["size"], str):
+            if isinstance(host["size"], basestring):
                 host["size"] = self.get_instance_id(host["size"], provider)
 
-            if isinstance(host["zone"], str):
-                host["zone"] = self.get_zone(host["zone"], provider)
+            if isinstance(host["zone"], basestring):
+                host["zone"] = self.get_zone_id(host["zone"], provider)
 
-            if isinstance(host["cloud_profile"], str):
-                host["cloud_profile"] = self.get_profile_id(host["cloud_profile"])
+            if isinstance(host["cloud_profile"], basestring):
+                host["cloud_profile"] = self.get_profile_id(host["cloud_profile"], title=True)
 
             for component in host["formula_components"]:
                 if isinstance(component["id"], (tuple, list)):
+                    formula_id = self.get_formula_id(component["id"][0])
+
                     component["id"] = self.get_component_id(
-                        self.get_formula(component["id"][0]),
+                        self.get_formula(formula_id),
                         component["id"][1])
 
         return self._post(endpoint, data=json.dumps(blueprint), jsonify=True)
 
-
-
     @endpoint("blueprints/")
     def list_blueprints(self):
         """Return info for a specific blueprint_id"""
         return self._get(endpoint, jsonify=True)['results']
 
-
     @endpoint("blueprints/{blueprint_id}/")
     def get_blueprint(self, blueprint_id):
         """Return info for a specific blueprint_id"""
         return self._get(endpoint, jsonify=True)
 
-
     @endpoint("blueprints/")
     def search_blueprints(self, **kwargs):
         """Return info for a specific blueprint_id"""
         return self._get(endpoint, params=kwargs, jsonify=True)['results']
 
+    @endpoint("blueprints/{blueprint_id}")
+    def delete_blueprint(self, blueprint_id):
+        return self._delete(endpoint, jsonify=True)
 
     @deprecated
     @accepted_versions("<0.7")

stackdio/client/exceptions.py

@@ -19,6 +19,10 @@ class StackException(Exception):
     pass
 
 
+class BlueprintException(Exception):
+    pass
+
+
 class NoAdminException(Exception):
     pass
 

stackdio/client/formula.py

@@ -22,7 +22,6 @@
 
 
 class FormulaMixin(HttpMixin):
-
     @endpoint("formulas/")
     def import_formula(self, formula_uri, public=True):
         """Import a formula"""
@@ -32,36 +31,40 @@ def import_formula(self, formula_uri, public=True):
         }
         return self._post(endpoint, data=json.dumps(data), jsonify=True)
 
-
     @endpoint("formulas/")
     def list_formulas(self):
         """Return all formulas"""
         return self._get(endpoint, jsonify=True)['results']
 
-
     @endpoint("formulas/{formula_id}/")
     def get_formula(self, formula_id):
         """Get a formula with matching id"""
         return self._get(endpoint, jsonify=True)
 
-
     @endpoint("formulas/")
     def search_formulas(self, **kwargs):
         """Get a formula with matching id"""
         return self._get(endpoint, params=kwargs, jsonify=True)['results']
 
-
     @endpoint("formulas/{formula_id}/")
     def delete_formula(self, formula_id):
         """Delete formula with matching id"""
         return self._delete(endpoint, jsonify=True)
 
-
     @endpoint("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)
 
+    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"""

stackdio/client/http.py

@@ -100,12 +100,12 @@ class HttpMixin(object):
     }
 
     def __init__(self, auth=None, verify=True):
-        self._http_options = {}
-        self._http_options['auth'] = auth
-        self._http_options['verify'] = verify
+        self._http_options = {
+            'auth': auth,
+            'verify': verify,
+        }
         self._http_log = logging.getLogger(__name__)
 
-
     def _request(self, verb, url, quiet=False,
                  none_on_404=False, jsonify=False, raise_for_status=True,
                  *args, **kwargs):
@@ -114,17 +114,20 @@ def _request(self, verb, url, quiet=False,
             self._http_log.info("{0}: {1}".format(verb, url))
 
         headers = kwargs.get('headers', HttpMixin.HEADERS['json'])
+
         result = requests.request(verb, url,
                                   auth=self._http_options['auth'],
                                   headers=headers,
                                   verify=self._http_options['verify'],
                                   *args, **kwargs)
 
-
         # Handle special conditions
         if none_on_404 and result.status_code == 404:
             return None
 
+        elif result.status_code == 204:
+            return None
+
         elif raise_for_status:
             try:
                 result.raise_for_status()
@@ -138,26 +141,20 @@ def _request(self, verb, url, quiet=False,
         else:
             return result
 
-
     def _head(self, url, *args, **kwargs):
         return self._request("HEAD", url, *args, **kwargs)
 
-
     def _get(self, url, *args, **kwargs):
         return self._request("GET", url, *args, **kwargs)
 
-
     def _delete(self, url, *args, **kwargs):
         return self._request("DELETE", url, *args, **kwargs)
 
-
     def _post(self, url, data=None, *args, **kwargs):
         return self._request("POST", url, data=data, *args, **kwargs)
 
-
     def _put(self, url, data=None, *args, **kwargs):
         return self._request("PUT", url, data=data, *args, **kwargs)
 
-
     def _patch(self, url, data=None, *args, **kwargs):
         return self._request("PATCH", url, data=data, *args, **kwargs)

stackdio/client/profile.py

@@ -75,4 +75,4 @@ def get_profile_id(self, slug, title=False):
             if profile.get("slug" if not title else "title") == slug:
                 return profile.get("id")
 
-        return StackException("Provider %s not found" % slug)
+        return StackException("Profile %s not found" % slug)

stackdio/client/provider.py

@@ -76,7 +76,7 @@ def create_provider(self, **kwargs):
 
 
     @endpoint("providers/")
-    def list_providers(self, provider_id):
+    def list_providers(self):
         """List all providers"""
         return self._get(endpoint, jsonify=True)['results']
 

stackdio/client/region.py

@@ -72,9 +72,12 @@ 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 and \
-               zone.get("provider_type") == type_name:
-                return zone.get("id")
+            if zone.get("title") == title:
+                region = self._get(zone.get("region"), jsonify=True)
+                if region.get("provider_type") == type_id:
+                    return zone.get("id")
 
         raise StackException("Zone %s not found for %s" % (title, type_name))