Merge branch '0.7'

Author: Clark Perkins

stackdio/cli/mixins/blueprints.py

@@ -133,13 +133,13 @@ def create_blueprint(client, mapping, template, var_file, no_prompt):
         raise click.UsageError('Missing \'blueprint_dir\' in config.  Please run `configure`.')
 
     if mapping:
-        mapping = yaml.safe_load(open(os.path.join(blueprint_dir, 'mappings.yaml'), 'r'))
-        if not mapping or mapping not in mapping:
+        mappings = yaml.safe_load(open(os.path.join(blueprint_dir, 'mappings.yaml'), 'r'))
+        if not mappings or mapping not in mappings:
             click.secho('You gave an invalid mapping.', fg='red')
             return
         else:
-            template = mapping[mapping].get('template')
-            var_file = mapping[mapping].get('var_files', [])
+            template = mappings[mapping].get('template')
+            var_file = mappings[mapping].get('var_files', [])
             if not template:
                 click.secho('Your mapping must specify a template.', fg='red')
                 return
@@ -217,3 +217,19 @@ def delete_all_blueprints(client):
     for blueprint in client.list_blueprints():
         client.delete_blueprint(blueprint['id'])
         click.secho('Deleted blueprint {0}'.format(blueprint['title']), fg='magenta')
+
+
+@blueprints.command(name='create-label')
+@pass_client
+@click.argument('title')
+@click.argument('key')
+@click.argument('value')
+def create_label(client, title, key, value):
+    """
+    Create a key:value label on a blueprint
+    """
+    blueprint_id = get_blueprint_id(client, title)
+
+    client.add_blueprint_label(blueprint_id, key, value)
+
+    click.echo('Created label on {0}'.format(title))

stackdio/client/blueprint.py

@@ -16,7 +16,7 @@
 #
 
 from .exceptions import BlueprintException
-from .http import HttpMixin, get, post, delete
+from .http import HttpMixin, get, post, put, patch, delete
 
 
 class BlueprintMixin(HttpMixin):
@@ -67,6 +67,32 @@ def get_blueprint(self, blueprint_id):
     def search_blueprints(self, **kwargs):
         pass
 
-    @delete('blueprints/{blueprint_id}')
+    @delete('blueprints/{blueprint_id}/')
     def delete_blueprint(self, blueprint_id):
         pass
+
+    @put('blueprints/{blueprint_id}/properties/')
+    def update_blueprint_properties(self, blueprint_id, properties):
+        return properties
+
+    @patch('blueprints/{blueprint_id}/properties/')
+    def partial_update_blueprint_properties(self, blueprint_id, properties):
+        return properties
+
+    @post('blueprints/{blueprint_id}/labels/')
+    def add_blueprint_label(self, blueprint_id, key, value):
+        return {
+            'key': key,
+            'value': value,
+        }
+
+    @put('blueprints/{blueprint_id}/labels/{key}/')
+    def update_blueprint_label(self, blueprint_id, key, value):
+        return {
+            'key': key,
+            'value': value,
+        }
+
+    @delete('blueprints/{blueprint_id}/labels/{key}/')
+    def delete_blueprint_label(self, blueprint_id, key):
+        pass

stackdio/client/stack.py

@@ -16,7 +16,7 @@
 #
 
 from .exceptions import StackException
-from .http import HttpMixin, get, post, put, delete
+from .http import HttpMixin, get, post, put, patch, delete
 
 
 class StackMixin(HttpMixin):
@@ -105,6 +105,32 @@ def get_stack_hosts(self, stack_id):
         """Get a list of all stack hosts"""
         pass
 
+    @put('stacks/{stack_id}/properties/')
+    def update_stack_properties(self, stack_id, properties):
+        return properties
+
+    @patch('stacks/{stack_id}/properties/')
+    def partial_update_stack_properties(self, stack_id, properties):
+        return properties
+
+    @post('stacks/{stack_id}/labels/')
+    def add_stack_label(self, stack_id, key, value):
+        return {
+            'key': key,
+            'value': value,
+        }
+
+    @put('stacks/{stack_id}/labels/{key}/')
+    def update_stack_label(self, stack_id, key, value):
+        return {
+            'key': key,
+            'value': value,
+        }
+
+    @delete('stacks/{stack_id}/labels/{key}/')
+    def delete_stack_label(self, stack_id, key):
+        pass
+
     @get('stacks/{stack_id}/logs/')
     def list_stack_logs(self, stack_id):
         """Get a list of stack logs"""