Sync code from nfv-toscaprser

Currently nfv-toscaparser has published the regular version of 0.5.1
the patch will synchronize the code.

JIRA: MODELING-23

Change-Id: If95579fc366b69b2b14b2e441ff9a3e6807e3820
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>

1 files changed, 24 insertions, 0 deletions

diff --git a/nfvparser/toscaparser/tests/test_functions.py b/nfvparser/toscaparser/tests/test_functions.py
index fa60140..2e1d71e 100644
--- a/nfvparser/toscaparser/tests/test_functions.py
+++ b/nfvparser/toscaparser/tests/test_functions.py
@@ -188,6 +188,26 @@ class IntrinsicFunctionsTest(TestCase):
         self.assertIsInstance(source_port, functions.GetProperty)
         self.assertEqual(3306, source_port.result())
 
+    def test_get_prop_cap_host(self):
+        tosca_tpl = os.path.join(
+            os.path.dirname(os.path.abspath(__file__)),
+            "data/functions/test_get_prop_cap_host.yaml")
+        some_node = self._get_node('some_node',
+                                   ToscaTemplate(tosca_tpl))
+        some_prop = some_node.get_properties()['some_prop']
+        self.assertIsInstance(some_prop.value, functions.GetProperty)
+        self.assertEqual('someval', some_prop.value.result())
+
+    def test_get_prop_cap_bool(self):
+        tosca_tpl = os.path.join(
+            os.path.dirname(os.path.abspath(__file__)),
+            "data/functions/test_get_prop_cap_bool.yaml")
+        some_node = self._get_node('software',
+                                   ToscaTemplate(tosca_tpl))
+        some_prop = some_node.get_properties()['some_prop']
+        self.assertIsInstance(some_prop.value, functions.GetProperty)
+        self.assertEqual(False, some_prop.value.result())
+
 
 class GetAttributeTest(TestCase):
 
@@ -318,6 +338,10 @@ class GetAttributeTest(TestCase):
         self.assertIsNotNone(self._load_template(
             'functions/test_get_implicit_attribute.yaml'))
 
+    def test_get_attribute_capability_inheritance(self):
+        self.assertIsNotNone(self._load_template(
+            'functions/test_container_cap_child.yaml'))
+
 
 class ConcatTest(TestCase):