You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ariatosca.apache.org by mx...@apache.org on 2017/01/30 12:50:57 UTC

incubator-ariatosca git commit: removed old relationship_template references

Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-44-Merge-parser-and-storage-models 1a67cb32d -> 7c232fdc1


removed old relationship_template references


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/7c232fdc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/7c232fdc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/7c232fdc

Branch: refs/heads/ARIA-44-Merge-parser-and-storage-models
Commit: 7c232fdc12cd7794df355696926362c70eacd3b0
Parents: 1a67cb3
Author: mxmrlv <mx...@gmail.com>
Authored: Mon Jan 30 14:50:48 2017 +0200
Committer: mxmrlv <mx...@gmail.com>
Committed: Mon Jan 30 14:50:48 2017 +0200

----------------------------------------------------------------------
 aria/storage/modeling/instance_elements.py | 16 ++++++----------
 aria/storage/modeling/template_elements.py |  8 --------
 2 files changed, 6 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/7c232fdc/aria/storage/modeling/instance_elements.py
----------------------------------------------------------------------
diff --git a/aria/storage/modeling/instance_elements.py b/aria/storage/modeling/instance_elements.py
index d6abeb3..e3dedc8 100644
--- a/aria/storage/modeling/instance_elements.py
+++ b/aria/storage/modeling/instance_elements.py
@@ -937,16 +937,12 @@ class NodeBase(structure.ModelMixin):
                 target_node = target_nodes[0]
 
             if target_node is not None:
-                if requirement_template.relationship_template is not None:
-                    relationship = \
-                        requirement_template.relationship_template.instantiate(context, self)
-                else:
-                    relationship = RelationshipBase()
-                relationship.name = requirement_template.name
-                relationship.source_requirement_index = requirement_template_index
-                relationship.target_node_id = target_node.id
-                if target_capability is not None:
-                    relationship.target_capability_name = target_capability.name
+                relationship = RelationshipBase(
+                    name=requirement_template.name,
+                    source_requirement_index=requirement_template_index,
+                    target_node_id=target_node.id,
+                    target_capability_name=target_capability.name
+                )
                 self.relationships.append(relationship)
             else:
                 context.validation.report('requirement "%s" of node "%s" targets node '

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/7c232fdc/aria/storage/modeling/template_elements.py
----------------------------------------------------------------------
diff --git a/aria/storage/modeling/template_elements.py b/aria/storage/modeling/template_elements.py
index c382e7b..17cc292 100644
--- a/aria/storage/modeling/template_elements.py
+++ b/aria/storage/modeling/template_elements.py
@@ -837,14 +837,6 @@ class NodeTemplateBase(structure.ModelMixin):
     # region many-to-many relationships
 
     @declared_attr
-    def service_template(cls):
-        return cls.many_to_one_relationship('service_template')
-
-    # endregion
-
-    # region many-to-many relationships
-
-    @declared_attr
     def properties(cls):
         return cls.many_to_many_relationship('parameter', table_prefix='properties')