Code change to evaluate Network role

Code change to evaluate Network Role of Sub interface resource

Change-Id: I0e29c0a1512b76b6db569aaf534f5e59868ae715
Issue-ID: SDC-1072
Signed-off-by: siddharth0905 <siddharth.singh4@amdocs.com>

1 files changed, 19 insertions, 37 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5ServiceTemplate.yaml
index 3add46dce6..2a33ee306c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5ServiceTemplate.yaml
@@ -8,9 +8,25 @@ imports:
     file: GlobalSubstitutionTypesServiceTemplate.yaml
 topology_template:
   inputs:
-    Vlan_network_collection_function:
+    port_net:
+      hidden: false
+      immutable: false
+      type: string
+      description: port network
+    pd_server_1b_flavor:
+      hidden: false
+      immutable: false
+      type: string
+      description: Flavor for PD server
+    pd_server_1b_ips:
+      hidden: false
+      immutable: false
+      type: string
+    packet_external_network_name:
+      hidden: false
+      immutable: false
       type: string
-      required: true
+      description: network name
     packet_internal_network_name:
       hidden: false
       immutable: false
@@ -30,28 +46,6 @@ topology_template:
       description: CMAUI1, CMAUI2 server names
       entry_schema:
         type: string
-    port_net:
-      hidden: false
-      immutable: false
-      type: string
-      description: port network
-    pd_server_1b_flavor:
-      hidden: false
-      immutable: false
-      type: string
-      description: Flavor for PD server
-    pd_server_1b_ips:
-      hidden: false
-      immutable: false
-      type: string
-    Vlan_vfc_instance_group_function:
-      type: string
-      required: true
-    packet_external_network_name:
-      hidden: false
-      immutable: false
-      type: string
-      description: network name
     availability_zone_0:
       label: availabilityzone name
       hidden: false
@@ -174,18 +168,6 @@ topology_template:
       - packet_internal_network
       - test_nested_level2
       - abstract_pd_server_1b
-    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:
-      - test_nested_level2
-      - abstract_pd_server_1b
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested_pattern5
     capabilities:
@@ -615,4 +597,4 @@ topology_template:
       - dependency
       dependency_packet_external_network:
       - packet_external_network
-      - dependency
\ No newline at end of file
+      - dependency