From 3de772dbd61c2d360fb15c46df21315cf043f14e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Fouch=C3=A9?= Date: Tue, 4 Aug 2015 15:46:57 +0200 Subject: [PATCH] Make the command line use Client Made cmd.py use Client instead of TemplateGenerator when creating a template. Change-Id: I5af390a155e6cfc336aead9a829143d8fc71c97c --- flameclient/cmd.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/flameclient/cmd.py b/flameclient/cmd.py index eb6a4d6..fecc462 100644 --- a/flameclient/cmd.py +++ b/flameclient/cmd.py @@ -27,7 +27,7 @@ from __future__ import print_function import argparse import os -from flameclient import flame +from flameclient import client def main(args=None): @@ -75,10 +75,12 @@ def main(args=None): "stack data file.") args = parser.parse_args() - template = flame.TemplateGenerator(args.username, args.password, - args.project, args.auth_url, - args.insecure, args.endpoint_type, - region_name=args.region) + flame = client.Client(args.username, args.password, + args.project, args.auth_url, + insecure=args.insecure, + endpoint_type=args.endpoint_type, + region_name=args.region) + template = flame.template_generator template.extract_vm_details(args.exclude_servers, args.exclude_volumes, args.generate_stack_data) template.extract_data()