Merged in 0.7

Author: Clark Perkins

stackdio/cli/blueprints/generator.py

@@ -184,7 +184,8 @@ def validate(self, template_file):
 
         return unset_vars, set_vars
 
-    def generate(self, template_file, var_files=(), variables=None, prompt=False, debug=False):
+    def generate(self, template_file, var_files=(), variables=None,
+                 prompt=False, debug=False, suppress_warnings=False):
         """
         Generate the rendered blueprint and return it as a python dict
 
@@ -255,14 +256,14 @@ def generate(self, template_file, var_files=(), variables=None, prompt=False, de
             # If it is set elsewhere, it's not an issue
             optional_vars = optional_vars - set(context)
 
-            if null_vars:
+            if null_vars and not suppress_warnings:
                 warn_str = '\nWARNING: Null variables (replaced with empty string):\n'
                 for var in null_vars:
                     warn_str += '   {0}\n'.format(var)
                 self.warning(warn_str, 0)
 
             # Print a warning if there's unset optional variables
-            if optional_vars:
+            if optional_vars and not suppress_warnings:
                 warn_str = '\nWARNING: Missing optional variables:\n'
                 for var in sorted(optional_vars):
                     warn_str += '   {0}\n'.format(var)

stackdio/cli/mixins/blueprints.py

@@ -74,7 +74,8 @@ def list_templates(client):
     _recurse_dir(os.path.join(blueprint_dir, 'var_files'), ['yaml', 'yml'])
 
 
-def _create_single_blueprint(config, template_file, var_files, no_prompt, extra_vars=None):
+def _create_single_blueprint(config, template_file, var_files, no_prompt,
+                             extra_vars=None, suppress_warnings=False):
     blueprint_dir = os.path.expanduser(config['blueprint_dir'])
 
     gen = BlueprintGenerator([os.path.join(blueprint_dir, 'templates')])
@@ -103,7 +104,8 @@ def _create_single_blueprint(config, template_file, var_files, no_prompt, extra_
     return gen.generate(template_file,
                         final_var_files,  # Pass in a list
                         variables=extra_vars,
-                        prompt=no_prompt)
+                        prompt=no_prompt,
+                        suppress_warnings=suppress_warnings)
 
 
 @blueprints.command(name='create')
@@ -170,10 +172,19 @@ def create_all_blueprints(client):
         raise click.UsageError('Missing \'blueprint_dir\' in config.  Please run `configure`.')
     mapping = yaml.safe_load(open(os.path.join(blueprint_dir, 'mappings.yaml'), 'r'))
 
+    blueprints = client.list_blueprints()
+
+    blueprint_titles = [blueprint['title'] for blueprint in blueprints]
+
     for name, vals in mapping.items():
+        if name in blueprint_titles:
+            click.secho('Skipping creation of {0}, it already exists.'.format(name), fg='yellow')
+            continue
+
         try:
             bp_json = _create_single_blueprint(client.config, vals['template'],
-                                               vals['var_files'], False, {'title': name})
+                                               vals['var_files'], False, {'title': name},
+                                               suppress_warnings=True)
             client.create_blueprint(bp_json)
             click.secho('Created blueprint {0}'.format(name), fg='green')
         except BlueprintException:

stackdio/client/__init__.py

@@ -35,13 +35,14 @@
 from .region import RegionMixin
 from .settings import SettingsMixin
 from .stack import StackMixin
+from .snapshot import SnapshotMixin
 
 logger = logging.getLogger(__name__)
 logger.addHandler(logging.NullHandler())
 
 
 class StackdioClient(BlueprintMixin, FormulaMixin, AccountMixin, ImageMixin,
-                     RegionMixin, StackMixin, SettingsMixin, HttpMixin):
+                     RegionMixin, StackMixin, SettingsMixin, SnapshotMixin, HttpMixin):
 
     def __init__(self, url=None, username=None, password=None, verify=None, cfg_file=None):
         self.config = StackdioConfig(cfg_file)

stackdio/client/blueprint.py

@@ -67,6 +67,14 @@ def get_blueprint(self, blueprint_id):
     def delete_blueprint(self, blueprint_id):
         pass
 
+    @get('blueprints/{blueprint_id}/host_definitions/', paginate=True)
+    def get_blueprint_host_definitions(self, blueprint_id):
+        pass
+
+    @get('blueprints/{blueprint_id}/properties/')
+    def get_blueprint_properties(self, blueprint_id):
+        pass
+
     @put('blueprints/{blueprint_id}/properties/')
     def update_blueprint_properties(self, blueprint_id, properties):
         return properties

stackdio/client/snapshot.py

@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+
+# Copyright 2014,  Digital Reasoning
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+from .http import HttpMixin, get, post, delete
+
+
+class SnapshotMixin(HttpMixin):
+
+    @post('cloud/snapshots/')
+    def create_snapshot(self, snapshot):
+        """Create a snapshot"""
+        return snapshot
+
+    @get('cloud/snapshots/', paginate=True)
+    def list_snapshots(self):
+        pass
+
+    @get('cloud/snapshots/{snapshot_id}/')
+    def get_snapshot(self, snapshot_id):
+        pass
+
+    @get('cloud/snapshots/', paginate=True)
+    def search_snapshots(self, **kwargs):
+        pass
+
+    @delete('cloud/snapshots/{snapshot_id}/')
+    def delete_snapshot(self, snapshot_id):
+        pass