Temp
Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/77834bb3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/77834bb3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/77834bb3 Branch: refs/heads/ARIA-254-multiple-nodes-per-template Commit: 77834bb317b10520a6b222b22787c6b98cf5c25e Parents: be359a7 Author: Tal Liron <[email protected]> Authored: Wed Jun 14 11:50:01 2017 -0500 Committer: Tal Liron <[email protected]> Committed: Mon Jul 3 19:46:32 2017 -0500 ---------------------------------------------------------------------- aria/parser/presentation/fields.py | 4 ++++ .../simple_v1_0/modeling/capabilities.py | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/77834bb3/aria/parser/presentation/fields.py ---------------------------------------------------------------------- diff --git a/aria/parser/presentation/fields.py b/aria/parser/presentation/fields.py index 959bad1..8a4492f 100644 --- a/aria/parser/presentation/fields.py +++ b/aria/parser/presentation/fields.py @@ -677,6 +677,10 @@ class Field(object): # object dict def _get_object_dict(self, presentation, raw, value, context): + if self.cls.__name__ == 'CapabilityAssignment': + print '>>>>>>>>>>p', presentation._name + print '>>>>>>>>>>v', value + print '>>>>>>>>>>r', raw if not isinstance(value, dict): raise InvalidValueError('%s is not a dict: %s' % (self.full_name, safe_repr(value)), locator=self.get_locator(raw)) http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/77834bb3/extensions/aria_extension_tosca/simple_v1_0/modeling/capabilities.py ---------------------------------------------------------------------- diff --git a/extensions/aria_extension_tosca/simple_v1_0/modeling/capabilities.py b/extensions/aria_extension_tosca/simple_v1_0/modeling/capabilities.py index c86563a..31386a9 100644 --- a/extensions/aria_extension_tosca/simple_v1_0/modeling/capabilities.py +++ b/extensions/aria_extension_tosca/simple_v1_0/modeling/capabilities.py @@ -129,14 +129,18 @@ def get_template_capabilities(context, presentation): if capability_name in capability_assignments: capability_assignment = capability_assignments[capability_name] + print + print presentation._name + print 'raw1', our_capability_assignment._raw + print 'raw2', presentation._raw['capabilities'][our_capability_assignment._name] + # Assign properties values = get_assigned_and_defined_parameter_values(context, our_capability_assignment, 'property') - print presentation._name print 'our', [(k, v.value) for k, v in our_capability_assignment.properties.iteritems()] - print 'ass', [(k, v.value.value) for k, v in capability_assignment.properties.iteritems()] + print 'def', [(k, v.value.value) for k, v in capability_assignment.properties.iteritems()] print 'val', [(k, v.value) for k, v in values.iteritems()] if values:
