x/solar
Code Issues Proposed changes

Merge pull request #66 from Mirantis/cgenie/resource-value-fix

Browse Source 
Fix resource.py when value is not specified in meta.yaml
This commit is contained in:
Dmitry Shulyak 2015-08-06 14:57:45 +03:00
commit 0acb87f212
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
solar/solar/core/resource/resource.py
View File

@ -58,9 +58,7 @@ class Resource(object):
self.metadata = raw_resource self.metadata = raw_resource
args = self.metadata['input'] return Resource.get_raw_resource_args(raw_resource)
return {k: v['value'] for k, v in args.items()}
def set_args_from_dict(self, new_args): def set_args_from_dict(self, new_args):
args = self.args_dict() args = self.args_dict()
@ -167,10 +165,14 @@ class Resource(object):
else: else:
raise Exception('Uuups, action is not available') raise Exception('Uuups, action is not available')
@staticmethod
def get_raw_resource_args(raw_resource):
return {k: v.get('value') for k, v in raw_resource['input'].items()}
def wrap_resource(raw_resource): def wrap_resource(raw_resource):
name = raw_resource['id'] name = raw_resource['id']
args = {k: v['value'] for k, v in raw_resource['input'].items()} args = Resource.get_raw_resource_args(raw_resource)
tags = raw_resource.get('tags', []) tags = raw_resource.get('tags', [])
virtual_resource = raw_resource.get('virtual_resource', []) virtual_resource = raw_resource.get('virtual_resource', [])