synchronize upstream about tosca-parser

synchronize tosca-parser with version of 0.81

JIRA: PARSER-128

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

9 files changed, 201 insertions, 2 deletions

diff --git a/tosca2heat/tosca-parser/toscaparser/tests/data/custom_types/container_cap_child.yaml b/tosca2heat/tosca-parser/toscaparser/tests/data/custom_types/container_cap_child.yaml
new file mode 100644
index 0000000..1df09dd
--- /dev/null
+++ b/tosca2heat/tosca-parser/toscaparser/tests/data/custom_types/container_cap_child.yaml
@@ -0,0 +1,33 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+description: >
+  Define a capability class that inherits from tosca.capabilities.Container
+
+capability_types:
+
+  tosca.capabilities.ContainerChild:
+    derived_from: tosca.capabilities.Container
+
+node_types:
+
+  tosca.nodes.SomeNode:
+    derived_from: tosca.nodes.Root
+    properties:
+      some_prop:
+        type: string
+    requirements:
+      - host_child:
+          capability: tosca.capabilities.ContainerChild
+          node: tosca.nodes.SomeNode2
+          relationship: tosca.relationships.HostedOn
+
+  tosca.nodes.SomeNode2:
+    derived_from: tosca.nodes.Root
+    capabilities:
+        host_child:
+          type: tosca.capabilities.ContainerChild
+    requirements:
+      - host:
+          capability: tosca.capabilities.Container
+          node: tosca.nodes.Compute
+          relationship: tosca.relationships.HostedOn
diff --git a/tosca2heat/tosca-parser/toscaparser/tests/data/custom_types/custom_cap.yaml b/tosca2heat/tosca-parser/toscaparser/tests/data/custom_types/custom_cap.yaml
new file mode 100644
index 0000000..018bcf6
--- /dev/null
+++ b/tosca2heat/tosca-parser/toscaparser/tests/data/custom_types/custom_cap.yaml
@@ -0,0 +1,22 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+capability_types:
+
+  tosca.capabilities.SomeCap:
+    derived_from: tosca.capabilities.Container
+
+node_types:
+
+  tosca.nodes.NodeWithReq:
+    derived_from: tosca.nodes.SoftwareComponent
+    requirements:
+      - host:
+          capability: tosca.capabilities.SomeCap
+          relationship: tosca.relationships.HostedOn
+          occurrences: [1, 1]
+
+  tosca.nodes.NodeWithCap:
+    derived_from: tosca.nodes.SoftwareComponent
+    capabilities:
+      host:
+        type: tosca.capabilities.SomeCap
diff --git a/tosca2heat/tosca-parser/toscaparser/tests/data/custom_types/node_with_cap.yaml b/tosca2heat/tosca-parser/toscaparser/tests/data/custom_types/node_with_cap.yaml
index b17513f..332f830 100644
--- a/tosca2heat/tosca-parser/toscaparser/tests/data/custom_types/node_with_cap.yaml
+++ b/tosca2heat/tosca-parser/toscaparser/tests/data/custom_types/node_with_cap.yaml
@@ -6,7 +6,7 @@ description: >
 capability_types:
 
   tosca.capabilities.SomeCap:
-    derived_from: tosca.capabilities.Root
+    derived_from: tosca.capabilities.Container
     properties:
       type:
         type: string
@@ -19,6 +19,11 @@ node_types:
 
   tosca.nodes.SomeNode:
     derived_from: tosca.nodes.Root
+    properties:
+      some_prop:
+        type: string
+        required: false
+        default: some
     requirements:
       - some_req:
           capability: tosca.capabilities.SomeCap
