diff options
author | ojasdubey <ojas.dubey@amdocs.com> | 2018-02-05 18:39:44 +0530 |
---|---|---|
committer | Avi Gaffa <avi.gaffa@amdocs.com> | 2018-02-08 08:41:37 +0000 |
commit | 20074c4e75e926977b25d57bebf841f44ada12a0 (patch) | |
tree | 7dcf74806e951e4c84b35b94e2fc92a15b92a5a2 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml | |
parent | 98d6b70321da75fb5322c146aa7be4442fc2b633 (diff) |
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>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml')
1 files changed, 319 insertions, 53 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 03dd95d822..ca22a8dcff 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -2,38 +2,8 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: GlobalSubstitutionTypes 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 node_types: org.openecomp.resource.abstract.nodes.heat.nested1: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute @@ -88,9 +58,15 @@ node_types: required: true status: SUPPORTED requirements: + - dependency_template_Vlan_2: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_template_Vlan_2: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 @@ -102,9 +78,15 @@ node_types: occurrences: - 1 - 1 + - dependency_template_Vlan_1: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_template_Vlan_1: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 @@ -116,9 +98,36 @@ node_types: occurrences: - 1 - 1 + - dependency_test_nested2Level: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - dependency_test_nested3Level_test_nested2Level: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - dependency_test_nested4Level_test_nested3Level_test_nested2Level: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - dependency_template_Vlan_8_test_nested4Level_test_nested3Level_test_nested2Level: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_template_Vlan_8_test_nested4Level_test_nested3Level_test_nested2Level: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 @@ -130,9 +139,15 @@ node_types: occurrences: - 1 - 1 + - dependency_template_Vlan_7_test_nested4Level_test_nested3Level_test_nested2Level: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_template_Vlan_7_test_nested4Level_test_nested3Level_test_nested2Level: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 @@ -144,9 +159,15 @@ node_types: occurrences: - 1 - 1 + - dependency_template_Vlan_6_test_nested3Level_test_nested2Level: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_template_Vlan_6_test_nested3Level_test_nested2Level: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 @@ -158,9 +179,15 @@ node_types: occurrences: - 1 - 1 + - dependency_template_Vlan_5_test_nested3Level_test_nested2Level: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_template_Vlan_5_test_nested3Level_test_nested2Level: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 @@ -172,9 +199,15 @@ node_types: occurrences: - 1 - 1 + - dependency_template_Vlan_4_test_nested2Level: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_template_Vlan_4_test_nested2Level: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 @@ -186,9 +219,15 @@ node_types: occurrences: - 1 - 1 + - dependency_template_Vlan_3_test_nested2Level: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_template_Vlan_3_test_nested2Level: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 @@ -200,6 +239,62 @@ node_types: occurrences: - 1 - 1 + capabilities: + feature_template_Vlan_2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_test_nested2Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_template_Vlan_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_test_nested4Level_test_nested3Level_test_nested2Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_template_Vlan_3_test_nested2Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_template_Vlan_5_test_nested3Level_test_nested2Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_template_Vlan_7_test_nested4Level_test_nested3Level_test_nested2Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_test_nested3Level_test_nested2Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_template_Vlan_4_test_nested2Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_template_Vlan_8_test_nested4Level_test_nested3Level_test_nested2Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_template_Vlan_6_test_nested3Level_test_nested2Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED org.openecomp.resource.abstract.nodes.heat.nested2: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute properties: @@ -298,9 +393,29 @@ node_types: required: true status: SUPPORTED requirements: + - dependency_test_nested3Level: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - dependency_test_nested4Level_test_nested3Level: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - dependency_template_Vlan_8_test_nested4Level_test_nested3Level: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_template_Vlan_8_test_nested4Level_test_nested3Level: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 @@ -312,9 +427,15 @@ node_types: occurrences: - 1 - 1 + - dependency_template_Vlan_7_test_nested4Level_test_nested3Level: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_template_Vlan_7_test_nested4Level_test_nested3Level: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 @@ -326,9 +447,15 @@ node_types: occurrences: - 1 - 1 + - dependency_template_Vlan_6_test_nested3Level: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_template_Vlan_6_test_nested3Level: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 @@ -340,9 +467,15 @@ node_types: occurrences: - 1 - 1 + - dependency_template_Vlan_5_test_nested3Level: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_template_Vlan_5_test_nested3Level: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 @@ -354,9 +487,15 @@ node_types: occurrences: - 1 - 1 + - dependency_template_Vlan_4: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_template_Vlan_4: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 @@ -368,9 +507,15 @@ node_types: occurrences: - 1 - 1 + - dependency_template_Vlan_3: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_template_Vlan_3: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 @@ -382,6 +527,47 @@ node_types: occurrences: - 1 - 1 + capabilities: + feature_test_nested4Level_test_nested3Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_template_Vlan_8_test_nested4Level_test_nested3Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_template_Vlan_3: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_template_Vlan_4: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_test_nested3Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_template_Vlan_7_test_nested4Level_test_nested3Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_template_Vlan_6_test_nested3Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_template_Vlan_5_test_nested3Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED org.openecomp.resource.abstract.nodes.heat.nested3: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute properties: @@ -480,9 +666,22 @@ node_types: required: true status: SUPPORTED requirements: + - dependency_test_nested4Level: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - dependency_template_Vlan_8_test_nested4Level: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_template_Vlan_8_test_nested4Level: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 @@ -494,9 +693,15 @@ node_types: occurrences: - 1 - 1 + - dependency_template_Vlan_7_test_nested4Level: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_template_Vlan_7_test_nested4Level: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 @@ -508,9 +713,15 @@ node_types: occurrences: - 1 - 1 + - dependency_template_Vlan_6: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_template_Vlan_6: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 @@ -522,9 +733,15 @@ node_types: occurrences: - 1 - 1 + - dependency_template_Vlan_5: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_template_Vlan_5: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 @@ -536,6 +753,32 @@ node_types: occurrences: - 1 - 1 + capabilities: + feature_test_nested4Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_template_Vlan_6: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_template_Vlan_8_test_nested4Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_template_Vlan_5: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_template_Vlan_7_test_nested4Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED org.openecomp.resource.abstract.nodes.heat.nested4: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute properties: @@ -634,9 +877,15 @@ node_types: required: true status: SUPPORTED requirements: + - dependency_template_Vlan_8: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_template_Vlan_8: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 @@ -648,9 +897,15 @@ node_types: occurrences: - 1 - 1 + - dependency_template_Vlan_7: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_template_Vlan_7: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 @@ -661,4 +916,15 @@ node_types: relationship: tosca.relationships.network.BindsTo occurrences: - 1 - - 1
\ No newline at end of file + - 1 + capabilities: + feature_template_Vlan_7: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_template_Vlan_8: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED
\ No newline at end of file |