diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition')
24 files changed, 208 insertions, 545 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 7087e7d068..114521fe48 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,12 +8,20 @@ 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 @@ -22,142 +30,74 @@ node_types: type: string required: true status: SUPPORTED - 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: + port_FSB1_OAM_subnetpoolid: type: string required: true status: SUPPORTED - port_FSB1_OAM_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB1_Internal_vlan_requirements: + compute_FSB1_metadata: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB1_Internal_network: - type: list + type: json + port_FSB2_Internal_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: string - port_FSB2_Internal_1_order: - type: integer + port_FSB1_OAM_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_FSB2_Internal_2_ip_requirements: + port_FSB1_OAM_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - 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_role: - type: string - 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_FSB2_Internal_2_network_role_tag: - type: string + port_FSB2_Internal_2_order: + type: integer required: true status: SUPPORTED - port_FSB2_Internal_1_subnetpoolid: + port_FSB2_Internal_1_mac_address: type: string required: true status: SUPPORTED - port_FSB1_Internal_mac_address: + vm_flavor_name: 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: + port_FSB2_Internal_2_mac_address: 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: + port_FSB2_Internal_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: boolean - port_FSB1_OAM_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_FSB1_OAM_ip_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.IpRequirements - port_FSB2_Internal_1_mac_address: - type: string - required: true - status: SUPPORTED - port_FSB2_Internal_2_mac_address: + type: org.openecomp.datatypes.network.VlanRequirements + port_FSB1_Internal_network_role_tag: type: string required: true status: SUPPORTED - port_FSB2_Internal_1_ip_requirements: + port_FSB1_OAM_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_2_vlan_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + port_FSB1_Internal_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 @@ -174,13 +114,13 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_FSB1_Internal_subinterface_indicator: + compute_FSB1_availability_zone: type: list required: true status: SUPPORTED entry_schema: - type: boolean - compute_FSB1_availability_zone: + type: string + port_FSB1_Internal_network: type: list required: true status: SUPPORTED @@ -194,12 +134,16 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_FSB2_Internal_2_subinterface_indicator: + 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: boolean + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_OAM_order: type: integer required: true @@ -210,12 +154,28 @@ 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 @@ -224,6 +184,14 @@ 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 @@ -244,10 +212,18 @@ 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 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 29f618cc5b..eb0ec3020f 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,98 +11,34 @@ 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 - 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: + port_FSB1_OAM_subnetpoolid: 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: + compute_FSB1_metadata: 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 + type: json 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 @@ -111,9 +47,15 @@ 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 @@ -130,6 +72,16 @@ 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 @@ -142,12 +94,12 @@ topology_template: port_FSB1_OAM_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_FSB1_Internal_subinterface_indicator: + compute_FSB1_availability_zone: type: list required: true entry_schema: - type: boolean - compute_FSB1_availability_zone: + type: string + port_FSB1_Internal_network: type: list required: true entry_schema: @@ -159,11 +111,14 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_FSB2_Internal_2_subinterface_indicator: + port_FSB2_Internal_1_order: + type: integer + required: true + port_FSB2_Internal_2_ip_requirements: type: list required: true entry_schema: - type: boolean + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_OAM_order: type: integer required: true @@ -172,17 +127,36 @@ 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 @@ -199,9 +173,15 @@ 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 @@ -210,10 +190,7 @@ 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 + subinterface_indicator: false ip_requirements: get_input: port_FSB1_Internal_ip_requirements network_role_tag: @@ -244,10 +221,7 @@ 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 + subinterface_indicator: false ip_requirements: get_input: port_FSB2_Internal_1_ip_requirements network_role_tag: @@ -278,10 +252,7 @@ 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 + subinterface_indicator: false ip_requirements: get_input: port_FSB2_Internal_2_ip_requirements network_role_tag: @@ -312,10 +283,7 @@ 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 + subinterface_indicator: false 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 e21fa17343..e22c860596 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,12 +42,6 @@ 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 @@ -104,12 +98,6 @@ 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 @@ -166,12 +154,6 @@ 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 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 e1a6f40602..82388dac1d 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,11 +38,6 @@ 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 @@ -87,11 +82,6 @@ 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 @@ -137,11 +127,6 @@ 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 @@ -169,10 +154,7 @@ 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 + subinterface_indicator: false ip_requirements: get_input: port_FSB1_Internal_ip_requirements network_role_tag: @@ -203,10 +185,7 @@ 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 + subinterface_indicator: false ip_requirements: get_input: port_FSB2_Internal_ip_requirements network_role_tag: @@ -237,10 +216,7 @@ 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 + subinterface_indicator: false 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 8113a8048f..b0861eae74 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,12 +74,6 @@ 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 @@ -122,12 +116,6 @@ 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 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 72d2ee6f1f..2978332fac 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,11 +63,6 @@ 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 @@ -102,11 +97,6 @@ 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 @@ -126,10 +116,7 @@ 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 + subinterface_indicator: false ip_requirements: get_input: port_FSB1_Internal_ip_requirements network_role_tag: @@ -160,10 +147,7 @@ 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 + subinterface_indicator: false 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 52effbbc3a..7aadbaf386 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,12 +42,6 @@ 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 @@ -104,12 +98,6 @@ 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 @@ -166,12 +154,6 @@ 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 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 0fb34fd252..b3663c8ac4 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,11 +38,6 @@ 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 @@ -87,11 +82,6 @@ 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 @@ -137,11 +127,6 @@ 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 @@ -169,10 +154,7 @@ 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 + subinterface_indicator: false ip_requirements: get_input: port_FSB1_Internal_ip_requirements network_role_tag: @@ -203,10 +185,7 @@ 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 + subinterface_indicator: false ip_requirements: get_input: port_FSB2_Internal_ip_requirements network_role_tag: @@ -237,10 +216,7 @@ 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 + subinterface_indicator: false 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 c88962628d..3e8b719e50 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,48 +38,6 @@ 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 @@ -98,30 +56,52 @@ 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_FSB2_Internal_network: + port_FSB1_Internal_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_FSB2_Internal_subinterface_indicator: + type: org.openecomp.datatypes.network.VlanRequirements + port_FSB2_Internal_network: type: list required: true status: SUPPORTED entry_schema: - type: boolean + type: string + port_FSB2_Internal_subnetpoolid: + type: string + required: true + status: SUPPORTED port_FSB1_Internal_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -132,6 +112,14 @@ 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 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 b1ba634c79..9e616c9ba0 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,39 +35,6 @@ 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 @@ -83,25 +50,42 @@ 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_FSB2_Internal_network: + port_FSB1_Internal_vlan_requirements: type: list required: true entry_schema: - type: string - port_FSB2_Internal_subinterface_indicator: + type: org.openecomp.datatypes.network.VlanRequirements + port_FSB2_Internal_network: type: list required: true entry_schema: - type: boolean + type: string + port_FSB2_Internal_subnetpoolid: + type: string + required: true port_FSB1_Internal_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -110,6 +94,12 @@ 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 @@ -121,10 +111,7 @@ 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 + subinterface_indicator: false ip_requirements: get_input: port_FSB1_Internal_ip_requirements network_role_tag: @@ -161,10 +148,7 @@ 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 + subinterface_indicator: false 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/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 7fd691c1d9..397a1a0541 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,12 +36,6 @@ 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,12 +92,6 @@ 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 @@ -154,12 +142,6 @@ 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 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 f0a87d321a..bb7bb359c1 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,11 +33,6 @@ 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,11 +77,6 @@ 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 @@ -127,11 +117,6 @@ 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,10 +139,7 @@ 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 + subinterface_indicator: false ip_requirements: get_input: port_FSB1_Internal_ip_requirements network_role_tag: @@ -188,10 +170,7 @@ 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 + subinterface_indicator: false ip_requirements: get_input: port_FSB2_Internal_ip_requirements network_role_tag: @@ -222,10 +201,7 @@ 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 + subinterface_indicator: false 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 53edc4aa75..62e3c5574a 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,7 +74,6 @@ topology_template: mac_address: get_input: fsb1-Internal2-mac network: Internal2-net - subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -86,7 +85,6 @@ topology_template: mac_address: get_input: fsb1-Internal1-mac network: Internal1-net - subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -103,7 +101,6 @@ topology_template: - ip_address: get_input: fsb1-oam-ip network: jsa_net1 - subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -184,16 +181,12 @@ topology_template: properties: port_FSB1_Internal_mac_address: get_input: fsb1-Internal1-mac - port_FSB1_OAM_subinterface_indicator: - - false 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: - - false port_FSB1_Internal_network: - Internal1-net port_FSB2_Internal_mac_address: @@ -206,8 +199,6 @@ 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: - - false 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 1ece0e77db..6305a7cae6 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,7 +69,6 @@ topology_template: mac_address: get_input: fsb1-Internal2-mac network: Internal2-net - subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -81,7 +80,6 @@ topology_template: mac_address: get_input: fsb1-Internal1-mac network: Internal1-net - subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -160,8 +158,6 @@ topology_template: directives: - substitutable properties: - port_FSB1_Internal_2_subinterface_indicator: - - false vm_flavor_name: get_input: fsb-flavor vm_image_name: @@ -170,8 +166,6 @@ topology_template: - STATIC-DATA-FSB1 port_FSB1_Internal_1_mac_address: get_input: fsb1-Internal1-mac - port_FSB1_Internal_1_subinterface_indicator: - - false 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 74af8bd259..ca75560607 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,7 +94,6 @@ topology_template: mac_address: get_input: fsb2-Internal2-mac network: Internal2-net-fsb2-Internal2 - subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -106,7 +105,6 @@ topology_template: mac_address: get_input: fsb2-Internal1-mac network: Internal2-net-fsb2-Internal1 - subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -118,7 +116,6 @@ topology_template: mac_address: get_input: fsb1-Internal2-mac network: Internal1-net-fsb1-Internal2 - subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -134,7 +131,6 @@ topology_template: mac_address: get_input: fsb1-Internal1-mac network: Internal1-net-fsb1-Internal1 - subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -256,9 +252,6 @@ topology_template: compute_FSB_admin_pass: - STATIC-DATA-FSB1 - STATIC-DATA-FSB2 - port_FSB1_Internal_subinterface_indicator: - - false - - false port_FSB1_Internal_network: - Internal1-net-fsb1-Internal1 - Internal1-net-fsb1-Internal2 @@ -274,9 +267,6 @@ 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: - - false - - false 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 cb4c364068..51410677fb 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,16 +259,12 @@ topology_template: directives: - substitutable properties: - port_VMI_subinterface_indicator: - - false 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: - - false 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/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 33cf0ab91a..d4722c1b28 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,7 +104,6 @@ topology_template: mac_address: get_input: fsb2-Internal2-mac network: Internal2-net-fsb2-Internal2 - subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -120,7 +119,6 @@ topology_template: mac_address: get_input: fsb2-Internal1-mac network: Internal2-net-fsb2-Internal1 - subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -136,7 +134,6 @@ topology_template: mac_address: get_input: fsb1-Internal2-mac network: Internal1-net-fsb1-Internal2 - subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -152,7 +149,6 @@ topology_template: mac_address: get_input: fsb1-Internal1-mac network: Internal1-net-fsb1-Internal1 - subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -253,9 +249,6 @@ topology_template: compute_FSB_admin_pass: - OPTIONAL-DATA-FSB1 - null - port_FSB1_Internal_subinterface_indicator: - - false - - false port_FSB1_Internal_network: - Internal1-net-fsb1-Internal1 - Internal1-net-fsb1-Internal2 @@ -271,9 +264,6 @@ 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: - - false - - false 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 bf66e19579..12db507859 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,7 +57,6 @@ topology_template: replacement_policy: AUTO network: get_input: port_name - subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -89,7 +88,6 @@ topology_template: replacement_policy: AUTO network: get_input: port_name - subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -108,8 +106,6 @@ topology_template: - RAW vm_image_name: get_input: image_smp_name - port_port_1_subinterface_indicator: - - false port_port_2_replacement_policy: - AUTO compute_smp_name: @@ -118,8 +114,6 @@ topology_template: - AUTO port_port_1_network: - get_input: port_name - port_port_2_subinterface_indicator: - - false 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 f0d017909c..df2509108f 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,7 +104,6 @@ topology_template: mac_address: get_input: fsb2-Internal2-mac network: Internal2-net-fsb2-Internal2 - subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -120,7 +119,6 @@ topology_template: mac_address: get_input: fsb2-Internal1-mac network: Internal2-net-fsb2-Internal1 - subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -136,7 +134,6 @@ topology_template: mac_address: get_input: fsb1-Internal2-mac network: Internal1-net-fsb1-Internal2 - subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -152,7 +149,6 @@ topology_template: mac_address: get_input: fsb1-Internal1-mac network: Internal1-net-fsb1-Internal1 - subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -266,9 +262,6 @@ topology_template: compute_FSB_admin_pass: - STATIC-DATA-FSB1 - STATIC-DATA-FSB2 - port_FSB1_Internal_subinterface_indicator: - - false - - false port_FSB1_Internal_network: - Internal1-net-fsb1-Internal1 - Internal1-net-fsb1-Internal2 @@ -284,9 +277,6 @@ 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: - - false - - false 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 796d4db974..e4ee3cca82 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,7 +55,6 @@ topology_template: properties: network: get_input: cdr_network - subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -66,7 +65,6 @@ topology_template: properties: network: get_input: oam_private_net_name - subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -99,22 +97,18 @@ topology_template: directives: - substitutable properties: - vm_flavor_name: FLAVOR-test - vm_image_name: Image-test - port_oam_private_net_network_port_subinterface_indicator: - - false 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: - - false service_template_filter: substitute_service_template: Nested_QRouterServiceTemplate.yaml count: 1 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 6315ba5ec4..5071ce06a4 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,7 +104,6 @@ topology_template: mac_address: get_input: fsb2-Internal2-mac network: Internal2-net-fsb2-Internal2 - subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -120,7 +119,6 @@ topology_template: mac_address: get_input: fsb2-Internal1-mac network: Internal2-net-fsb2-Internal1 - subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -136,7 +134,6 @@ topology_template: mac_address: get_input: fsb1-Internal2-mac network: Internal1-net-fsb1-Internal2 - subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -152,7 +149,6 @@ topology_template: mac_address: get_input: fsb1-Internal1-mac network: Internal1-net-fsb1-Internal1 - subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -253,9 +249,6 @@ topology_template: compute_FSB_admin_pass: - STATIC-DATA-FSB1 - STATIC-DATA-FSB2 - port_FSB1_Internal_subinterface_indicator: - - false - - false port_FSB1_Internal_network: - Internal1-net-fsb1-Internal1 - Internal1-net-fsb1-Internal2 @@ -271,9 +264,6 @@ 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: - - false - - false 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 03086cc4a9..a881a1e458 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,7 +79,6 @@ topology_template: mac_address: get_input: fsb1-Internal2-mac network: Internal2-net - subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -91,7 +90,6 @@ topology_template: mac_address: get_input: fsb1-Internal1-mac network: Internal1-net - subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -108,7 +106,6 @@ topology_template: - ip_address: get_input: fsb1-oam-ip network: jsa_net1 - subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -178,16 +175,12 @@ topology_template: properties: port_FSB1_Internal_mac_address: get_input: fsb1-Internal1-mac - port_FSB1_OAM_subinterface_indicator: - - false 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: - - false port_FSB1_Internal_network: - Internal1-net port_FSB2_Internal_mac_address: @@ -200,8 +193,6 @@ 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: - - false 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 511aa0ccbe..6ae9f35a2a 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,7 +104,6 @@ topology_template: mac_address: get_input: fsb2-Internal2-mac network: Internal2-net-fsb2-Internal2 - subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -120,7 +119,6 @@ topology_template: mac_address: get_input: fsb2-Internal1-mac network: Internal2-net-fsb2-Internal1 - subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -136,7 +134,6 @@ topology_template: mac_address: get_input: fsb1-Internal2-mac network: Internal1-net-fsb1-Internal2 - subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -152,7 +149,6 @@ topology_template: mac_address: get_input: fsb1-Internal1-mac network: Internal1-net-fsb1-Internal1 - subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -293,9 +289,6 @@ topology_template: compute_FSB_admin_pass: - STATIC-DATA-FSB1 - STATIC-DATA-FSB2 - port_FSB1_Internal_subinterface_indicator: - - false - - false port_FSB1_Internal_network: - Internal1-net-fsb1-Internal1 - Internal1-net-fsb1-Internal2 @@ -311,9 +304,6 @@ 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: - - false - - false 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 41a5177c3d..99365a8f15 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,7 +79,6 @@ topology_template: mac_address: get_input: fsb1-Internal2-mac network: Internal2-net - subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -91,7 +90,6 @@ topology_template: mac_address: get_input: fsb1-Internal1-mac network: Internal1-net - subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -108,7 +106,6 @@ topology_template: - ip_address: get_input: fsb1-oam-ip network: jsa_net1 - subinterface_indicator: false requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -198,16 +195,12 @@ topology_template: properties: port_FSB1_Internal_mac_address: get_input: fsb1-Internal1-mac - port_FSB1_OAM_subinterface_indicator: - - false 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: - - false port_FSB1_Internal_network: - Internal1-net port_FSB2_Internal_mac_address: @@ -220,8 +213,6 @@ 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: - - false compute_FSB_availability_zone: - get_input: fsb1_zone port_FSB1_OAM_fixed_ips: |