Merge branch 'feature/fixes-for-cli'

Author: Clark Perkins

stackdio/client/blueprint.py

@@ -40,7 +40,7 @@ def create_blueprint(self, blueprint, provider="ec2"):
                 host["cloud_profile"] = self.get_profile_id(host["cloud_profile"], title=True)  # noqa
 
             for component in host["formula_components"]:
-                if isinstance(component["id"], (tuple, list)):
+                if not component.get("sls_path") and isinstance(component["id"], (tuple, list)):
                     formula_id = self.get_formula_id(component["id"][0])
 
                     component["id"] = self.get_component_id(

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("Profile %s not found" % slug)
+        raise StackException("Profile %s not found" % slug)

stackdio/client/region.py

@@ -84,8 +84,14 @@ def get_zone_id(self, title, type_name="ec2"):
         type_id = self.get_provider_type_id(type_name)
         for zone in result['results']:
             if zone.get("title") == title:
-                region = self._get(zone.get("region"), jsonify=True)
-                if region.get("provider_type") == type_id:
-                    return zone.get("id")
+                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))