Sync upstream code

Sync upstream project of tosca-parser

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

4 files changed, 136 insertions, 0 deletions

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 77829c6..ba5eac1 100644
--- a/tosca2heat/tosca-parser/toscaparser/tests/data/topology_template/definitions.yaml
+++ b/tosca2heat/tosca-parser/toscaparser/tests/data/topology_template/definitions.yaml
@@ -27,8 +27,10 @@ node_types:
     properties:
       mq_server_ip:
         type: string
+        required: False
       receiver_port:
         type: integer
+        required: False
     attributes:
       receiver_ip:
         type: string
@@ -51,8 +53,10 @@ node_types:
     properties:
       admin_user:
         type: string
+        required: False
       pool_size:
         type: integer
+        required: False
     capabilities:
       message_receiver:
         type: example.capabilities.Receiver
diff --git a/tosca2heat/tosca-parser/toscaparser/tests/data/topology_template/validate/test_example_app_substitution_mappings.yaml b/tosca2heat/tosca-parser/toscaparser/tests/data/topology_template/validate/test_example_app_substitution_mappings.yaml
new file mode 100644
index 0000000..718022a
--- /dev/null
+++ b/tosca2heat/tosca-parser/toscaparser/tests/data/topology_template/validate/test_example_app_substitution_mappings.yaml
@@ -0,0 +1,70 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+description: >
+    Template showing an example TOSCA type to demonstrate usage
+    of output in the substitution mappings.
+
+node_types:
+  example.app:
+    derived_from: tosca.nodes.WebApplication
+    properties:
+      mq_server_ip:
+        type: string
+        required: False
+      receiver_port:
+        type: integer
+        required: False
+    attributes:
+      receiver_ip:
+        type: string
+      receiver_port:
+        type: integer
+
+topology_template:
+  inputs:
+    mq_server_ip:
+      type: string
+      description: IP address of the message queuing server to receive messages from.
+      default: 127.0.0.1
+    receiver_port:
+      type: integer
+      description: Port to be used for receiving messages.
+      default: 8080
+    my_cpus:
+      type: integer
+      description: Number of CPUs for the server.
+      default: 2
+      constraints:
+        - valid_values: [ 1, 2, 4, 8 ]
+
+  substitution_mappings:
+    node_type: example.app
+
+  node_templates:
+    app:
+      type: example.app
+      properties:
+        mq_server_ip: { get_input: mq_server_ip }
+        receiver_port: { get_input: receiver_port }
+      requirements:
+        - host:
+            node: websrv
+    websrv:
+      type: tosca.nodes.WebServer
+      requirements:
+        - host:
+            node: server
+    server:
+      type: tosca.nodes.Compute
+      capabilities:
+        host:
+          properties:
+            disk_size: 10 GB
+            num_cpus: { get_input: my_cpus }
+            mem_size: 4096 MB
+        os:
+          properties:
+            architecture: x86_64
+            type: Linux
+            distribution: Ubuntu
+            version: 14.04
diff --git a/tosca2heat/tosca-parser/toscaparser/tests/data/topology_template/validate/test_substitution_mappings_invalid_output.yaml b/tosca2heat/tosca-parser/toscaparser/tests/data/topology_template/validate/test_substitution_mappings_invalid_output.yaml
new file mode 100644
index 0000000..ef21811
--- /dev/null
+++ b/tosca2heat/tosca-parser/toscaparser/tests/data/topology_template/validate/test_substitution_mappings_invalid_output.yaml
@@ -0,0 +1,31 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+imports:
+  - test_example_app_substitution_mappings.yaml
+
+topology_template:
+  description: >
+     Test template showing valid output section containing attribute defined
+     in the substitution mappings in the imported yaml file.
+
+  inputs:
+    mq_server_ip:
+      type: string
+      default: 127.0.0.1
+      description: IP address of the message queuing server to receive messages from.
+    mq_server_port:
+      type: integer
+      default: 8080
+      description: Port to be used for receiving messages.
+
+  node_templates:
+    substitute_app:
+      type: example.app
+      properties:
+        mq_server_ip: { get_input:  mq_server_ip }
+        receiver_port: { get_input: mq_server_port }
+
+  outputs:
+    receiver_ip:
+      description: private IP address of the message receiver application
+      value: { get_attribute: [ substitute_app, my_cpu_output ] }
\ No newline at end of file
diff --git a/tosca2heat/tosca-parser/toscaparser/tests/data/topology_template/validate/test_substitution_mappings_valid_output.yaml b/tosca2heat/tosca-parser/toscaparser/tests/data/topology_template/validate/test_substitution_mappings_valid_output.yaml
new file mode 100644
index 0000000..766ca87
--- /dev/null
+++ b/tosca2heat/tosca-parser/toscaparser/tests/data/topology_template/validate/test_substitution_mappings_valid_output.yaml
@@ -0,0 +1,31 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+imports:
+  - test_example_app_substitution_mappings.yaml
+
+topology_template:
+  description: >
+     Test template showing valid output section containing attribute defined
+     in the substitution mappings in the imported yaml file.
+
+  inputs:
+    mq_server_ip:
+      type: string
+      default: 127.0.0.1
+      description: IP address of the message queuing server to receive messages from.
+    mq_server_port:
+      type: integer
+      default: 8080
+      description: Port to be used for receiving messages.
+
+  node_templates:
+    sustitute_app:
+      type: example.app
+      properties:
+        mq_server_ip: { get_input:  mq_server_ip }
+        receiver_port: { get_input: mq_server_port }
+
+  outputs:
+    receiver_ip:
+      description: private IP address of the message receiver application
+      value: { get_attribute: [ sustitute_app, receiver_ip ] }
\ No newline at end of file