diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition')
26 files changed, 569 insertions, 732 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 0cc801ed3d..7087e7d068 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,20 +8,12 @@ node_types: org.openecomp.resource.abstract.nodes.FSB1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_FSB1_Internal_mac_address: - type: string - required: true - status: SUPPORTED port_FSB1_Internal_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED port_FSB1_Internal_subnetpoolid: type: string required: true @@ -30,74 +22,142 @@ node_types: type: string required: true status: SUPPORTED - port_FSB1_OAM_subnetpoolid: + compute_FSB1_metadata: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB1_OAM_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean + port_FSB2_Internal_2_order: + type: integer + required: true + status: SUPPORTED + vm_flavor_name: type: string required: true status: SUPPORTED - compute_FSB1_metadata: + port_FSB1_OAM_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json - port_FSB2_Internal_1_exCP_naming: - type: org.openecomp.datatypes.Naming + type: org.openecomp.datatypes.network.VlanRequirements + port_FSB1_Internal_vlan_requirements: + type: list required: true status: SUPPORTED - port_FSB1_OAM_exCP_naming: - type: org.openecomp.datatypes.Naming + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_FSB1_Internal_network: + type: list required: true status: SUPPORTED - port_FSB1_OAM_ip_requirements: + entry_schema: + type: string + port_FSB2_Internal_1_order: + type: integer + required: true + status: SUPPORTED + port_FSB2_Internal_2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_2_order: - type: integer + port_FSB1_OAM_network: + type: list required: true status: SUPPORTED - port_FSB2_Internal_1_mac_address: + entry_schema: + type: string + port_FSB2_Internal_1_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB2_Internal_2_network_role: type: string required: true status: SUPPORTED - vm_flavor_name: + port_FSB1_OAM_network_role: type: string required: true status: SUPPORTED - port_FSB2_Internal_2_mac_address: + port_FSB2_Internal_1_network_role: type: string required: true status: SUPPORTED - port_FSB2_Internal_1_ip_requirements: + port_FSB2_Internal_2_network_role_tag: + type: string + required: true + status: SUPPORTED + port_FSB2_Internal_1_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_FSB1_Internal_mac_address: + type: string + required: true + status: SUPPORTED + port_FSB2_Internal_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_FSB1_OAM_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_FSB2_Internal_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_FSB2_Internal_1_subinterface_indicator: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_2_vlan_requirements: + type: boolean + port_FSB1_OAM_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_FSB1_OAM_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB1_Internal_network_role_tag: + type: org.openecomp.datatypes.network.IpRequirements + port_FSB2_Internal_1_mac_address: type: string required: true status: SUPPORTED - port_FSB1_OAM_vlan_requirements: + port_FSB2_Internal_2_mac_address: + type: string + required: true + status: SUPPORTED + port_FSB2_Internal_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB1_Internal_vlan_requirements: + type: org.openecomp.datatypes.network.IpRequirements + port_FSB2_Internal_2_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_FSB1_Internal_network_role_tag: + type: string + required: true + status: SUPPORTED port_FSB1_Internal_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -114,13 +174,13 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - compute_FSB1_availability_zone: + port_FSB1_Internal_subinterface_indicator: type: list required: true status: SUPPORTED entry_schema: - type: string - port_FSB1_Internal_network: + type: boolean + compute_FSB1_availability_zone: type: list required: true status: SUPPORTED @@ -134,16 +194,12 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_FSB2_Internal_1_order: - type: integer - required: true - status: SUPPORTED - port_FSB2_Internal_2_ip_requirements: + port_FSB2_Internal_2_subinterface_indicator: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: boolean port_FSB1_OAM_order: type: integer required: true @@ -154,28 +210,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_FSB1_OAM_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_FSB2_Internal_1_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string port_FSB2_Internal_2_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_FSB2_Internal_2_network_role: - type: string - required: true - status: SUPPORTED port_FSB2_Internal_1_network_role_tag: type: string required: true @@ -184,14 +224,6 @@ node_types: type: integer required: true status: SUPPORTED - port_FSB1_OAM_network_role: - type: string - required: true - status: SUPPORTED - port_FSB2_Internal_1_network_role: - type: string - required: true - status: SUPPORTED port_FSB1_OAM_network_role_tag: type: string required: true @@ -212,18 +244,10 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_FSB2_Internal_2_network_role_tag: - type: string - required: true - status: SUPPORTED port_FSB2_Internal_2_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_FSB2_Internal_1_subnetpoolid: - type: string - required: true - status: SUPPORTED requirements: - dependency_FSB1_FSB1_Internal: capability: tosca.capabilities.Node @@ -326,6 +350,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -333,6 +358,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -522,6 +548,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -581,6 +608,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml index 535fa50cf3..29f618cc5b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml @@ -11,34 +11,98 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_FSB1_Internal_mac_address: - type: string - required: true port_FSB1_Internal_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true port_FSB1_Internal_subnetpoolid: type: string required: true port_FSB2_Internal_2_subnetpoolid: type: string required: true - port_FSB1_OAM_subnetpoolid: - type: string - required: true compute_FSB1_metadata: type: list required: true entry_schema: type: json + port_FSB1_OAM_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean + port_FSB2_Internal_2_order: + type: integer + required: true + vm_flavor_name: + type: string + required: true + port_FSB1_OAM_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_FSB1_Internal_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_FSB1_Internal_network: + type: list + required: true + entry_schema: + type: string + port_FSB2_Internal_1_order: + type: integer + required: true + port_FSB2_Internal_2_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_FSB1_OAM_network: + type: list + required: true + entry_schema: + type: string + port_FSB2_Internal_1_network: + type: list + required: true + entry_schema: + type: string + port_FSB2_Internal_2_network_role: + type: string + required: true + port_FSB1_OAM_network_role: + type: string + required: true + port_FSB2_Internal_1_network_role: + type: string + required: true + port_FSB2_Internal_2_network_role_tag: + type: string + required: true + port_FSB2_Internal_1_subnetpoolid: + type: string + required: true + port_FSB1_Internal_mac_address: + type: string + required: true + port_FSB2_Internal_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_FSB1_OAM_subnetpoolid: + type: string + required: true port_FSB2_Internal_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true + port_FSB2_Internal_1_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_FSB1_OAM_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -47,15 +111,9 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_2_order: - type: integer - required: true port_FSB2_Internal_1_mac_address: type: string required: true - vm_flavor_name: - type: string - required: true port_FSB2_Internal_2_mac_address: type: string required: true @@ -72,16 +130,6 @@ topology_template: port_FSB1_Internal_network_role_tag: type: string required: true - port_FSB1_OAM_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB1_Internal_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements port_FSB1_Internal_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -94,12 +142,12 @@ topology_template: port_FSB1_OAM_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - compute_FSB1_availability_zone: + port_FSB1_Internal_subinterface_indicator: type: list required: true entry_schema: - type: string - port_FSB1_Internal_network: + type: boolean + compute_FSB1_availability_zone: type: list required: true entry_schema: @@ -111,14 +159,11 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_FSB2_Internal_1_order: - type: integer - required: true - port_FSB2_Internal_2_ip_requirements: + port_FSB2_Internal_2_subinterface_indicator: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: boolean port_FSB1_OAM_order: type: integer required: true @@ -127,36 +172,17 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_FSB1_OAM_network: - type: list - required: true - entry_schema: - type: string - port_FSB2_Internal_1_network: - type: list - required: true - entry_schema: - type: string port_FSB2_Internal_2_network: type: list required: true entry_schema: type: string - port_FSB2_Internal_2_network_role: - type: string - required: true port_FSB2_Internal_1_network_role_tag: type: string required: true port_FSB1_Internal_order: type: integer required: true - port_FSB1_OAM_network_role: - type: string - required: true - port_FSB2_Internal_1_network_role: - type: string - required: true port_FSB1_OAM_network_role_tag: type: string required: true @@ -173,15 +199,9 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_FSB2_Internal_2_network_role_tag: - type: string - required: true port_FSB2_Internal_2_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_FSB2_Internal_1_subnetpoolid: - type: string - required: true node_templates: FSB1_FSB1_Internal: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port @@ -190,6 +210,10 @@ topology_template: get_input: port_FSB1_Internal_exCP_naming vlan_requirements: get_input: port_FSB1_Internal_vlan_requirements + subinterface_indicator: + get_input: + - port_FSB1_Internal_subinterface_indicator + - index_value ip_requirements: get_input: port_FSB1_Internal_ip_requirements network_role_tag: @@ -220,6 +244,10 @@ topology_template: get_input: port_FSB2_Internal_1_exCP_naming vlan_requirements: get_input: port_FSB2_Internal_1_vlan_requirements + subinterface_indicator: + get_input: + - port_FSB2_Internal_1_subinterface_indicator + - index_value ip_requirements: get_input: port_FSB2_Internal_1_ip_requirements network_role_tag: @@ -250,6 +278,10 @@ topology_template: get_input: port_FSB2_Internal_2_exCP_naming vlan_requirements: get_input: port_FSB2_Internal_2_vlan_requirements + subinterface_indicator: + get_input: + - port_FSB2_Internal_2_subinterface_indicator + - index_value ip_requirements: get_input: port_FSB2_Internal_2_ip_requirements network_role_tag: @@ -280,6 +312,10 @@ topology_template: get_input: port_FSB1_OAM_exCP_naming vlan_requirements: get_input: port_FSB1_OAM_vlan_requirements + subinterface_indicator: + get_input: + - port_FSB1_OAM_subinterface_indicator + - index_value ip_requirements: get_input: port_FSB1_OAM_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml index 8c748e2a2e..e21fa17343 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -42,6 +42,12 @@ node_types: type: integer required: true status: SUPPORTED + port_FSB1_OAM_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_FSB1_OAM_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -98,6 +104,12 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_FSB1_Internal_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean compute_FSB1_availability_zone: type: list required: true @@ -154,6 +166,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_FSB2_Internal_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_FSB1_OAM_network_role_tag: type: string required: true @@ -249,6 +267,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -423,6 +442,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -470,6 +490,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml index e5ebd6aa8b..e1a6f40602 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml @@ -38,6 +38,11 @@ topology_template: port_FSB2_Internal_order: type: integer required: true + port_FSB1_OAM_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_FSB1_OAM_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -82,6 +87,11 @@ topology_template: port_FSB1_OAM_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_FSB1_Internal_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean compute_FSB1_availability_zone: type: list required: true @@ -127,6 +137,11 @@ topology_template: required: true entry_schema: type: string + port_FSB2_Internal_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_FSB1_OAM_network_role_tag: type: string required: true @@ -154,6 +169,10 @@ topology_template: get_input: port_FSB1_Internal_exCP_naming vlan_requirements: get_input: port_FSB1_Internal_vlan_requirements + subinterface_indicator: + get_input: + - port_FSB1_Internal_subinterface_indicator + - index_value ip_requirements: get_input: port_FSB1_Internal_ip_requirements network_role_tag: @@ -184,6 +203,10 @@ topology_template: get_input: port_FSB2_Internal_exCP_naming vlan_requirements: get_input: port_FSB2_Internal_vlan_requirements + subinterface_indicator: + get_input: + - port_FSB2_Internal_subinterface_indicator + - index_value ip_requirements: get_input: port_FSB2_Internal_ip_requirements network_role_tag: @@ -214,6 +237,10 @@ topology_template: get_input: port_FSB1_OAM_exCP_naming vlan_requirements: get_input: port_FSB1_OAM_vlan_requirements + subinterface_indicator: + get_input: + - port_FSB1_OAM_subinterface_indicator + - index_value ip_requirements: get_input: port_FSB1_OAM_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml index 504c059abd..8113a8048f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -74,6 +74,12 @@ node_types: type: string required: true status: SUPPORTED + port_FSB1_Internal_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean compute_FSB1_availability_zone: type: list required: true @@ -116,6 +122,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_FSB2_Internal_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_FSB1_Internal_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -203,6 +215,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -355,6 +368,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml index 3509df1630..72d2ee6f1f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml @@ -63,6 +63,11 @@ topology_template: port_FSB1_Internal_network_role: type: string required: true + port_FSB1_Internal_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean compute_FSB1_availability_zone: type: list required: true @@ -97,6 +102,11 @@ topology_template: required: true entry_schema: type: string + port_FSB2_Internal_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_FSB1_Internal_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -116,6 +126,10 @@ topology_template: get_input: port_FSB1_Internal_exCP_naming vlan_requirements: get_input: port_FSB1_Internal_vlan_requirements + subinterface_indicator: + get_input: + - port_FSB1_Internal_subinterface_indicator + - index_value ip_requirements: get_input: port_FSB1_Internal_ip_requirements network_role_tag: @@ -146,6 +160,10 @@ topology_template: get_input: port_FSB2_Internal_exCP_naming vlan_requirements: get_input: port_FSB2_Internal_vlan_requirements + subinterface_indicator: + get_input: + - port_FSB2_Internal_subinterface_indicator + - index_value ip_requirements: get_input: port_FSB2_Internal_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml index d197cd7c54..52effbbc3a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -42,6 +42,12 @@ node_types: type: integer required: true status: SUPPORTED + port_FSB1_OAM_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_FSB1_OAM_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -98,6 +104,12 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_FSB1_Internal_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean compute_FSB1_availability_zone: type: list required: true @@ -154,6 +166,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_FSB2_Internal_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_FSB1_OAM_network_role_tag: type: string required: true @@ -273,6 +291,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -447,6 +466,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -494,6 +514,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml index c72dee50d8..0fb34fd252 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml @@ -38,6 +38,11 @@ topology_template: port_FSB2_Internal_order: type: integer required: true + port_FSB1_OAM_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_FSB1_OAM_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -82,6 +87,11 @@ topology_template: port_FSB1_OAM_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_FSB1_Internal_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean compute_FSB1_availability_zone: type: list required: true @@ -127,6 +137,11 @@ topology_template: required: true entry_schema: type: string + port_FSB2_Internal_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_FSB1_OAM_network_role_tag: type: string required: true @@ -154,6 +169,10 @@ topology_template: get_input: port_FSB1_Internal_exCP_naming vlan_requirements: get_input: port_FSB1_Internal_vlan_requirements + subinterface_indicator: + get_input: + - port_FSB1_Internal_subinterface_indicator + - index_value ip_requirements: get_input: port_FSB1_Internal_ip_requirements network_role_tag: @@ -184,6 +203,10 @@ topology_template: get_input: port_FSB2_Internal_exCP_naming vlan_requirements: get_input: port_FSB2_Internal_vlan_requirements + subinterface_indicator: + get_input: + - port_FSB2_Internal_subinterface_indicator + - index_value ip_requirements: get_input: port_FSB2_Internal_ip_requirements network_role_tag: @@ -214,6 +237,10 @@ topology_template: get_input: port_FSB1_OAM_exCP_naming vlan_requirements: get_input: port_FSB1_OAM_vlan_requirements + subinterface_indicator: + get_input: + - port_FSB1_OAM_subinterface_indicator + - index_value ip_requirements: get_input: port_FSB1_OAM_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml index 6e788ce110..c88962628d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -38,6 +38,48 @@ node_types: type: integer required: true status: SUPPORTED + port_FSB2_Internal_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + vm_flavor_name: + type: string + required: true + status: SUPPORTED + port_FSB2_Internal_network_role: + type: string + required: true + status: SUPPORTED + port_FSB1_Internal_network_role_tag: + type: string + required: true + status: SUPPORTED + port_FSB1_Internal_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_FSB2_Internal_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_FSB1_Internal_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_FSB1_Internal_network_role: + type: string + required: true + status: SUPPORTED + port_FSB1_Internal_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean compute_FSB1_availability_zone: type: list required: true @@ -56,52 +98,30 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_FSB2_Internal_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_flavor_name: - type: string - required: true - status: SUPPORTED port_FSB2_Internal_mac_address: type: string required: true status: SUPPORTED - port_FSB2_Internal_network_role: - type: string - required: true - status: SUPPORTED port_FSB2_Internal_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_FSB1_Internal_network_role_tag: - type: string - required: true - status: SUPPORTED port_FSB1_Internal_order: type: integer required: true status: SUPPORTED - port_FSB1_Internal_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_FSB2_Internal_subnetpoolid: - type: string + port_FSB2_Internal_subinterface_indicator: + type: list required: true status: SUPPORTED + entry_schema: + type: boolean port_FSB1_Internal_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -112,14 +132,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_FSB1_Internal_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_FSB1_Internal_network_role: - type: string - required: true - status: SUPPORTED port_FSB2_Internal_network_role_tag: type: string required: true @@ -197,6 +209,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -349,6 +362,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml index 69b999862e..b1ba634c79 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml @@ -35,6 +35,39 @@ topology_template: port_FSB2_Internal_order: type: integer required: true + port_FSB2_Internal_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + vm_flavor_name: + type: string + required: true + port_FSB2_Internal_network_role: + type: string + required: true + port_FSB1_Internal_network_role_tag: + type: string + required: true + port_FSB1_Internal_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_FSB2_Internal_subnetpoolid: + type: string + required: true + port_FSB1_Internal_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_FSB1_Internal_network_role: + type: string + required: true + port_FSB1_Internal_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean compute_FSB1_availability_zone: type: list required: true @@ -50,42 +83,25 @@ topology_template: port_FSB2_Internal_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_FSB2_Internal_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_flavor_name: - type: string - required: true port_FSB2_Internal_mac_address: type: string required: true - port_FSB2_Internal_network_role: - type: string - required: true port_FSB2_Internal_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_FSB1_Internal_network_role_tag: - type: string - required: true port_FSB1_Internal_order: type: integer required: true - port_FSB1_Internal_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_network: type: list required: true entry_schema: type: string - port_FSB2_Internal_subnetpoolid: - type: string + port_FSB2_Internal_subinterface_indicator: + type: list required: true + entry_schema: + type: boolean port_FSB1_Internal_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -94,12 +110,6 @@ topology_template: required: true entry_schema: type: string - port_FSB1_Internal_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_FSB1_Internal_network_role: - type: string - required: true port_FSB2_Internal_network_role_tag: type: string required: true @@ -111,6 +121,10 @@ topology_template: get_input: port_FSB1_Internal_exCP_naming vlan_requirements: get_input: port_FSB1_Internal_vlan_requirements + subinterface_indicator: + get_input: + - port_FSB1_Internal_subinterface_indicator + - index_value ip_requirements: get_input: port_FSB1_Internal_ip_requirements network_role_tag: @@ -137,18 +151,24 @@ topology_template: FSB1_FSB2_Internal: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_FSB2_Internal_mac_requirements + order: + get_input: port_FSB2_Internal_order + mac_address: + get_input: port_FSB2_Internal_mac_address exCP_naming: get_input: port_FSB2_Internal_exCP_naming vlan_requirements: get_input: port_FSB2_Internal_vlan_requirements + subinterface_indicator: + get_input: + - port_FSB2_Internal_subinterface_indicator + - index_value ip_requirements: get_input: port_FSB2_Internal_ip_requirements network_role_tag: get_input: port_FSB2_Internal_network_role_tag - mac_requirements: - get_input: port_FSB2_Internal_mac_requirements - order: - get_input: port_FSB2_Internal_order network_role: get_input: port_FSB2_Internal_network_role subnetpoolid: @@ -161,8 +181,6 @@ topology_template: get_input: - port_FSB2_Internal_network - index_value - mac_address: - get_input: port_FSB2_Internal_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml index 8b3a09474c..7fd691c1d9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -36,6 +36,12 @@ node_types: type: integer required: true status: SUPPORTED + port_FSB1_OAM_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_FSB1_OAM_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -92,6 +98,12 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_FSB1_Internal_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_FSB1_Internal_network: type: list required: true @@ -142,6 +154,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_FSB2_Internal_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_FSB1_OAM_network_role_tag: type: string required: true @@ -255,6 +273,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -429,6 +448,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -476,6 +496,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml index 12cc87e626..f0a87d321a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml @@ -33,6 +33,11 @@ topology_template: port_FSB2_Internal_order: type: integer required: true + port_FSB1_OAM_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_FSB1_OAM_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -77,6 +82,11 @@ topology_template: port_FSB1_OAM_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_FSB1_Internal_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_FSB1_Internal_network: type: list required: true @@ -117,6 +127,11 @@ topology_template: required: true entry_schema: type: string + port_FSB2_Internal_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_FSB1_OAM_network_role_tag: type: string required: true @@ -139,6 +154,10 @@ topology_template: get_input: port_FSB1_Internal_exCP_naming vlan_requirements: get_input: port_FSB1_Internal_vlan_requirements + subinterface_indicator: + get_input: + - port_FSB1_Internal_subinterface_indicator + - index_value ip_requirements: get_input: port_FSB1_Internal_ip_requirements network_role_tag: @@ -169,6 +188,10 @@ topology_template: get_input: port_FSB2_Internal_exCP_naming vlan_requirements: get_input: port_FSB2_Internal_vlan_requirements + subinterface_indicator: + get_input: + - port_FSB2_Internal_subinterface_indicator + - index_value ip_requirements: get_input: port_FSB2_Internal_ip_requirements network_role_tag: @@ -199,6 +222,10 @@ topology_template: get_input: port_FSB1_OAM_exCP_naming vlan_requirements: get_input: port_FSB1_OAM_vlan_requirements + subinterface_indicator: + get_input: + - port_FSB1_OAM_subinterface_indicator + - index_value ip_requirements: get_input: port_FSB1_OAM_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/out/MainServiceTemplate.yaml index 62e3c5574a..bc08b781f9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/out/MainServiceTemplate.yaml @@ -74,6 +74,7 @@ topology_template: mac_address: get_input: fsb1-Internal2-mac network: Internal2-net + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -85,6 +86,7 @@ topology_template: mac_address: get_input: fsb1-Internal1-mac network: Internal1-net + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -101,6 +103,7 @@ topology_template: - ip_address: get_input: fsb1-oam-ip network: jsa_net1 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -181,12 +184,16 @@ topology_template: properties: port_FSB1_Internal_mac_address: get_input: fsb1-Internal1-mac + port_FSB1_OAM_subinterface_indicator: + - true vm_flavor_name: get_input: fsb-flavor vm_image_name: get_input: fsb-image compute_FSB_admin_pass: - STATIC-DATA-FSB1 + port_FSB1_Internal_subinterface_indicator: + - true port_FSB1_Internal_network: - Internal1-net port_FSB2_Internal_mac_address: @@ -199,6 +206,8 @@ topology_template: - write_files: - path: /path1/etc/sysconfig/network-scripts/ifcfg-eth0 - path: /path2/etc/sysconfig/network-scripts/ifcfg-eth1 + port_FSB2_Internal_subinterface_indicator: + - true compute_FSB_availability_zone: - get_input: fsb1_zone port_FSB1_OAM_fixed_ips: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/out/MainServiceTemplate.yaml index 6305a7cae6..5c86ef6c5b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/out/MainServiceTemplate.yaml @@ -69,6 +69,7 @@ topology_template: mac_address: get_input: fsb1-Internal2-mac network: Internal2-net + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -80,6 +81,7 @@ topology_template: mac_address: get_input: fsb1-Internal1-mac network: Internal1-net + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -158,6 +160,8 @@ topology_template: directives: - substitutable properties: + port_FSB1_Internal_2_subinterface_indicator: + - true vm_flavor_name: get_input: fsb-flavor vm_image_name: @@ -166,6 +170,8 @@ topology_template: - STATIC-DATA-FSB1 port_FSB1_Internal_1_mac_address: get_input: fsb1-Internal1-mac + port_FSB1_Internal_1_subinterface_indicator: + - true port_FSB1_Internal_1_network: - Internal1-net port_FSB1_Internal_2_mac_address: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/out/MainServiceTemplate.yaml index ca75560607..9b54fbea73 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/out/MainServiceTemplate.yaml @@ -94,6 +94,7 @@ topology_template: mac_address: get_input: fsb2-Internal2-mac network: Internal2-net-fsb2-Internal2 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -105,6 +106,7 @@ topology_template: mac_address: get_input: fsb2-Internal1-mac network: Internal2-net-fsb2-Internal1 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -116,6 +118,7 @@ topology_template: mac_address: get_input: fsb1-Internal2-mac network: Internal1-net-fsb1-Internal2 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -131,6 +134,7 @@ topology_template: mac_address: get_input: fsb1-Internal1-mac network: Internal1-net-fsb1-Internal1 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -252,6 +256,9 @@ topology_template: compute_FSB_admin_pass: - STATIC-DATA-FSB1 - STATIC-DATA-FSB2 + port_FSB1_Internal_subinterface_indicator: + - true + - true port_FSB1_Internal_network: - Internal1-net-fsb1-Internal1 - Internal1-net-fsb1-Internal2 @@ -267,6 +274,9 @@ topology_template: - write_files: - path: /path3/etc/sysconfig/network-scripts/ifcfg-eth0 - path: /path4/etc/sysconfig/network-scripts/ifcfg-eth1 + port_FSB2_Internal_subinterface_indicator: + - true + - true compute_FSB_availability_zone: - get_input: fsb1_zone - get_input: fsb2_zone diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/inputoutputparamtype/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/inputoutputparamtype/out/MainServiceTemplate.yaml index 51410677fb..cf83056eb9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/inputoutputparamtype/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/inputoutputparamtype/out/MainServiceTemplate.yaml @@ -259,12 +259,16 @@ topology_template: directives: - substitutable properties: + port_VMI_subinterface_indicator: + - true port_FSB1_Port_network: - Internal1-net vm_flavor_name: get_input: fsb1-flavor port_FSB1_Port_mac_address: get_input: fsb1-Internal1-mac + port_FSB1_Port_subinterface_indicator: + - true compute_FSB1_availability_zone: - get_input: fsb_zone port_VMI_port_tuple_refs: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern1b/noConsolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern1b/noConsolidation/in/MainServiceTemplate.yaml deleted file mode 100644 index 4113dadea4..0000000000 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern1b/noConsolidation/in/MainServiceTemplate.yaml +++ /dev/null @@ -1,240 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -metadata: - template_name: Main -imports: -- openecomp_heat_index: - file: openecomp-heat/_index.yml -node_types: - org.openecomp.resource.vfc.nodes.heat.FSB1: - derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server -topology_template: - inputs: - fsb1-name: - label: FSB1_name - hidden: false - immutable: false - type: string - description: FSB1_name - fsb1-Internal1-mac: - label: FSB1_internal_mac - hidden: false - immutable: false - type: string - description: FSB1_internal_mac - cps_net_mask: - hidden: false - immutable: false - type: string - description: prop - fsb1-flavor: - label: FSB1_flavor - hidden: false - immutable: false - type: string - description: FSB1_flavor - fsb1-Internal2-mac: - label: FSB1_internal_mac - hidden: false - immutable: false - type: string - description: FSB1_internal_mac - volume_type: - label: volume type - hidden: false - immutable: false - type: string - description: volume type Gold - fsb_zone: - label: FSB1_zone - hidden: false - immutable: false - type: string - description: FSB1_zone - oam_net_gw: - hidden: false - immutable: false - type: string - description: prop - network_name: - hidden: false - immutable: false - type: string - description: prop - cps_net_ip: - hidden: false - immutable: false - type: string - description: prop - jsa_net_name: - label: jsa_net_name - hidden: false - immutable: false - type: string - description: jsa_net_name - default: jsa_log_net_0 - pcrf_psm_server_name: - label: pcrf_psm_server_name - hidden: false - immutable: false - type: string - description: pcrf_psm_server_name - pcm_flavor_name: - label: pcm_flavor_name - hidden: false - immutable: false - type: string - description: pcm_flavor_name - oam_net_id: - label: oam_net_id - hidden: false - immutable: false - type: string - description: oam_net_id - oam_net_ip: - hidden: false - immutable: false - type: string - description: prop - oam_net_mask: - hidden: false - immutable: false - type: string - description: prop - fsb1-oam-ip: - hidden: false - immutable: false - type: string - description: prop - node_templates: - FSB2_Internal2: - type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port - properties: - mac_address: - get_input: fsb1-Internal2-mac - network: Internal2-net - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: FSB1_template - relationship: tosca.relationships.network.BindsTo - FSB1_Internal1: - type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port - properties: - mac_address: - get_input: fsb1-Internal1-mac - network: Internal1-net - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: FSB1_template - relationship: tosca.relationships.network.BindsTo - - link: - capability: tosca.capabilities.network.Linkable - node: jsa_net1 - relationship: tosca.relationships.network.LinksTo - jsa_net1: - type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net - properties: - shared: true - network_name: - get_attribute: - - FSB1_Internal1 - - network_id - dhcp_agent_ids: - get_attribute: - - FSB1_template - - addresses - tenant_id: - get_attribute: - - FSB2_Internal2 - - network_id - qos_policy: - get_attribute: - - FSB2_Internal2 - - network_id - FSB1_template: - type: org.openecomp.resource.vfc.nodes.heat.FSB1 - properties: - flavor: - get_input: fsb1-flavor - availability_zone: - get_input: fsb_zone - requirements: - - local_storage: - capability: tosca.capabilities.Attachment - node: cmaui_volume1 - relationship: cmaui_volume_attachment - - local_storage: - capability: tosca.capabilities.Attachment - node: cmaui_volume2 - relationship: cmaui_volume_attachment - FSB2_template: - type: org.openecomp.resource.vfc.nodes.heat.FSB1 - properties: - flavor: - get_input: fsb1-flavor - availability_zone: - get_input: fsb_zone - requirements: - - local_storage: - capability: tosca.capabilities.Attachment - node: cmaui_volume1 - relationship: cmaui_volume_attachment - - local_storage: - capability: tosca.capabilities.Attachment - node: cmaui_volume2 - relationship: cmaui_volume_attachment - FSB3_template: - type: org.openecomp.resource.vfc.nodes.heat.FSB1 - properties: - flavor: - get_input: fsb1-flavor - availability_zone: - get_input: fsb_zone - requirements: - - local_storage: - capability: tosca.capabilities.Attachment - node: cmaui_volume1 - relationship: cmaui_volume_attachment - - local_storage: - capability: tosca.capabilities.Attachment - node: cmaui_volume2 - relationship: cmaui_volume_attachment - cmaui_volume1: - type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume - properties: - volume_type: - get_input: CMAUI_volume_type - size: '(get_input : cmaui_cinder_volume_size) * 1024' - cmaui_volume2: - type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume - properties: - volume_type: - get_input: CMAUI_volume_type - size: '(get_input : cmaui_cinder_volume_size) * 1024' - groups: - ep-jsa_net_group: - type: org.openecomp.groups.heat.HeatStack - properties: - heat_file: ../Artifacts/ep-jsa_net.yaml - description: | - Version 2.0 02-09-2016 (Authors: John Doe, user PROD) - members: - - FSB2_Internal2 - - FSB1_Internal1 - - FSB1_template - - FSB2_template - - FSB3_template - outputs: - simpleOutput1: - value: {get_attribute: [ FSB1_template, accessIPv4 ] } - simpleOutput2: - value: {get_attribute: [ FSB2_template, addresses, key1 ] } - complexOutput1: - value: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB2_Internal2,tenant_id ] } ]} - complexOutput2: - description: cgi fw01 left interface Mac-Address - value: { get_attribute: [FSB1_Internal2, device_owner, get_input: [CMAUI_volume_type, {get_attribute: [FSB2_Internal1,user_data_format ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } - complexOutput3: - description: cgi fw01 left interface Mac-Address - value: { get_input: [a, addresses, get_input: [CMAUI_volume_type, {get_attribute: [FSB1_Internal1,admin_state_up ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern1b/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern1b/noConsolidation/out/MainServiceTemplate.yaml deleted file mode 100644 index 35a1e38837..0000000000 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern1b/noConsolidation/out/MainServiceTemplate.yaml +++ /dev/null @@ -1,294 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -metadata: - template_name: Main -imports: -- openecomp_heat_index: - file: openecomp-heat/_index.yml -- GlobalSubstitutionTypes: - file: GlobalSubstitutionTypesServiceTemplate.yaml -topology_template: - inputs: - fsb1-name: - label: FSB1_name - hidden: false - immutable: false - type: string - description: FSB1_name - fsb1-Internal1-mac: - label: FSB1_internal_mac - hidden: false - immutable: false - type: string - description: FSB1_internal_mac - cps_net_mask: - hidden: false - immutable: false - type: string - description: prop - fsb1-flavor: - label: FSB1_flavor - hidden: false - immutable: false - type: string - description: FSB1_flavor - fsb1-Internal2-mac: - label: FSB1_internal_mac - hidden: false - immutable: false - type: string - description: FSB1_internal_mac - volume_type: - label: volume type - hidden: false - immutable: false - type: string - description: volume type Gold - fsb_zone: - label: FSB1_zone - hidden: false - immutable: false - type: string - description: FSB1_zone - oam_net_gw: - hidden: false - immutable: false - type: string - description: prop - network_name: - hidden: false - immutable: false - type: string - description: prop - cps_net_ip: - hidden: false - immutable: false - type: string - description: prop - jsa_net_name: - label: jsa_net_name - hidden: false - immutable: false - type: string - description: jsa_net_name - default: jsa_log_net_0 - pcrf_psm_server_name: - label: pcrf_psm_server_name - hidden: false - immutable: false - type: string - description: pcrf_psm_server_name - pcm_flavor_name: - label: pcm_flavor_name - hidden: false - immutable: false - type: string - description: pcm_flavor_name - oam_net_id: - label: oam_net_id - hidden: false - immutable: false - type: string - description: oam_net_id - oam_net_ip: - hidden: false - immutable: false - type: string - description: prop - oam_net_mask: - hidden: false - immutable: false - type: string - description: prop - fsb1-oam-ip: - hidden: false - immutable: false - type: string - description: prop - node_templates: - jsa_net1: - type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net - properties: - shared: true - network_name: - get_attribute: - - FSB1_Internal1 - - network_id - dhcp_agent_ids: - get_attribute: - - FSB1_template - - addresses - tenant_id: - get_attribute: - - FSB2_Internal2 - - network_id - qos_policy: - get_attribute: - - FSB2_Internal2 - - network_id - cmaui_volume1: - type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume - properties: - volume_type: - get_input: CMAUI_volume_type - size: '(get_input : cmaui_cinder_volume_size) * 1024' - cmaui_volume2: - type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume - properties: - volume_type: - get_input: CMAUI_volume_type - size: '(get_input : cmaui_cinder_volume_size) * 1024' - abstract_FSB1_0: - type: org.openecomp.resource.abstract.nodes.FSB1_0 - directives: - - substitutable - properties: - port_FSB1_Internal_mac_address: - get_input: fsb1-Internal1-mac - compute_FSB1_availability_zone: - - get_input: fsb_zone - port_FSB1_Internal_network: - - Internal1-net - vm_flavor_name: - get_input: fsb1-flavor - port_FSB2_Internal_mac_address: - get_input: fsb1-Internal2-mac - port_FSB2_Internal_network: - - Internal2-net - service_template_filter: - substitute_service_template: Nested_FSB1_0ServiceTemplate.yaml - count: 1 - index_value: - get_property: - - SELF - - service_template_filter - - index_value - requirements: - - link_FSB1_FSB1_Internal: - capability: tosca.capabilities.network.Linkable - node: jsa_net1 - relationship: tosca.relationships.network.LinksTo - - local_storage_FSB1: - capability: tosca.capabilities.Attachment - node: cmaui_volume1 - relationship: cmaui_volume_attachment - - local_storage_FSB1: - capability: tosca.capabilities.Attachment - node: cmaui_volume2 - relationship: cmaui_volume_attachment - abstract_FSB1_1: - type: org.openecomp.resource.abstract.nodes.FSB1_1 - directives: - - substitutable - properties: - compute_FSB1_availability_zone: - - get_input: fsb_zone - vm_flavor_name: - get_input: fsb1-flavor - service_template_filter: - substitute_service_template: Nested_FSB1_1ServiceTemplate.yaml - count: 1 - index_value: - get_property: - - SELF - - service_template_filter - - index_value - requirements: - - link_FSB1_FSB1_Internal: - capability: tosca.capabilities.network.Linkable - node: jsa_net1 - relationship: tosca.relationships.network.LinksTo - - local_storage_FSB1: - capability: tosca.capabilities.Attachment - node: cmaui_volume1 - relationship: cmaui_volume_attachment - - local_storage_FSB1: - capability: tosca.capabilities.Attachment - node: cmaui_volume2 - relationship: cmaui_volume_attachment - abstract_FSB1_2: - type: org.openecomp.resource.abstract.nodes.FSB1_2 - directives: - - substitutable - properties: - compute_FSB1_availability_zone: - - get_input: fsb_zone - vm_flavor_name: - get_input: fsb1-flavor - service_template_filter: - substitute_service_template: Nested_FSB1_2ServiceTemplate.yaml - count: 1 - index_value: - get_property: - - SELF - - service_template_filter - - index_value - requirements: - - link_FSB1_FSB1_Internal: - capability: tosca.capabilities.network.Linkable - node: jsa_net1 - relationship: tosca.relationships.network.LinksTo - - local_storage_FSB1: - capability: tosca.capabilities.Attachment - node: cmaui_volume1 - relationship: cmaui_volume_attachment - - local_storage_FSB1: - capability: tosca.capabilities.Attachment - node: cmaui_volume2 - relationship: cmaui_volume_attachment - groups: - ep-jsa_net_group: - type: org.openecomp.groups.heat.HeatStack - properties: - heat_file: ../Artifacts/ep-jsa_net.yaml - description: | - Version 2.0 02-09-2016 (Authors: John Doe, user PROD) - members: - - abstract_FSB1_0 - - abstract_FSB1_1 - - abstract_FSB1_2 - outputs: - simpleOutput1: - value: - get_attribute: - - abstract_FSB1_0 - - FSB1_accessIPv4 - simpleOutput2: - value: - get_attribute: - - FSB2_template - - addresses - - key1 - complexOutput1: - value: - get_attribute: - - abstract_FSB1_0 - - FSB1_addresses - - get_attribute: - - abstract_FSB1_0 - - FSB1_FSB2_Internal_tenant_id - complexOutput2: - description: cgi fw01 left interface Mac-Address - value: - get_attribute: - - FSB1_Internal2 - - device_owner - - get_input: - - CMAUI_volume_type - - get_attribute: - - FSB2_Internal1 - - user_data_format - - 0 - - OS-EXT-IPS-MAC:mac_addr - complexOutput3: - description: cgi fw01 left interface Mac-Address - value: - get_input: - - a - - addresses - - get_input: - - CMAUI_volume_type - - get_attribute: - - abstract_FSB1_0 - - FSB1_FSB1_Internal_admin_state_up - - 0 - - OS-EXT-IPS-MAC:mac_addr diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/consolidation/out/MainServiceTemplate.yaml index d4722c1b28..a46b7613ae 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/consolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/consolidation/out/MainServiceTemplate.yaml @@ -104,6 +104,7 @@ topology_template: mac_address: get_input: fsb2-Internal2-mac network: Internal2-net-fsb2-Internal2 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -119,6 +120,7 @@ topology_template: mac_address: get_input: fsb2-Internal1-mac network: Internal2-net-fsb2-Internal1 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -134,6 +136,7 @@ topology_template: mac_address: get_input: fsb1-Internal2-mac network: Internal1-net-fsb1-Internal2 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -149,6 +152,7 @@ topology_template: mac_address: get_input: fsb1-Internal1-mac network: Internal1-net-fsb1-Internal1 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -249,6 +253,9 @@ topology_template: compute_FSB_admin_pass: - OPTIONAL-DATA-FSB1 - null + port_FSB1_Internal_subinterface_indicator: + - true + - true port_FSB1_Internal_network: - Internal1-net-fsb1-Internal1 - Internal1-net-fsb1-Internal2 @@ -264,6 +271,9 @@ topology_template: - write_files: - path: /path3/etc/sysconfig/network-scripts/ifcfg-eth0 - path: /path4/etc/sysconfig/network-scripts/ifcfg-eth1 + port_FSB2_Internal_subinterface_indicator: + - true + - true compute_FSB_availability_zone: - get_input: fsb1_zone - get_input: fsb2_zone diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/noConsolidation/out/MainServiceTemplate.yaml index 12db507859..9efe855849 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/noConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/noConsolidation/out/MainServiceTemplate.yaml @@ -57,6 +57,7 @@ topology_template: replacement_policy: AUTO network: get_input: port_name + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -88,6 +89,7 @@ topology_template: replacement_policy: AUTO network: get_input: port_name + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -106,6 +108,8 @@ topology_template: - RAW vm_image_name: get_input: image_smp_name + port_port_1_subinterface_indicator: + - true port_port_2_replacement_policy: - AUTO compute_smp_name: @@ -114,6 +118,8 @@ topology_template: - AUTO port_port_1_network: - get_input: port_name + port_port_2_subinterface_indicator: + - true port_port_2_network: - get_input: port_name compute_smp_metadata: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/consolidation/out/MainServiceTemplate.yaml index df2509108f..7691174c4c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/consolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/consolidation/out/MainServiceTemplate.yaml @@ -104,6 +104,7 @@ topology_template: mac_address: get_input: fsb2-Internal2-mac network: Internal2-net-fsb2-Internal2 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -119,6 +120,7 @@ topology_template: mac_address: get_input: fsb2-Internal1-mac network: Internal2-net-fsb2-Internal1 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -134,6 +136,7 @@ topology_template: mac_address: get_input: fsb1-Internal2-mac network: Internal1-net-fsb1-Internal2 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -149,6 +152,7 @@ topology_template: mac_address: get_input: fsb1-Internal1-mac network: Internal1-net-fsb1-Internal1 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -262,6 +266,9 @@ topology_template: compute_FSB_admin_pass: - STATIC-DATA-FSB1 - STATIC-DATA-FSB2 + port_FSB1_Internal_subinterface_indicator: + - true + - true port_FSB1_Internal_network: - Internal1-net-fsb1-Internal1 - Internal1-net-fsb1-Internal2 @@ -277,6 +284,9 @@ topology_template: - write_files: - path: /path3/etc/sysconfig/network-scripts/ifcfg-eth0 - path: /path4/etc/sysconfig/network-scripts/ifcfg-eth1 + port_FSB2_Internal_subinterface_indicator: + - true + - true compute_FSB_availability_zone: - get_input: fsb1_zone - get_input: fsb2_zone diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/noConsolidation/out/MainServiceTemplate.yaml index 44452b959f..386d6cd7fb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/noConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/noConsolidation/out/MainServiceTemplate.yaml @@ -55,6 +55,7 @@ topology_template: properties: network: get_input: cdr_network + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -65,6 +66,7 @@ topology_template: properties: network: get_input: oam_private_net_name + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -97,18 +99,22 @@ topology_template: directives: - substitutable properties: + vm_flavor_name: FLAVOR-test + vm_image_name: Image-test + port_oam_private_net_network_port_subinterface_indicator: + - true compute_QRouter_availability_zone: - Availability-test compute_QRouter_config_drive: - true port_cdr_network_port_network: - get_input: cdr_network - vm_flavor_name: FLAVOR-test port_oam_private_net_network_port_network: - get_input: oam_private_net_name - vm_image_name: Image-test compute_QRouter_name: - QRouter-name + port_cdr_network_port_subinterface_indicator: + - true service_template_filter: substitute_service_template: Nested_QRouterServiceTemplate.yaml count: 1 @@ -127,4 +133,4 @@ topology_template: - packet_mirror_network - packet_internal_network - cdr_network_port - - oam_private_net_network_port
\ No newline at end of file + - oam_private_net_network_port diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/out/MainServiceTemplate.yaml index 5071ce06a4..f2d7a0b7f9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/out/MainServiceTemplate.yaml @@ -104,6 +104,7 @@ topology_template: mac_address: get_input: fsb2-Internal2-mac network: Internal2-net-fsb2-Internal2 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -119,6 +120,7 @@ topology_template: mac_address: get_input: fsb2-Internal1-mac network: Internal2-net-fsb2-Internal1 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -134,6 +136,7 @@ topology_template: mac_address: get_input: fsb1-Internal2-mac network: Internal1-net-fsb1-Internal2 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -149,6 +152,7 @@ topology_template: mac_address: get_input: fsb1-Internal1-mac network: Internal1-net-fsb1-Internal1 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -249,6 +253,9 @@ topology_template: compute_FSB_admin_pass: - STATIC-DATA-FSB1 - STATIC-DATA-FSB2 + port_FSB1_Internal_subinterface_indicator: + - true + - true port_FSB1_Internal_network: - Internal1-net-fsb1-Internal1 - Internal1-net-fsb1-Internal2 @@ -264,6 +271,9 @@ topology_template: - write_files: - path: /path3/etc/sysconfig/network-scripts/ifcfg-eth0 - path: /path4/etc/sysconfig/network-scripts/ifcfg-eth1 + port_FSB2_Internal_subinterface_indicator: + - true + - true compute_FSB_availability_zone: - get_input: fsb1_zone - get_input: fsb2_zone diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/out/MainServiceTemplate.yaml index a881a1e458..c4d02a16cd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/out/MainServiceTemplate.yaml @@ -79,6 +79,7 @@ topology_template: mac_address: get_input: fsb1-Internal2-mac network: Internal2-net + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -90,6 +91,7 @@ topology_template: mac_address: get_input: fsb1-Internal1-mac network: Internal1-net + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -106,6 +108,7 @@ topology_template: - ip_address: get_input: fsb1-oam-ip network: jsa_net1 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -175,12 +178,16 @@ topology_template: properties: port_FSB1_Internal_mac_address: get_input: fsb1-Internal1-mac + port_FSB1_OAM_subinterface_indicator: + - true vm_flavor_name: get_input: fsb-flavor vm_image_name: get_input: fsb-image compute_FSB_admin_pass: - STATIC-DATA-FSB1 + port_FSB1_Internal_subinterface_indicator: + - true port_FSB1_Internal_network: - Internal1-net port_FSB2_Internal_mac_address: @@ -193,6 +200,8 @@ topology_template: - write_files: - path: /path1/etc/sysconfig/network-scripts/ifcfg-eth0 - path: /path2/etc/sysconfig/network-scripts/ifcfg-eth1 + port_FSB2_Internal_subinterface_indicator: + - true compute_FSB_availability_zone: - get_input: fsb1_zone port_FSB1_OAM_fixed_ips: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/out/MainServiceTemplate.yaml index 6ae9f35a2a..82e7614811 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/out/MainServiceTemplate.yaml @@ -104,6 +104,7 @@ topology_template: mac_address: get_input: fsb2-Internal2-mac network: Internal2-net-fsb2-Internal2 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -119,6 +120,7 @@ topology_template: mac_address: get_input: fsb2-Internal1-mac network: Internal2-net-fsb2-Internal1 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -134,6 +136,7 @@ topology_template: mac_address: get_input: fsb1-Internal2-mac network: Internal1-net-fsb1-Internal2 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -149,6 +152,7 @@ topology_template: mac_address: get_input: fsb1-Internal1-mac network: Internal1-net-fsb1-Internal1 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -289,6 +293,9 @@ topology_template: compute_FSB_admin_pass: - STATIC-DATA-FSB1 - STATIC-DATA-FSB2 + port_FSB1_Internal_subinterface_indicator: + - true + - true port_FSB1_Internal_network: - Internal1-net-fsb1-Internal1 - Internal1-net-fsb1-Internal2 @@ -304,6 +311,9 @@ topology_template: - write_files: - path: /path3/etc/sysconfig/network-scripts/ifcfg-eth0 - path: /path4/etc/sysconfig/network-scripts/ifcfg-eth1 + port_FSB2_Internal_subinterface_indicator: + - true + - true compute_FSB_availability_zone: - get_input: fsb1_zone - get_input: fsb2_zone diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/out/MainServiceTemplate.yaml index 99365a8f15..8e411bde02 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/out/MainServiceTemplate.yaml @@ -79,6 +79,7 @@ topology_template: mac_address: get_input: fsb1-Internal2-mac network: Internal2-net + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -90,6 +91,7 @@ topology_template: mac_address: get_input: fsb1-Internal1-mac network: Internal1-net + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -106,6 +108,7 @@ topology_template: - ip_address: get_input: fsb1-oam-ip network: jsa_net1 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -195,12 +198,16 @@ topology_template: properties: port_FSB1_Internal_mac_address: get_input: fsb1-Internal1-mac + port_FSB1_OAM_subinterface_indicator: + - true vm_flavor_name: get_input: fsb-flavor vm_image_name: get_input: fsb-image compute_FSB_admin_pass: - STATIC-DATA-FSB1 + port_FSB1_Internal_subinterface_indicator: + - true port_FSB1_Internal_network: - Internal1-net port_FSB2_Internal_mac_address: @@ -213,6 +220,8 @@ topology_template: - write_files: - path: /path1/etc/sysconfig/network-scripts/ifcfg-eth0 - path: /path2/etc/sysconfig/network-scripts/ifcfg-eth1 + port_FSB2_Internal_subinterface_indicator: + - true compute_FSB_availability_zone: - get_input: fsb1_zone port_FSB1_OAM_fixed_ips: |