Merge pull request #10 from WLPhoenix/master

Usability changes to get_{x} functions

Author: WLPhoenix

stackdio/client/blueprint.py

@@ -37,7 +37,7 @@ def create_blueprint(self, blueprint, provider="ec2"):
                 host["zone"] = self.get_zone_id(host["zone"], provider)
 
             if isinstance(host["cloud_profile"], basestring):
-                host["cloud_profile"] = self.get_profile_id(host["cloud_profile"], title=True)
+                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)):
@@ -55,9 +55,9 @@ def list_blueprints(self):
         return self._get(endpoint, jsonify=True)['results']
 
     @endpoint("blueprints/{blueprint_id}/")
-    def get_blueprint(self, 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)
+        return self._get(endpoint, jsonify=True, none_on_404=none_on_404)
 
     @endpoint("blueprints/")
     def search_blueprints(self, **kwargs):

stackdio/client/formula.py

@@ -37,9 +37,9 @@ def list_formulas(self):
         return self._get(endpoint, jsonify=True)['results']
 
     @endpoint("formulas/{formula_id}/")
-    def get_formula(self, formula_id):
+    def get_formula(self, formula_id, none_on_404=False):
         """Get a formula with matching id"""
-        return self._get(endpoint, jsonify=True)
+        return self._get(endpoint, jsonify=True, none_on_404=none_on_404)
 
     @endpoint("formulas/")
     def search_formulas(self, **kwargs):

stackdio/client/profile.py

@@ -46,9 +46,9 @@ def list_profiles(self):
 
 
     @endpoint("profiles/{profile_id}/")
-    def get_profile(self, profile_id):
+    def get_profile(self, profile_id, none_on_404=False):
         """Return the profile that matches the given id"""
-        return self._get(endpoint, jsonify=True)
+        return self._get(endpoint, jsonify=True, none_on_404=none_on_404)
 
 
     @accepted_versions(">=0.6.1")

stackdio/client/provider.py

@@ -82,9 +82,9 @@ def list_providers(self):
 
 
     @endpoint("providers/{provider_id}/")
-    def get_provider(self, provider_id):
+    def get_provider(self, provider_id, none_on_404=False):
         """Return the provider that matches the given id"""
-        return self._get(endpoint, jsonify=True)
+        return self._get(endpoint, jsonify=True, none_on_404=none_on_404)
 
 
     @accepted_versions(">=0.6.1")

stackdio/client/region.py

@@ -29,6 +29,11 @@ def list_regions(self):
         return self._get(endpoint, jsonify=True)['results']
 
 
+    @endpoint("regions/{region_id}")
+    def get_region(self, 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):
@@ -58,6 +63,9 @@ def get_region_id(self, title, type_name="ec2"):
     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):
+        return self._get(endpoint, jsonify=True, none_on_404=none_on_404)
 
     @accepted_versions(">=0.6.1")
     @endpoint("zones/")

stackdio/client/stack.py

@@ -41,9 +41,9 @@ def list_stacks(self):
         return self._get(endpoint, jsonify=True)['results']
 
     @endpoint("stacks/{stack_id}/")
-    def get_stack(self, stack_id):
+    def get_stack(self, stack_id, none_on_404=False):
         """Get stack info"""
-        return self._get(endpoint, jsonify=True)
+        return self._get(endpoint, jsonify=True, none_on_404=none_on_404)
 
     @endpoint("stacks/")
     def search_stacks(self, **kwargs):
@@ -154,7 +154,7 @@ def get_access_rule_id(self, stack_id, title):
             for group in rules:
                 if group.get("blueprint_host_definition").get("title") == title:
                     return group.get("id")
-        except TypeError, e:
+        except TypeError:
             pass
 
         raise StackException("Access Rule %s not found" % title)
@@ -168,4 +168,3 @@ def edit_access_rule(self, group_id, data=None):
         """Add an access rule to a group"""
 
         return self._put(endpoint, jsonify=True, data=json.dumps(data))
-