Synchronise the openstack bugs

When run unittests through tox, some test cases are always error,
the errors are already done in openstack community, so it's
necessary to synchronise the fixes.

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

13 files changed, 285 insertions, 8 deletions

diff --git a/tosca2heat/tosca-parser/toscaparser/tests/data/custom_types/compute_with_nested_atributes.yaml b/tosca2heat/tosca-parser/toscaparser/tests/data/custom_types/compute_with_nested_atributes.yaml
new file mode 100644
index 0000000..f23a8a1
--- /dev/null
+++ b/tosca2heat/tosca-parser/toscaparser/tests/data/custom_types/compute_with_nested_atributes.yaml
@@ -0,0 +1,22 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+description: Compute node type with capability with an atribute of type list
+
+capability_types:
+
+  tosca.capabilities.indigo.Endpoint:
+    derived_from: tosca.capabilities.Endpoint
+    attributes:
+      credential:
+        type: list
+        entry_schema:
+          type: tosca.datatypes.Credential
+
+node_types:
+
+  tosca.nodes.ComputeWithCapWithAttr:
+    derived_from: tosca.nodes.Compute
+    capabilities:
+      endpoint:
+        type: tosca.capabilities.indigo.Endpoint
+
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 11e1b51..b17513f 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
@@ -3,7 +3,8 @@ tosca_definitions_version: tosca_simple_yaml_1_0
 description: >
   Node type that has a requirement of a capability with a defined value
 
-node_types:
+capability_types:
+
   tosca.capabilities.SomeCap:
     derived_from: tosca.capabilities.Root
     properties:
@@ -14,6 +15,8 @@ node_types:
         constraints:
           - equal: someval
 
+node_types:
+
   tosca.nodes.SomeNode:
     derived_from: tosca.nodes.Root
     requirements:
diff --git a/tosca2heat/tosca-parser/toscaparser/tests/data/datatypes/test_datatype_portspec_add_req.yaml b/tosca2heat/tosca-parser/toscaparser/tests/data/datatypes/test_datatype_portspec_add_req.yaml
new file mode 100644
index 0000000..f944927
--- /dev/null
+++ b/tosca2heat/tosca-parser/toscaparser/tests/data/datatypes/test_datatype_portspec_add_req.yaml
@@ -0,0 +1,41 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+description: TOSCA test PortSpec Additional Requirement clauses
+
+node_types:
+
+  MyNodeType:
+    derived_from: Root
+    properties:
+      test_port:
+        type: PortSpec
+
+topology_template:
+
+  node_templates:
+
+    # Test invalid source value below (default) specified range constraint
+    test_node2:
+      type: MyNodeType
+      properties:
+        test_port:
+          protocol: tcp
+          source: 0
+
+    # Test invalid source value over specified range
+    test_node3:
+      type: MyNodeType
+      properties:
+        test_port:
+          protocol: tcp
+          source: 65535
+          source_range: [ 2, 65534 ]
+
+    # Test invalid source value under specified range
+    test_node4:
+      type: MyNodeType
+      properties:
+        test_port:
+          protocol: tcp
+          source: 1
+          source_range: [ 2, 65534 ]
diff --git a/tosca2heat/tosca-parser/toscaparser/tests/data/functions/test_get_attribute_with_index_error.yaml b/tosca2heat/tosca-parser/toscaparser/tests/data/functions/test_get_attribute_with_index_error.yaml
index 88a2721..7511999 100644
--- a/tosca2heat/tosca-parser/toscaparser/tests/data/functions/test_get_attribute_with_index_error.yaml
+++ b/tosca2heat/tosca-parser/toscaparser/tests/data/functions/test_get_attribute_with_index_error.yaml
@@ -1,7 +1,7 @@
 tosca_definitions_version: tosca_simple_yaml_1_0
 
 description: >
-  TOSCA template for testing get_attribute with a list attribute and an index
+  TOSCA template for testing get_attribute with an incorrect index
 
 imports:
   - ../custom_types/compute_with_attribute_list.yaml
