You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ariatosca.apache.org by em...@apache.org on 2017/06/16 22:27:52 UTC
[09/10] incubator-ariatosca git commit: Temp
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/334ea74e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/334ea74e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/334ea74e
Branch: refs/heads/ARIA-254-multiple-nodes-per-template
Commit: 334ea74e9829e5174103aab20145737879e2e09f
Parents: ba4460e
Author: Tal Liron <ta...@gmail.com>
Authored: Wed Jun 14 11:50:01 2017 -0500
Committer: Tal Liron <ta...@gmail.com>
Committed: Fri Jun 16 17:27: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/334ea74e/aria/parser/presentation/fields.py
----------------------------------------------------------------------
diff --git a/aria/parser/presentation/fields.py b/aria/parser/presentation/fields.py
index 7f85723..060c576 100644
--- a/aria/parser/presentation/fields.py
+++ b/aria/parser/presentation/fields.py
@@ -680,6 +680,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/334ea74e/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 18a4541..e61fc81 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: