From: Angus Salkeld Date: Fri, 13 Apr 2012 00:16:29 +0000 (+1000) Subject: Delete extra white space X-Git-Tag: 2014.1~2038 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=c453a33f35335eae74161f3bf4a6b536496b4894;p=openstack-build%2Fheat-build.git Delete extra white space Signed-off-by: Angus Salkeld --- diff --git a/heat/api/v1/stacks.py b/heat/api/v1/stacks.py index ea5eb4a5..af46670d 100644 --- a/heat/api/v1/stacks.py +++ b/heat/api/v1/stacks.py @@ -49,7 +49,7 @@ class StackController(object): Returns the following information for all stacks: """ con = context.get_admin_context() - stack_list = rpc.call(con, 'engine', + stack_list = rpc.call(con, 'engine', {'method': 'list_stacks', 'args': {'params': dict(req.params)}}) diff --git a/heat/client.py b/heat/client.py index 5b88eb03..83532bb9 100644 --- a/heat/client.py +++ b/heat/client.py @@ -88,7 +88,7 @@ class V1Client(base_client.BaseClient): def validate_template(self, **kwargs): params = self._extract_params(kwargs, SUPPORTED_PARAMS) self._insert_common_parameters(params) - + res = self.do_request("GET", "/ValidateTemplate", params=params) data = json.loads(res.read()) return data diff --git a/heat/engine/manager.py b/heat/engine/manager.py index 3d591c3b..7d47c3db 100644 --- a/heat/engine/manager.py +++ b/heat/engine/manager.py @@ -57,7 +57,7 @@ class EngineManager(manager.Manager): res['stacks'].append(mem) return res - + def show_stack(self, context, stack_name, params): res = {'stacks': [] } s = db_api.stack_get(None, id) @@ -82,7 +82,7 @@ class EngineManager(manager.Manager): res['stacks'].append(mem) return res - + def create_stack(self, context, stack_name, template, params): logger.info('template is %s' % template) if db_api.stack_get(None, stack_name): @@ -94,11 +94,11 @@ class EngineManager(manager.Manager): rt['stack_name'] = stack_name new_rt = db_api.raw_template_create(None, rt) s = {} - s['name'] = stack_name + s['name'] = stack_name s['raw_template_id'] = new_rt.id new_s = db_api.stack_create(None, s) stack.id = new_s.id - stack.create() + stack.create() return {'stack': {'id': new_s.id, 'name': new_s.name,\ 'created_at': str(new_s.created_at)}} @@ -117,7 +117,7 @@ class EngineManager(manager.Manager): def delete_stack(self, context, stack_name, params): st = db_api.stack_get(None, stack_name) if not st: - return {'Error': 'No stack by that name'} + return {'Error': 'No stack by that name'} logger.info('deleting stack %s' % stack_name) @@ -125,8 +125,8 @@ class EngineManager(manager.Manager): ps = parser.Stack(st.name, rt.template, params) db_api.stack_delete(None, stack_name) ps.delete() - return None - + return None + def list_events(self, context, stack_name): st = db_api.stack_get(None, stack_name) events = db_api.event_get_all_by_stack(None, st.id) @@ -139,5 +139,5 @@ class EngineManager(manager.Manager): 'StackName': s.name, 'Timestamp': str(e.created_at), 'ResourceStatus': str(e.name)} - + return {'events': [parse_event(e) for e in events]}