openstack
/
murano-dashboard
Code Issues Proposed changes

Fix YAQL processing in units template. 

Change-Id: I2e5c1a4edea567fc2aa31541e7fbc582fc63b885
Fixes: bug MRN-844.
This commit is contained in:
Timur Sufiev 2013-08-26 21:16:01 +04:00
parent 9f8ecd9a0d
commit 184fd6541c
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
muranodashboard/panel/services/forms.py
View File

@ -19,6 +19,7 @@ from django.utils.translation import ugettext_lazy as _
import muranodashboard.panel.services.fields as fields
import muranodashboard.panel.services.helpers as helpers
import yaql
import types
class UpdatableFieldsForm(forms.Form):
@ -213,14 +214,14 @@ class ServiceConfigurationForm(UpdatableFieldsForm):
def get_unit_templates(self, data):
def parse_spec(spec):
if type(spec) == list:
if self.get_yaql_expr(spec):
return self.get_data(spec, data)
elif isinstance(spec, types.ListType):
return [parse_spec(_spec) for _spec in spec]
elif type(spec) == dict:
elif isinstance(spec, types.DictType):
return dict(
(parse_spec(k), parse_spec(v))
for (k, v) in spec.iteritems())
elif self.get_yaql_expr(spec):
return self.get_data(spec, data)
else:
return spec
return [parse_spec(spec) for spec in self.service.unit_templates]