[sdc] - last merges before moving to LF

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

1 files changed, 8 insertions, 24 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/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/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml
index 973ca85b4d..6f2b5a7ca4 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/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/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -12,15 +12,11 @@ node_types:
 topology_template:
   inputs:
     port_pcm_port_0_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_pcm_port_1_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     availabilityzone_name:
       label: availabilityzone name
       hidden: false
@@ -39,25 +35,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
@@ -83,10 +71,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
     server_group:
       hidden: false
       immutable: false
@@ -161,10 +147,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