diff --git a/tosca2heat/tosca-parser/toscaparser/tests/data/functions/test_get_attribute_with_nested_params.yaml b/tosca2heat/tosca-parser/toscaparser/tests/data/functions/test_get_attribute_with_nested_params.yaml
new file mode 100644
index 0000000..79e632c
--- /dev/null
+++ b/tosca2heat/tosca-parser/toscaparser/tests/data/functions/test_get_attribute_with_nested_params.yaml
@@ -0,0 +1,23 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+description: >
+  TOSCA template for testing get_attribute with nested attributes
+
+imports:
+  - ../custom_types/compute_with_nested_atributes.yaml
+
+topology_template:
+  node_templates:
+    server:
+      type: tosca.nodes.ComputeWithCapWithAttr
+      capabilities:
+        endpoint:
+          properties:
+            port: 80
+      interfaces:
+        Standard:
+          configure:
+            implementation: configure.sh
+            inputs:
+              ip_address: { get_attribute: [ SELF, endpoint, credential, 0, token ] }
+
diff --git a/tosca2heat/tosca-parser/toscaparser/tests/data/functions/test_token.yaml b/tosca2heat/tosca-parser/toscaparser/tests/data/functions/test_token.yaml
new file mode 100644
index 0000000..495a930
--- /dev/null
+++ b/tosca2heat/tosca-parser/toscaparser/tests/data/functions/test_token.yaml
@@ -0,0 +1,15 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+description: Template for deploying a single server with token function.
+
+topology_template:
+  node_templates:
+    server:
+      type: tosca.nodes.Compute
+
+  outputs:
+    url:
+      description: Get the first part of the ip
+      value: { token: [ get_attribute: [ server, public_address ],
+                         '.' ,
+                         0 ] }
diff --git a/tosca2heat/tosca-parser/toscaparser/tests/data/functions/test_token_invalid.yaml b/tosca2heat/tosca-parser/toscaparser/tests/data/functions/test_token_invalid.yaml
new file mode 100644
index 0000000..35ae2ff
--- /dev/null
+++ b/tosca2heat/tosca-parser/toscaparser/tests/data/functions/test_token_invalid.yaml
@@ -0,0 +1,17 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+description: Template for deploying a single server with invalid token function.
+
+topology_template:
+  outputs:
+    invalid_token_syntax_1:
+      description: test token with only two paremeters.
+      value: { token: ["some_string", "_"]}
+
+    invalid_token_syntax_2:
+      description: test token with invalid string as third argument.
+      value: { token: ["some_string", "_", "1"]}
+
+    invalid_token_syntax_3:
+      description: test token with invalid string as second argument.
+      value: { token: ["some_string", "aa", "1"]}
diff --git a/tosca2heat/tosca-parser/toscaparser/tests/data/test_containers.yaml b/tosca2heat/tosca-parser/toscaparser/tests/data/test_containers.yaml
new file mode 100644
index 0000000..ba1cc16
--- /dev/null
+++ b/tosca2heat/tosca-parser/toscaparser/tests/data/test_containers.yaml
@@ -0,0 +1,44 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+description: >
+  TOSCA simple profile with mysql docker container.
+
+# Repositories to retrieve code artifacts from
+repositories:
+  docker_hub: https://registry.hub.docker.com/
+
+topology_template:
+
+  inputs:
+    mysql_root_pwd:
+      type: string
+      description: Root password for MySQL.
+
+  node_templates:
+    # The MYSQL container based on official MySQL image in Docker hub
+    mysql_container:
+      type: tosca.nodes.Container.Application
+      requirements:
+        - host: mysql_runtime
+      artifacts:
+        my_image:
+          file: mysql
+          type: tosca.artifacts.Deployment.Image.Container.Docker
+          repository: docker_hub
+      interfaces:
+        Standard:
+          create:
+            implementation: my_image
+            inputs:
+              MYSQL_ROOT_PASSWORD: { get_input: mysql_root_pwd }
+
+    # The properties of the runtime to host the container
+    mysql_runtime:
+      type: tosca.nodes.Container.Runtime
+      capabilities:
+        host:
+          properties:
+            num_cpus: 1
+            disk_size: 10 GB
+            mem_size: 2 MB
+
diff --git a/tosca2heat/tosca-parser/toscaparser/tests/data/test_credential_datatype.yaml b/tosca2heat/tosca-parser/toscaparser/tests/data/test_credential_datatype.yaml
new file mode 100644
index 0000000..583ec82
--- /dev/null
+++ b/tosca2heat/tosca-parser/toscaparser/tests/data/test_credential_datatype.yaml
@@ -0,0 +1,77 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+description: >
+  TOSCA simple profile with to demonstrate the usage of the
+  TOSCA Credential Data Type.
+
+imports:
+  - custom_types/wordpress.yaml
+
+relationship_types:
+  my.types.WordpressDbConnection:
+    derived_from: tosca.relationships.ConnectsTo
+    properties:
+      credential:
+        user: db_user
+        token: db_pwd
+
+topology_template:
+  node_templates:
+    wordpress:
+      type: tosca.nodes.WebApplication.WordPress
+      requirements:
+        - host: webserver
+        - database_endpoint:
+            node: mysql_database
+            relationship: my.types.WordpressDbConnection
+
+    mysql_database:
+      type: tosca.nodes.Database
+      properties:
+        name: db_name
+        user: db_user
+        password: db_pwd
+      capabilities:
+        database_endpoint:
+          properties:
+            port: 3306
+      requirements:
+        - host:
+            node: mysql_dbms
+
+    mysql_dbms:
+      type: tosca.nodes.DBMS
+      properties:
+        root_password: db_root_pwd
+        port: 3306
+      requirements:
+        - host: server
+
+    webserver:
+      type: tosca.nodes.WebServer
+      properties:
+        admin_credential:
+          user: username
+          token: some_pass
+      requirements:
+        - host: server
+
+    server:
+      type: tosca.nodes.Compute
+      capabilities:
+        host:
+          properties:
+            disk_size: 10 GB
+            num_cpus: 1
+            mem_size: 4096 MB
+        os:
+          properties:
+            architecture: x86_64
+            type: Linux
+            distribution: Ubuntu
+            version: 14.04
+
+  outputs:
+    website_url:
+      description: URL for Wordpress wiki.
+      value: { get_attribute: [server, private_address] }
diff --git a/tosca2heat/tosca-parser/toscaparser/tests/data/test_invalid_input_defaults.yaml b/tosca2heat/tosca-parser/toscaparser/tests/data/test_invalid_input_defaults.yaml
new file mode 100644
index 0000000..f8f4ae7
--- /dev/null
+++ b/tosca2heat/tosca-parser/toscaparser/tests/data/test_invalid_input_defaults.yaml
@@ -0,0 +1,12 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+description: Test template with default not matching required type.
+
+topology_template:
+  inputs:
+    invalid_default:
+      type: integer
+      default: two
+    valid_default:
+      type: integer
+      default: 2
diff --git a/tosca2heat/tosca-parser/toscaparser/tests/data/test_repositories_definition.yaml b/tosca2heat/tosca-parser/toscaparser/tests/data/test_repositories_definition.yaml
index 2145d8f..c2856c8 100644
--- a/tosca2heat/tosca-parser/toscaparser/tests/data/test_repositories_definition.yaml
+++ b/tosca2heat/tosca-parser/toscaparser/tests/data/test_repositories_definition.yaml
@@ -4,9 +4,9 @@ repositories:
   some_repository:
     description: Some repo
     url: https://raw.githubusercontent.com/openstack/tosca-parser/master/toscaparser/tests/data/custom_types/
-    namespace_uri: http://docs.oasis-open.org/tosca/ns/simple/yaml/1.0a
-    namespace_prefix: oasis_tosca
-
+    credential: #type: Credential
+      token_type: basic_auth
+      token: myusername:mypassword
 imports:
   - some_import:
       file: compute_with_prop.yaml
diff --git a/tosca2heat/tosca-parser/toscaparser/tests/data/topology_template/subsystem.yaml b/tosca2heat/tosca-parser/toscaparser/tests/data/topology_template/subsystem.yaml
index 99d645b..b27e698 100644
--- a/tosca2heat/tosca-parser/toscaparser/tests/data/topology_template/subsystem.yaml
+++ b/tosca2heat/tosca-parser/toscaparser/tests/data/topology_template/subsystem.yaml
@@ -12,15 +12,12 @@ topology_template:
   inputs:
     mq_server_ip:
       type: string
-      required: true
       description: IP address of the message queuing server to receive messages from.
     receiver_port:
       type: string
-      required: true
       description: Port to be used for receiving messages.
     my_cpus:
       type: integer
-      default: 2
       description: Number of CPUs for the server.
       constraints:
         - valid_values: [ 1, 2, 4, 8 ]
diff --git a/tosca2heat/tosca-parser/toscaparser/tests/data/tosca_repositories_test_definition.yaml b/tosca2heat/tosca-parser/toscaparser/tests/data/tosca_repositories_test_definition.yaml
new file mode 100644
index 0000000..0001d06
--- /dev/null
+++ b/tosca2heat/tosca-parser/toscaparser/tests/data/tosca_repositories_test_definition.yaml
@@ -0,0 +1,26 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+description: TOSCA simple profile with repositories validation and imports.
+
+repositories:
+  repo_code0: https://raw.githubusercontent.com/nandinivemula/intern
+  repo_code1:
+    description: My project's code Repository in github usercontent.
+    url: https://raw.githubusercontent.com/nandinivemula/intern/master
+    credential: #type: Credential
+      token_type: basic_auth
+      token: myusername:mypassword
+
+  repo_code2:
+    description: My Project's code Repository in github.
+    url: https://github.com/nandinivemula/intern/master
+    credential: #type: Credential
+      token_type: basic_auth
+      token: myusername:mypassword
+
+imports:
+  - sample_import:
+      file: tosca_repository_import.yaml
+      repository: repo_code1
+      namespace_uri: https://github.com/nandinivemula/intern
+      namespace_prefix: intern