[sdc] - last merges before moving to LF

Change-Id: I0df3ec795f0de84229ea4bb4806ec8f959243557
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>

4 files changed, 33 insertions, 97 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 3e8521f381..e7c81c3c8a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -9,11 +9,9 @@ node_types:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
       port_pcm_port_0_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       p1:
         type: string
         description: UID of OAM network
@@ -25,11 +23,9 @@ node_types:
         required: true
         status: SUPPORTED
       port_pcm_port_1_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       availabilityzone_name:
         type: string
         description: availabilityzone name
@@ -47,29 +43,21 @@ node_types:
         required: true
         status: SUPPORTED
       port_pcm_port_0_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       port_pcm_port_0_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_pcm_port_1_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_pcm_port_0_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       pcm_server_name:
         type: string
         description: PCRF CM server name
@@ -94,11 +82,9 @@ node_types:
         required: true
         status: SUPPORTED
       port_pcm_port_1_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_pcm_port_0_ip_requirements:
         type: list
         required: true
@@ -166,11 +152,9 @@ node_types:
         required: true
         status: SUPPORTED
       port_pcm_port_1_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
     attributes:
       server_pcm_id:
         type: string
@@ -599,45 +583,35 @@ node_types:
         required: true
         status: SUPPORTED
       port_oam_port_1_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
         status: SUPPORTED
       port_oam_port_0_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_oam_port_1_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       oam_server_name:
         type: string
         description: oam server name
         required: true
         status: SUPPORTED
       port_oam_port_0_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_oam_port_1_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_oam_port_1_ip_requirements:
         type: list
         required: true
@@ -649,17 +623,13 @@ node_types:
         required: true
         status: SUPPORTED
       port_oam_port_1_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       port_oam_port_0_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_oam_port_1_vlan_requirements:
         type: list
         required: true
@@ -706,11 +676,9 @@ node_types:
         required: true
         status: SUPPORTED
       port_oam_port_0_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       port_oam_port_0_vlan_requirements:
         type: list
         required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/MainServiceTemplate.yaml
index e297848243..b19b647852 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/MainServiceTemplate.yaml
@@ -481,4 +481,4 @@ topology_template:
         description: |
           Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
       members:
-      - abstract_oam_server_1
\ No newline at end of file
+      - abstract_oam_server_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml
index ccd5ed5c66..ede031ca2d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml
@@ -17,10 +17,8 @@ topology_template:
       type: string
       description: UID of OAM network
     port_oam_port_1_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     availabilityzone_name:
       label: availabilityzone name
       hidden: false
@@ -28,15 +26,11 @@ topology_template:
       type: string
       description: availabilityzone name
     port_oam_port_0_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_oam_port_1_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     oam_server_name:
       label: oam server name
       hidden: false
@@ -44,15 +38,11 @@ topology_template:
       type: string
       description: oam server name
     port_oam_port_0_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_oam_port_1_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_oam_port_1_ip_requirements:
       type: list
       required: true
@@ -62,15 +52,11 @@ topology_template:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
     port_oam_port_1_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     port_oam_port_0_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_oam_port_1_vlan_requirements:
       type: list
       required: true
@@ -122,10 +108,8 @@ topology_template:
       type: string
       description: CPS network ip
     port_oam_port_0_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     port_oam_port_0_vlan_requirements:
       type: list
       required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-pcm_v0.1ServiceTemplate.yaml
index 6309367294..65d3a2223c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -12,10 +12,8 @@ node_types:
 topology_template:
   inputs:
     port_pcm_port_0_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     p1:
       hidden: false
       immutable: false
@@ -27,10 +25,8 @@ topology_template:
       type: string
       description: UID of OAM network
     port_pcm_port_1_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     availabilityzone_name:
       label: availabilityzone name
       hidden: false
@@ -49,25 +45,17 @@ topology_template:
       type: string
       description: PCRF CM image name
     port_pcm_port_0_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     port_pcm_port_0_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_pcm_port_1_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_pcm_port_0_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     pcm_server_name:
       label: PCRF CM server name
       hidden: false
@@ -93,10 +81,8 @@ topology_template:
       type: string
       description: OAM network name
     port_pcm_port_1_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_pcm_port_0_ip_requirements:
       type: list
       required: true
@@ -167,10 +153,8 @@ topology_template:
       type: string
       description: CPS network mask
     port_pcm_port_1_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
   node_templates:
     pcm_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port