diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles')
6 files changed, 533 insertions, 248 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 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml index 888a0f727c..87cb0f7799 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml @@ -2,38 +2,8 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: Main 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 node_types: @@ -106,6 +76,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -113,6 +89,9 @@ topology_template: get_input: - cmaui_oam_ips - 0 + mac_requirements: + mac_count_required: + is_required: false network: test_net1 requirements: - link: @@ -215,7 +194,7 @@ topology_template: virtual_network_refs: - test_net1 virtual_machine_interface_properties: - virtual_machine_interface_properties_service_interface_type: + service_interface_type: get_input: lb_st_interface_type_oam port_tuple_refs: - get_input: template_PortTuple_LB1 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 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 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml index f9aae6f57c..00a2260614 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml @@ -2,38 +2,8 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: nested3 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: @@ -239,28 +209,59 @@ topology_template: - template_Vlan_5 substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested3 + capabilities: + feature_test_nested4Level: + - test_nested4Level + - feature + feature_template_Vlan_6: + - template_Vlan_6 + - feature + feature_template_Vlan_8_test_nested4Level: + - test_nested4Level + - feature_template_Vlan_8 + feature_template_Vlan_5: + - template_Vlan_5 + - feature + feature_template_Vlan_7_test_nested4Level: + - test_nested4Level + - feature_template_Vlan_7 requirements: link_template_Vlan_8_test_nested4Level: - test_nested4Level - link_template_Vlan_8 - link_template_Vlan_7_test_nested4Level: - - test_nested4Level - - link_template_Vlan_7 binding_template_Vlan_8_test_nested4Level: - test_nested4Level - binding_template_Vlan_8 + binding_template_Vlan_7_test_nested4Level: + - test_nested4Level + - binding_template_Vlan_7 + dependency_template_Vlan_7_test_nested4Level: + - test_nested4Level + - dependency_template_Vlan_7 + dependency_test_nested4Level: + - test_nested4Level + - dependency + link_template_Vlan_7_test_nested4Level: + - test_nested4Level + - link_template_Vlan_7 link_template_Vlan_5: - template_Vlan_5 - link + dependency_template_Vlan_8_test_nested4Level: + - test_nested4Level + - dependency_template_Vlan_8 link_template_Vlan_6: - template_Vlan_6 - link - binding_template_Vlan_7_test_nested4Level: - - test_nested4Level - - binding_template_Vlan_7 binding_template_Vlan_6: - template_Vlan_6 - binding binding_template_Vlan_5: - template_Vlan_5 - - binding
\ No newline at end of file + - binding + dependency_template_Vlan_6: + - template_Vlan_6 + - dependency + dependency_template_Vlan_5: + - template_Vlan_5 + - dependency
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml index dd4017d37a..2169ff802d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml @@ -2,38 +2,8 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: nested4 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: @@ -223,7 +193,20 @@ topology_template: - template_Vlan_7 substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested4 + capabilities: + feature_template_Vlan_7: + - template_Vlan_7 + - feature + feature_template_Vlan_8: + - template_Vlan_8 + - feature requirements: + dependency_template_Vlan_8: + - template_Vlan_8 + - dependency + dependency_template_Vlan_7: + - template_Vlan_7 + - dependency link_template_Vlan_7: - template_Vlan_7 - link |