openstack/heat
Code Issues Proposed changes

Delete extra white space

Browse Source 
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
This commit is contained in:
Angus Salkeld 2012-04-13 10:16:29 +10:00
parent 5bb18073cb
commit c453a33f35
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
heat/api/v1/stacks.py
View File

@ -49,7 +49,7 @@ class StackController(object):
Returns the following information for all stacks: Returns the following information for all stacks:
""" """
con = context.get_admin_context() con = context.get_admin_context()
stack_list = rpc.call(con, 'engine', stack_list = rpc.call(con, 'engine',
{'method': 'list_stacks', {'method': 'list_stacks',
'args': {'params': dict(req.params)}}) 'args': {'params': dict(req.params)}})

2
heat/client.py
View File

@ -88,7 +88,7 @@ class V1Client(base_client.BaseClient):
def validate_template(self, **kwargs): def validate_template(self, **kwargs):
params = self._extract_params(kwargs, SUPPORTED_PARAMS) params = self._extract_params(kwargs, SUPPORTED_PARAMS)
self._insert_common_parameters(params) self._insert_common_parameters(params)
res = self.do_request("GET", "/ValidateTemplate", params=params) res = self.do_request("GET", "/ValidateTemplate", params=params)
data = json.loads(res.read()) data = json.loads(res.read())
return data return data

16
heat/engine/manager.py
View File

@ -57,7 +57,7 @@ class EngineManager(manager.Manager):
res['stacks'].append(mem) res['stacks'].append(mem)
return res return res
def show_stack(self, context, stack_name, params): def show_stack(self, context, stack_name, params):
res = {'stacks': [] } res = {'stacks': [] }
s = db_api.stack_get(None, id) s = db_api.stack_get(None, id)
@ -82,7 +82,7 @@ class EngineManager(manager.Manager):
res['stacks'].append(mem) res['stacks'].append(mem)
return res return res
def create_stack(self, context, stack_name, template, params): def create_stack(self, context, stack_name, template, params):
logger.info('template is %s' % template) logger.info('template is %s' % template)
if db_api.stack_get(None, stack_name): if db_api.stack_get(None, stack_name):
@ -94,11 +94,11 @@ class EngineManager(manager.Manager):
rt['stack_name'] = stack_name rt['stack_name'] = stack_name
new_rt = db_api.raw_template_create(None, rt) new_rt = db_api.raw_template_create(None, rt)
s = {} s = {}
s['name'] = stack_name s['name'] = stack_name
s['raw_template_id'] = new_rt.id s['raw_template_id'] = new_rt.id
new_s = db_api.stack_create(None, s) new_s = db_api.stack_create(None, s)
stack.id = new_s.id stack.id = new_s.id
stack.create() stack.create()
return {'stack': {'id': new_s.id, 'name': new_s.name,\ return {'stack': {'id': new_s.id, 'name': new_s.name,\
'created_at': str(new_s.created_at)}} 'created_at': str(new_s.created_at)}}
@ -117,7 +117,7 @@ class EngineManager(manager.Manager):
def delete_stack(self, context, stack_name, params): def delete_stack(self, context, stack_name, params):
st = db_api.stack_get(None, stack_name) st = db_api.stack_get(None, stack_name)
if not st: if not st:
return {'Error': 'No stack by that name'} return {'Error': 'No stack by that name'}
logger.info('deleting stack %s' % stack_name) logger.info('deleting stack %s' % stack_name)
@ -125,8 +125,8 @@ class EngineManager(manager.Manager):
ps = parser.Stack(st.name, rt.template, params) ps = parser.Stack(st.name, rt.template, params)
db_api.stack_delete(None, stack_name) db_api.stack_delete(None, stack_name)
ps.delete() ps.delete()
return None return None
def list_events(self, context, stack_name): def list_events(self, context, stack_name):
st = db_api.stack_get(None, stack_name) st = db_api.stack_get(None, stack_name)
events = db_api.event_get_all_by_stack(None, st.id) events = db_api.event_get_all_by_stack(None, st.id)
@ -139,5 +139,5 @@ class EngineManager(manager.Manager):
'StackName': s.name, 'StackName': s.name,
'Timestamp': str(e.created_at), 'Timestamp': str(e.created_at),
'ResourceStatus': str(e.name)} 'ResourceStatus': str(e.name)}
return {'events': [parse_event(e) for e in events]} return {'events': [parse_event(e) for e in events]}