From: shangxdy <shang.xiaodong@zte.com.cn>
Date: Tue, 14 Jun 2016 07:28:35 +0000 (+0800)
Subject: EntityTemplate has no property of parent_type
X-Git-Tag: colorado.1.0~66^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=898719f261d68f822e3ab14c1466e893dd70f2a7;p=parser.git

EntityTemplate has no property of parent_type

1. EntityTemplate is the parent of NodeTemplate,but there is no definition
of parent_type definition, so the method of is_derived_from will be error
when call the parent_type's method.
2. The bug will submit to openstack community.

Change-Id: If6d360932fd610f001934d23aac63e11ac16fddf
JIRA: PARSER-51
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
---

diff --git a/tosca2heat/tosca-parser/toscaparser/entity_template.py b/tosca2heat/tosca-parser/toscaparser/entity_template.py
index 281012b..f416c99 100644
--- a/tosca2heat/tosca-parser/toscaparser/entity_template.py
+++ b/tosca2heat/tosca-parser/toscaparser/entity_template.py
@@ -81,6 +81,15 @@ class EntityTemplate(object):
     def type(self):
         if self.type_definition:
             return self.type_definition.type
+        else:
+            return None
+
+    @property
+    def parent_type(self):
+        if self.type_definition:
+            return self.type_definition.parent_type
+        else:
+            return None
 
     @property
     def requirements(self):
diff --git a/tosca2heat/tosca-parser/toscaparser/tests/test_toscatpl.py b/tosca2heat/tosca-parser/toscaparser/tests/test_toscatpl.py
index 3fd49bf..efc71fd 100644
--- a/tosca2heat/tosca-parser/toscaparser/tests/test_toscatpl.py
+++ b/tosca2heat/tosca-parser/toscaparser/tests/test_toscatpl.py
@@ -134,6 +134,19 @@ class ToscaTemplateTest(TestCase):
                 self.assertEqual('Linux', os_props['type'].value)
                 self.assertEqual('Linux', os_type_prop)
 
+    def test_node_inheritance_type(self):
+        wordpress_node = [
+            node for node in self.tosca.nodetemplates
+            if node.name == 'wordpress'][0]
+        self.assertTrue(
+            wordpress_node.is_derived_from("tosca.nodes.WebApplication"))
+        self.assertTrue(
+            wordpress_node.is_derived_from("tosca.nodes.Root"))
+        self.assertFalse(
+            wordpress_node.is_derived_from("tosca.policies.Root"))
+        self.assertFalse(
+            wordpress_node.is_derived_from("tosca.groups.Root"))
+
     def test_outputs(self):
         self.assertEqual(
             ['website_url'],