diff --git a/examples/riak/riaks.py b/examples/riak/riaks.py index 2a2e7760..4288ad6f 100644 --- a/examples/riak/riaks.py +++ b/examples/riak/riaks.py @@ -72,7 +72,7 @@ def setup_riak(): local_errors = validation.validate_resource(r) if local_errors: has_errors = True - print 'ERROR: %s: %s' % (r.name, errors) + print 'ERROR: %s: %s' % (r.name, local_errors) if has_errors: print "ERRORS" diff --git a/solar/solar/cli/main.py b/solar/solar/cli/main.py index 58b3873f..08b08e7f 100644 --- a/solar/solar/cli/main.py +++ b/solar/solar/cli/main.py @@ -182,14 +182,6 @@ def init_cli_connections(): #plt.savefig('graph.png') -def init_cli_deployment_config(): - @main.command() - @click.argument('filepath') - def deploy(filepath): - click.echo('Deploying from file {}'.format(filepath)) - xd.deploy(filepath) - - def init_cli_resource(): @main.group() def resource(): @@ -296,7 +288,6 @@ def init_cli_resource(): if output: echo(output) - @resource.command() @click.argument('resource_name') @click.argument('tag_name') @@ -308,7 +299,7 @@ def init_cli_resource(): r.add_tag(tag_name) else: r.remove_tag(tag_name) - r.save() + # TODO: the above functions should save resource automatically to the DB @resource.command() @click.argument('name') diff --git a/solar/solar/errors.py b/solar/solar/errors.py index 982ddfb2..09d102fb 100644 --- a/solar/solar/errors.py +++ b/solar/solar/errors.py @@ -12,6 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. + class SolarError(Exception): pass @@ -24,5 +25,9 @@ class CannotFindExtension(SolarError): pass +class LexError(SolarError): + pass + + class ParseError(SolarError): pass