diff --git a/tosca2heat/tosca-parser/toscaparser/tests/data/functions/test_container_cap_child.yaml b/tosca2heat/tosca-parser/toscaparser/tests/data/functions/test_container_cap_child.yaml
new file mode 100644
index 0000000..84118c8
--- /dev/null
+++ b/tosca2heat/tosca-parser/toscaparser/tests/data/functions/test_container_cap_child.yaml
@@ -0,0 +1,28 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+description: >
+  TOSCA simple profile to test the get attribute function with HOST parameter
+  using a node that has as capability a child class of Container
+
+imports:
+  - ../custom_types/container_cap_child.yaml
+
+topology_template:
+
+  node_templates:
+
+    test_node:
+      type: tosca.nodes.SomeNode
+      properties:
+        some_prop: { get_attribute: [ HOST, public_address ] }
+      requirements:
+        - host_child: test_node2
+
+    test_node2:
+      type: tosca.nodes.SomeNode2
+      requirements:
+        - host: server
+
+    server:
+      type: tosca.nodes.Compute
+
diff --git a/tosca2heat/tosca-parser/toscaparser/tests/data/functions/test_get_prop_cap_bool.yaml b/tosca2heat/tosca-parser/toscaparser/tests/data/functions/test_get_prop_cap_bool.yaml
new file mode 100644
index 0000000..d9c4c1c
--- /dev/null
+++ b/tosca2heat/tosca-parser/toscaparser/tests/data/functions/test_get_prop_cap_bool.yaml
@@ -0,0 +1,37 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+description: TOSCA test for boolean properties
+
+node_types:
+
+  tosca.nodes.SoftwareComponentTest:
+    derived_from: tosca.nodes.SoftwareComponent
+    properties:
+      some_prop:
+        type: boolean
+
+  tosca.nodes.ComputeTest:
+    derived_from: tosca.nodes.Compute
+    capabilities:
+      endpoint:
+        type: tosca.capabilities.Endpoint
+
+topology_template:
+
+  node_templates:
+
+    software:
+      type: tosca.nodes.SoftwareComponentTest
+      properties:
+        some_prop: { get_property: [ HOST, endpoint, secure ] }
+      requirements:
+        - host: server
+
+    server:
+      type: tosca.nodes.ComputeTest
+      capabilities:
+        endpoint:
+          properties:
+            network_name: PUBLIC
+            secure: false
+
diff --git a/tosca2heat/tosca-parser/toscaparser/tests/data/functions/test_get_prop_cap_host.yaml b/tosca2heat/tosca-parser/toscaparser/tests/data/functions/test_get_prop_cap_host.yaml
new file mode 100644
index 0000000..7fcb4a7
--- /dev/null
+++ b/tosca2heat/tosca-parser/toscaparser/tests/data/functions/test_get_prop_cap_host.yaml
@@ -0,0 +1,25 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+ 
+description: TOSCA test for the IM
+
+imports:
+ - test: ../custom_types/node_with_cap.yaml
+
+topology_template:
+
+  node_templates:
+
+    some_node:
+      type: tosca.nodes.SomeNode
+      properties:
+        some_prop: { get_property: [ HOST, some_req, type ] }
+      requirements:
+        - some_req: server
+
+    server:
+      type: tosca.nodes.NodeWithCap
+      capabilities:
+        some_req:
+          properties:
+            type: someval
+
diff --git a/tosca2heat/tosca-parser/toscaparser/tests/data/policies/tosca_policy_template.yaml b/tosca2heat/tosca-parser/toscaparser/tests/data/policies/tosca_policy_template.yaml
index 47f7870..4c18d9d 100644
--- a/tosca2heat/tosca-parser/toscaparser/tests/data/policies/tosca_policy_template.yaml
+++ b/tosca2heat/tosca-parser/toscaparser/tests/data/policies/tosca_policy_template.yaml
@@ -75,6 +75,32 @@ topology_template:
                 inputs:
                  strategy: LEAST_USED
                  implementation: Senlin.webhook()
+           high_cpu_usage:
+             description: trigger
+             meter_name: cpu_util
+             condition:
+               constraint: utilization greater_than 60%
+               threshold: 60
+               period: 600
+               evaluations: 1
+               method: average
+               comparison_operator: gt
+             metadata: SG1
+             action: [SP1]
+
+           low_cpu_usage:
+             description: trigger
+             meter_name: cpu_util
+             condition:
+               constraint: utilization less_than 20%
+               threshold: 20
+               period: 600
+               evaluations: 1
+               method: average
+               comparison_operator: gt
+             metadata: SG1
+             action: [SP1]
+
     - my_groups_placement:
         type: mycompany.mytypes.myScalingPolicy
         targets: [ webserver_group ]
diff --git a/tosca2heat/tosca-parser/toscaparser/tests/data/test_custom_capabilty.yaml b/tosca2heat/tosca-parser/toscaparser/tests/data/test_custom_capabilty.yaml
new file mode 100644
index 0000000..03a8a07
--- /dev/null
+++ b/tosca2heat/tosca-parser/toscaparser/tests/data/test_custom_capabilty.yaml
@@ -0,0 +1,23 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+description: TOSCA simple profile to test a custom defined capability
+
+imports:
+  - custom_types/custom_cap.yaml
+
+topology_template:
+
+  node_templates:
+
+    node_req:
+      type: tosca.nodes.NodeWithReq
+      requirements:
+        - host: node_cap
+
+    node_cap:
+      type: tosca.nodes.NodeWithCap
+      requirements:
+        - host: server
+
+    server:
+      type: tosca.nodes.Compute
diff --git a/tosca2heat/tosca-parser/toscaparser/tests/data/topology_template/definitions.yaml b/tosca2heat/tosca-parser/toscaparser/tests/data/topology_template/definitions.yaml
index ba5eac1..300bb8a 100644
--- a/tosca2heat/tosca-parser/toscaparser/tests/data/topology_template/definitions.yaml
+++ b/tosca2heat/tosca-parser/toscaparser/tests/data/topology_template/definitions.yaml
@@ -49,7 +49,7 @@ node_types:
     derived_from: tosca.nodes.Database
 
   example.SomeApp:
-    derived_from: tosca.nodes.SoftwareComponent
+    derived_from: tosca.nodes.WebApplication
     properties:
       admin_user:
         type: string