From 56e56b8860cf6e7ad70dc65134e8fd87eaf01123 Mon Sep 17 00:00:00 2001
From: ojasdubey <ojas.dubey@amdocs.com>
Date: Tue, 6 Mar 2018 12:01:54 +0530
Subject: VLAN tagging - VFC Instance Group

1. Create VFC instance group per sub-interface
network role
2. Refactored PortTemplateConsolidationData and
its references based on review comments
3. Updated test data after rebase
4. Updated to flatMap based on review
comments

Change-Id: I423593c5156ecae5eff3a4f2ce8591c85db727cc
Issue-ID: SDC-1073
Signed-off-by: ojasdubey <ojas.dubey@amdocs.com>
---
 .../nested_pattern5_levelTwoServiceTemplate.yaml   | 66 ++++++++++++++--------
 1 file changed, 42 insertions(+), 24 deletions(-)

(limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml')

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
index 290f8595ce..5d7b81aaa3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
@@ -8,31 +8,49 @@ imports:
     file: GlobalSubstitutionTypesServiceTemplate.yaml
 topology_template:
   inputs:
-    port_net:
+    Vlan_network_collection_function:
+      type: string
+      required: true
+    ps_server_1b_ips:
       hidden: false
       immutable: false
       type: string
-      description: port network
-    ps_server_2b_ips:
+    security_group_name:
+      hidden: false
+      immutable: false
+      type: list
+      description: CMAUI1, CMAUI2 server names
+      entry_schema:
+        type: string
+    ps_server_1b_names:
+      hidden: false
+      immutable: false
+      type: list
+      description: Ps server names
+      entry_schema:
+        type: string
+    packet_ext_network_name:
       hidden: false
       immutable: false
       type: string
-    ps_server_1b_ips:
+      description: network name
+    port_net:
       hidden: false
       immutable: false
       type: string
-    packet_int_network_name:
+      description: port network
+    ps_server_2b_ips:
       hidden: false
       immutable: false
       type: string
-      description: network name
-    security_group_name:
+    packet_int_network_name:
       hidden: false
       immutable: false
-      type: list
-      description: CMAUI1, CMAUI2 server names
-      entry_schema:
-        type: string
+      type: string
+      description: network name
+    Vlan_vfc_instance_group_function:
+      type: string
+      required: true
     availability_zone_0:
       label: availabilityzone name
       hidden: false
@@ -54,18 +72,6 @@ topology_template:
       immutable: false
       type: string
       description: sub interface network
-    ps_server_1b_names:
-      hidden: false
-      immutable: false
-      type: list
-      description: Ps server names
-      entry_schema:
-        type: string
-    packet_ext_network_name:
-      hidden: false
-      immutable: false
-      type: string
-      description: network name
   node_templates:
     abstract_ps_server_1b_0:
       type: org.openecomp.resource.abstract.nodes.ps_server_1b
@@ -196,6 +202,18 @@ topology_template:
           node: packet_ext_network
           relationship: tosca.relationships.network.LinksTo
   groups:
+    Vlan_group:
+      type: org.openecomp.groups.VfcInstanceGroup
+      properties:
+        vfc_parent_port_role: 1b
+        network_collection_function:
+          get_input: Vlan_network_collection_function
+        vfc_instance_group_function:
+          get_input: Vlan_vfc_instance_group_function
+        subinterface_role: Vlan
+      members:
+      - abstract_ps_server_1b_0
+      - abstract_ps_server_1b_1
     nested_pattern5_levelTwo_group:
       type: org.openecomp.groups.heat.HeatStack
       properties:
@@ -599,4 +617,4 @@ topology_template:
       - dependency_ps_server_1b
       dependency_server_1b_ps_2:
       - abstract_ps_server_1b_1
-      - dependency_ps_server_1b
+      - dependency_ps_server_1b
\ No newline at end of file
-- 
cgit 1.2.3-korg