From 9dbb72d73a2fb7d593ad20a3e337a5e07c68c30e Mon Sep 17 00:00:00 2001 From: George Peristerakis Date: Fri, 19 Sep 2014 12:32:26 -0400 Subject: [PATCH] Fix refactoring bugs that broke the command line --- flameclient/cmd.py | 6 +++--- flameclient/flame.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flameclient/cmd.py b/flameclient/cmd.py index c7e5295..55c747f 100644 --- a/flameclient/cmd.py +++ b/flameclient/cmd.py @@ -69,11 +69,11 @@ def main(args=None): args = parser.parse_args() template = TemplateGenerator(args.username, args.password, args.project, args.auth_url, args.insecure) - template.extract_server_details(args.exclude_servers, args.exclude_volumes, - args.generate_stack_data) + template.extract_vm_details(args.exclude_servers, args.exclude_volumes, + args.generate_stack_data) template.extract_data() print("### Heat Template ###") print(template.heat_template()) if args.generate_stack_data: print("### Stack Data ###") - print(template.stack_data()) + print(template.stack_data_template()) diff --git a/flameclient/flame.py b/flameclient/flame.py index b24c27e..26d4b5d 100644 --- a/flameclient/flame.py +++ b/flameclient/flame.py @@ -111,7 +111,7 @@ class TemplateGenerator(object): for index, element in enumerate(data)) @staticmethod - def print_generated(filename, message): + def print_generated(filename): print(yaml.safe_dump(filename, default_flow_style=False)) def add_resource(self, name, status, resource_id, resource_type): @@ -606,5 +606,5 @@ class TemplateGenerator(object): def heat_template(self): return self.print_generated(self.template) - def stack_data(self): + def stack_data_template(self): return self.print_generated(self.stack_data)