diff options
author | 2018-02-05 18:39:44 +0530 | |
---|---|---|
committer | 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/nested2ServiceTemplate.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/nested2ServiceTemplate.yaml')
1 files changed, 64 insertions, 45 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml index 35ce74b929..e42ee48133 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml @@ -2,38 +2,8 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: nested2 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: @@ -248,13 +218,59 @@ topology_template: - template_Vlan_3 substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested2 - requirements: - binding_template_Vlan_8_test_nested4Level_test_nested3Level: + capabilities: + feature_test_nested4Level_test_nested3Level: - test_nested3Level - - binding_template_Vlan_8_test_nested4Level + - feature_test_nested4Level + feature_template_Vlan_8_test_nested4Level_test_nested3Level: + - test_nested3Level + - feature_template_Vlan_8_test_nested4Level + feature_template_Vlan_3: + - template_Vlan_3 + - feature + feature_template_Vlan_4: + - template_Vlan_4 + - feature + feature_test_nested3Level: + - test_nested3Level + - feature + feature_template_Vlan_7_test_nested4Level_test_nested3Level: + - test_nested3Level + - feature_template_Vlan_7_test_nested4Level + feature_template_Vlan_6_test_nested3Level: + - test_nested3Level + - feature_template_Vlan_6 + feature_template_Vlan_5_test_nested3Level: + - test_nested3Level + - feature_template_Vlan_5 + requirements: link_template_Vlan_7_test_nested4Level_test_nested3Level: - test_nested3Level - link_template_Vlan_7_test_nested4Level + dependency_template_Vlan_5_test_nested3Level: + - test_nested3Level + - dependency_template_Vlan_5 + link_template_Vlan_8_test_nested4Level_test_nested3Level: + - test_nested3Level + - link_template_Vlan_8_test_nested4Level + binding_template_Vlan_6_test_nested3Level: + - test_nested3Level + - binding_template_Vlan_6 + binding_template_Vlan_7_test_nested4Level_test_nested3Level: + - test_nested3Level + - binding_template_Vlan_7_test_nested4Level + dependency_test_nested4Level_test_nested3Level: + - test_nested3Level + - dependency_test_nested4Level + dependency_template_Vlan_7_test_nested4Level_test_nested3Level: + - test_nested3Level + - dependency_template_Vlan_7_test_nested4Level + dependency_template_Vlan_6_test_nested3Level: + - test_nested3Level + - dependency_template_Vlan_6 + binding_template_Vlan_8_test_nested4Level_test_nested3Level: + - test_nested3Level + - binding_template_Vlan_8_test_nested4Level link_template_Vlan_5_test_nested3Level: - test_nested3Level - link_template_Vlan_5 @@ -264,24 +280,27 @@ topology_template: link_template_Vlan_3: - template_Vlan_3 - link + dependency_template_Vlan_8_test_nested4Level_test_nested3Level: + - test_nested3Level + - dependency_template_Vlan_8_test_nested4Level link_template_Vlan_4: - template_Vlan_4 - link - link_template_Vlan_8_test_nested4Level_test_nested3Level: - - test_nested3Level - - link_template_Vlan_8_test_nested4Level - binding_template_Vlan_6_test_nested3Level: - - test_nested3Level - - binding_template_Vlan_6 binding_template_Vlan_4: - template_Vlan_4 - binding - binding_template_Vlan_7_test_nested4Level_test_nested3Level: - - test_nested3Level - - binding_template_Vlan_7_test_nested4Level binding_template_Vlan_3: - template_Vlan_3 - binding + dependency_test_nested3Level: + - test_nested3Level + - dependency + dependency_template_Vlan_4: + - template_Vlan_4 + - dependency binding_template_Vlan_5_test_nested3Level: - test_nested3Level - - binding_template_Vlan_5
\ No newline at end of file + - binding_template_Vlan_5 + dependency_template_Vlan_3: + - template_Vlan_3 + - dependency
\ No newline at end of file |