VLAN tagging - Enable first stage translation

1. Added toggle for vlan tagging feature
2. Enabled existing translation of feature with toggle
3. Enabled unit tests for the same
4. Deleted unused test data
5. Updated license text
6. Updated code based on review comments

Change-Id: I755df4889f18a32061e9d4d1ebec09162b2d8b83
Issue-ID: SDC-998
Signed-off-by: ojasdubey <ojas.dubey@amdocs.com>

1 files changed, 83 insertions, 46 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
index 721a990b3e..f681a14a9b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
@@ -2,38 +2,8 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0
 metadata:
   template_name: nested1
 imports:
-- CommonGlobalTypes:
-    file: CommonGlobalTypesServiceTemplate.yaml
-- NovaServerGlobalTypes:
-    file: NovaServerGlobalTypesServiceTemplate.yaml
-- NeutronPortGlobalTypes:
-    file: NeutronPortGlobalTypesServiceTemplate.yaml
-- NeutronSecurityRulesGlobalTypes:
-    file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml
-- NeutronNetGlobalTypes:
-    file: NeutronNetGlobalTypesServiceTemplate.yaml
-- CinderVolumeGlobalTypes:
-    file: CinderVolumeGlobalTypesServiceTemplate.yaml
-- ContrailVirtualNetworkGlobalType:
-    file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml
-- ContrailNetworkRuleGlobalType:
-    file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml
-- AbstractSubstituteGlobalTypes:
-    file: AbstractSubstituteGlobalTypesServiceTemplate.yaml
-- ContrailV2VirtualMachineInterfaceGlobalType:
-    file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml
-- ContrailComputeGlobalTypes:
-    file: ContrailComputeGlobalTypesServiceTemplate.yaml
-- ContrailPortGlobalTypes:
-    file: ContrailPortGlobalTypesServiceTemplate.yaml
-- ContrailAbstractSubstituteGlobalTypes:
-    file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml
-- ContrailV2VirtualNetworkGlobalType:
-    file: ContrailV2VirtualNetworkGlobalTypeServiceTemplate.yaml
-- ContrailV2NetworkRuleGlobalType:
-    file: ContrailV2NetworkRuleGlobalTypeServiceTemplate.yaml
-- ContrailV2VLANSubInterfaceGlobalType:
-    file: ContrailV2VLANSubInterfaceGlobalTypeServiceTemplate.yaml
+- openecomp_heat_index:
+    file: openecomp-heat/_index.yml
 - GlobalSubstitutionTypes:
     file: GlobalSubstitutionTypesServiceTemplate.yaml
 topology_template:
@@ -193,46 +163,113 @@ topology_template:
       - test_nested2Level
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested1
-    requirements:
-      link_template_Vlan_6_test_nested3Level_test_nested2Level:
+    capabilities:
+      feature_template_Vlan_2:
+      - template_Vlan_2
+      - feature
+      feature_test_nested2Level:
       - test_nested2Level
-      - link_template_Vlan_6_test_nested3Level
-      binding_template_Vlan_3_test_nested2Level:
+      - feature
+      feature_template_Vlan_1:
+      - template_Vlan_1
+      - feature
+      feature_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - binding_template_Vlan_3
+      - feature_test_nested4Level_test_nested3Level
+      feature_template_Vlan_3_test_nested2Level:
+      - test_nested2Level
+      - feature_template_Vlan_3
+      feature_template_Vlan_5_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - feature_template_Vlan_5_test_nested3Level
+      feature_template_Vlan_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - feature_template_Vlan_7_test_nested4Level_test_nested3Level
+      feature_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - feature_test_nested3Level
+      feature_template_Vlan_4_test_nested2Level:
+      - test_nested2Level
+      - feature_template_Vlan_4
+      feature_template_Vlan_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - feature_template_Vlan_8_test_nested4Level_test_nested3Level
+      feature_template_Vlan_6_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - feature_template_Vlan_6_test_nested3Level
+    requirements:
+      dependency_template_Vlan_5_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - dependency_template_Vlan_5_test_nested3Level
       binding_template_Vlan_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - binding_template_Vlan_5_test_nested3Level
-      binding_template_Vlan_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      dependency_template_Vlan_4_test_nested2Level:
       - test_nested2Level
-      - binding_template_Vlan_8_test_nested4Level_test_nested3Level
-      binding_template_Vlan_6_test_nested3Level_test_nested2Level:
+      - dependency_template_Vlan_4
+      dependency_test_nested2Level:
       - test_nested2Level
-      - binding_template_Vlan_6_test_nested3Level
+      - dependency
       link_template_Vlan_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - link_template_Vlan_7_test_nested4Level_test_nested3Level
+      dependency_template_Vlan_2:
+      - template_Vlan_2
+      - dependency
       binding_template_Vlan_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - binding_template_Vlan_7_test_nested4Level_test_nested3Level
       link_template_Vlan_4_test_nested2Level:
       - test_nested2Level
       - link_template_Vlan_4
-      link_template_Vlan_1:
+      dependency_template_Vlan_1:
       - template_Vlan_1
-      - link
-      link_template_Vlan_2:
-      - template_Vlan_2
-      - link
+      - dependency
       binding_template_Vlan_2:
       - template_Vlan_2
       - binding
       binding_template_Vlan_1:
       - template_Vlan_1
       - binding
+      dependency_template_Vlan_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - dependency_template_Vlan_8_test_nested4Level_test_nested3Level
+      link_template_Vlan_6_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - link_template_Vlan_6_test_nested3Level
+      dependency_template_Vlan_6_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - dependency_template_Vlan_6_test_nested3Level
+      binding_template_Vlan_3_test_nested2Level:
+      - test_nested2Level
+      - binding_template_Vlan_3
+      dependency_template_Vlan_3_test_nested2Level:
+      - test_nested2Level
+      - dependency_template_Vlan_3
+      binding_template_Vlan_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - binding_template_Vlan_8_test_nested4Level_test_nested3Level
+      binding_template_Vlan_6_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - binding_template_Vlan_6_test_nested3Level
+      dependency_template_Vlan_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - dependency_template_Vlan_7_test_nested4Level_test_nested3Level
+      link_template_Vlan_1:
+      - template_Vlan_1
+      - link
+      link_template_Vlan_2:
+      - template_Vlan_2
+      - link
+      dependency_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - dependency_test_nested4Level_test_nested3Level
       link_template_Vlan_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - link_template_Vlan_5_test_nested3Level
+      dependency_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - dependency_test_nested3Level
       link_template_Vlan_3_test_nested2Level:
       - test_nested2Level
       - link_template_Vlan_3