[SDC-29] rebase continue work to align source

[sdc.git] / openecomp-be / lib / openecomp-sdc-translator-lib / openecomp-sdc-translator-core / src / test / resources / mock / services / heattotosca / fulltest / mixPatterns / dependencyConnectivity / out / GlobalSubstitutionTypesServiceTemplate.yaml

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 3213f60..536511a 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -922,6 +922,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_pcm_port_0_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       server_group:
         type: string
         required: true
@@ -936,6 +942,12 @@ node_types:
         description: CPS network gateway
         required: true
         status: SUPPORTED
+      port_pcm_port_0_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       pcm_image_name:
         type: string
         description: PCRF CM image name
@@ -951,11 +963,35 @@ node_types:
         description: CPS network ip
         required: true
         status: SUPPORTED
+      port_pcm_port_1_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
         status: SUPPORTED
+      port_pcm_port_0_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pcm_port_0_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pcm_port_1_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
@@ -986,11 +1022,35 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
+      port_pcm_port_1_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pcm_port_0_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       oam_net_name:
         type: string
         description: OAM network name
         required: true
         status: SUPPORTED
+      port_pcm_port_1_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pcm_port_1_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
     attributes:
       server_pcm_id:
         type: string
@@ -1413,7 +1473,13 @@ node_types:
   org.openecomp.resource.abstract.nodes.1c1_scalling_instance:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_1c1_t1_port_fixed_ips:
+      port_1c1_t1_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1c1_t2_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
@@ -1425,24 +1491,80 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1c1_t2_port_ip_requirements:
+      port_1c1_t2_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1c1_t1_port_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_1c1_t1_port_mac_requirements:
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      compute_1c1_scalling_instance_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c1_t1_port_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c1_t1_port_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c1_t2_port_fixed_ips:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_1c1_t2_port_network_role_tag:
+      port_1c1_t2_port_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
+      port_1c1_t1_port_fixed_ips:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1c1_t1_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1c1_t2_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1c1_t1_port_mac_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -1451,74 +1573,78 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      port_1c1_t2_port_mac_requirements:
+      port_1c1_t2_port_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      vm_flavor_name:
-        type: string
+          type: string
+      port_1c1_t2_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_1c1_t2_port_mac_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: json
       compute_1c1_scalling_instance_availability_zone:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1c1_t1_port_ip_requirements:
+      port_1c1_t2_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: string
       port_1c1_t2_port_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
       compute_1c1_scalling_instance_scheduler_hints:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      compute_1c1_scalling_instance_name:
+      port_1c1_t2_port_exCP_naming:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_1c1_t1_port_name:
+          type: json
+      port_1c1_t1_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1c1_t1_port_network:
+      port_1c1_t1_port_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1c1_t2_port_fixed_ips:
+      port_1c1_t1_port_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      port_1c1_t2_port_network:
+          type: string
+      port_1c1_t1_port_order:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
+          type: integer
     attributes:
       1c1_scalling_instance_instance_name:
         type: list
@@ -1947,6 +2073,74 @@ node_types:
   org.openecomp.resource.abstract.nodes.a_single_1a:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_1a_t1_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1a_t2_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1a_t2_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1a_t2_port_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1a_t1_port_mac_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1a_t1_port_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1a_t1_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1a_t2_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1a_t1_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1a_t1_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       compute_a_single_1a_availability_zone:
         type: list
         required: true
@@ -1967,50 +2161,48 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      port_1a_t1_port_ip_requirements:
+      port_1a_t1_port_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      port_1a_t2_port_network_role_tag:
+          type: string
+      port_1a_t1_port_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_1a_t1_port_order:
+        type: list
         required: true
         status: SUPPORTED
-      port_1a_t2_port_network:
+        entry_schema:
+          type: integer
+      port_1a_t2_port_exCP_naming:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_1a_t1_port_mac_requirements:
+          type: json
+      port_1a_t2_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_1a_t1_port_network:
+      port_1a_t2_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_1a_t2_port_ip_requirements:
+      port_1a_t2_port_order:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: integer
       compute_a_single_1a_user_data_format:
         type: list
         required: true
@@ -2457,6 +2649,74 @@ node_types:
   org.openecomp.resource.abstract.nodes.b_single_1b_1:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_1b_t1_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_1b_t1_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t1_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1b_t1_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1b_t2_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t2_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      compute_b_single_1b_user_data_format:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t2_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1b_t2_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t2_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_1b_t2_port_mac_requirements:
         type: list
         required: true
@@ -2483,32 +2743,30 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      port_1b_t2_port_ip_requirements:
+      port_1b_t2_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      vm_flavor_name:
-        type: string
+      port_1b_t2_port_ip_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: json
       port_1b_t1_port_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1b_t1_port_ip_requirements:
+      port_1b_t1_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
+          type: string
       port_1b_t1_port_mac_requirements:
         type: list
         required: true
@@ -2521,12 +2779,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_b_single_1b_user_data_format:
+      port_1b_t1_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
+          type: json
       port_1b_t1_port_network:
         type: list
         required: true
@@ -2967,12 +3225,86 @@ node_types:
   org.openecomp.resource.abstract.nodes.1c2_catalog_instance_0:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_1c2_t2_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      compute_1c2_catalog_instance_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t2_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t2_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1c2_t2_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t1_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1c2_t2_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1c2_t1_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_1c2_t1_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t2_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       port_1c2_t1_port_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
+      port_1c2_t1_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_1c2_t2_port_network:
         type: list
         required: true
@@ -2987,22 +3319,18 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      compute_1c2_catalog_instance_availability_zone:
+      compute_1c2_catalog_instance_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_1c2_catalog_instance_name:
+      port_1c2_t1_port_exCP_naming:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      vm_flavor_name:
-        type: string
-        required: true
-        status: SUPPORTED
+          type: json
       port_1c2_t1_port_network:
         type: list
         required: true
@@ -3015,11 +3343,7 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_1c2_t2_port_ip_requirements:
+      port_1c2_t2_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
@@ -3477,12 +3801,86 @@ node_types:
   org.openecomp.resource.abstract.nodes.1c2_catalog_instance_1:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_1c2_t2_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      compute_1c2_catalog_instance_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t2_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t2_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1c2_t2_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t1_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1c2_t2_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1c2_t1_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_1c2_t1_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t2_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       port_1c2_t1_port_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
+      port_1c2_t1_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_1c2_t2_port_network:
         type: list
         required: true
@@ -3497,22 +3895,18 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      compute_1c2_catalog_instance_availability_zone:
+      compute_1c2_catalog_instance_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_1c2_catalog_instance_name:
+      port_1c2_t1_port_exCP_naming:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      vm_flavor_name:
-        type: string
-        required: true
-        status: SUPPORTED
+          type: json
       port_1c2_t1_port_network:
         type: list
         required: true
@@ -3525,11 +3919,7 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_1c2_t2_port_ip_requirements:
+      port_1c2_t2_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
@@ -4056,16 +4446,6 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      port_1b_t1_port_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
       compute_b_single_1b_availability_zone:
         type: list
         required: true
@@ -4086,6 +4466,62 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
+      port_1b_t1_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_1b_t2_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1b_t2_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1b_t1_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t1_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1b_t1_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t1_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1b_t1_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_1b_t1_port_mac_requirements:
         type: list
         required: true
@@ -4098,7 +4534,19 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1b_t2_port_ip_requirements:
+      port_1b_t2_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t2_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_1b_t1_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
@@ -4110,16 +4558,30 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_1b_t2_port_exCP_naming:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: json
       compute_b_single_1b_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
+      port_1b_t2_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t2_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
     attributes:
       b_single_1b_instance_name:
         type: list