From b3d4898d9e8452ea0b8d848c048e712d43b8d9a3 Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Sun, 11 Jun 2017 14:22:02 +0300 Subject: [SDC-29] rebase continue work to align source Change-Id: I218f1c5ee23fb2c8314f1c70921d3ad8682c10f4 Signed-off-by: Michael Lando --- .../GlobalSubstitutionTypesServiceTemplate.yaml | 212 +++++++++++++- .../out/SubstitutionServiceTemplate.yaml | 306 ++++++++++++++++++++- .../GlobalSubstitutionTypesServiceTemplate.yaml | 2 +- .../NoPorts/out/SubstitutionServiceTemplate.yaml | 2 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 160 ++++++++++- .../WithIndex/out/SubstitutionServiceTemplate.yaml | 232 +++++++++++++++- .../GlobalSubstitutionTypesServiceTemplate.yaml | 108 +++++++- .../out/SubstitutionServiceTemplate.yaml | 154 ++++++++++- .../GlobalSubstitutionTypesServiceTemplate.yaml | 160 ++++++++++- .../out/SubstitutionServiceTemplate.yaml | 232 +++++++++++++++- .../GlobalSubstitutionTypesServiceTemplate.yaml | 104 ++++++- .../out/SubstitutionServiceTemplate.yaml | 152 +++++++++- .../GlobalSubstitutionTypesServiceTemplate.yaml | 158 ++++++++++- .../out/SubstitutionServiceTemplate.yaml | 230 +++++++++++++++- .../out/MainServiceTemplate.yaml | 14 +- .../out/MainServiceTemplate.yaml | 14 +- .../out/MainServiceTemplate.yaml | 18 +- .../noConsolidation/out/MainServiceTemplate.yaml | 6 +- .../consolidation/out/MainServiceTemplate.yaml | 18 +- .../noConsolidation/out/MainServiceTemplate.yaml | 18 +- .../consolidation/out/MainServiceTemplate.yaml | 18 +- .../noConsolidation/out/MainServiceTemplate.yaml | 8 +- .../consolidation/out/MainServiceTemplate.yaml | 18 +- .../noConsolidation/out/MainServiceTemplate.yaml | 14 +- .../consolidation/out/MainServiceTemplate.yaml | 18 +- .../noConsolidation/out/MainServiceTemplate.yaml | 14 +- 26 files changed, 2215 insertions(+), 175 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition') 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 9159c8b742..13cccd38b7 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 @@ -14,12 +14,166 @@ node_types: status: SUPPORTED entry_schema: type: string + port_FSB_OAM_network_role_tag: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB1_Internal_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB1_Internal_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string compute_FSB1_metadata: type: list required: true status: SUPPORTED entry_schema: type: json + port_FSB2_Internal2_network_role_tag: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB2_Internal1_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + vm_flavor_name: + type: string + required: true + status: SUPPORTED + port_FSB_OAM_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB2_Internal2_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB2_Internal2_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB2_Internal1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB2_Internal1_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB_OAM_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB1_Internal_network_role_tag: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB2_Internal1_mac_address: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB2_Internal1_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB1_Internal_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB1_Internal_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB_OAM_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB_OAM_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB1_Internal_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB2_Internal1_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB2_Internal2_mac_address: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB2_Internal2_mac_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB_OAM_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB2_Internal2_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB_OAM_mac_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json compute_FSB1_availability_zone: type: list required: true @@ -40,47 +194,85 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_FSB_OAM_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer port_FSB2_Internal2_network: type: list required: true status: SUPPORTED entry_schema: type: string - vm_flavor_name: - type: string + port_FSB2_Internal2_vlan_requirements: + type: list required: true status: SUPPORTED - port_FSB2_Internal1_mac_address: + entry_schema: + type: json + port_FSB2_Internal1_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer + port_FSB2_Internal2_subnetpoolid: type: list required: true status: SUPPORTED entry_schema: type: string + port_FSB1_Internal_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer + port_FSB2_Internal1_network_role_tag: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB2_Internal1_mac_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json port_FSB_OAM_fixed_ips: type: list required: true status: SUPPORTED entry_schema: type: json - compute_FSB1_name: + port_FSB2_Internal2_order: type: list required: true status: SUPPORTED entry_schema: - type: string - port_FSB_OAM_network: + type: integer + port_FSB2_Internal1_subnetpoolid: type: list required: true status: SUPPORTED entry_schema: type: string - port_FSB2_Internal1_network: + port_FSB1_Internal_mac_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_FSB2_Internal2_mac_address: + type: json + port_FSB_OAM_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + compute_FSB1_name: type: list required: true status: SUPPORTED @@ -655,4 +847,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED + - UNBOUNDED \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/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 3fd981df0e..ac5e7b1360 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 @@ -16,11 +16,139 @@ topology_template: required: true entry_schema: type: string + port_FSB_OAM_network_role_tag: + type: list + required: true + entry_schema: + type: string + port_FSB1_Internal_ip_requirements: + type: list + required: true + entry_schema: + type: json + port_FSB1_Internal_subnetpoolid: + type: list + required: true + entry_schema: + type: string compute_FSB1_metadata: type: list required: true entry_schema: type: json + port_FSB2_Internal2_network_role_tag: + type: list + required: true + entry_schema: + type: string + port_FSB2_Internal1_exCP_naming: + type: list + required: true + entry_schema: + type: json + vm_flavor_name: + type: string + required: true + port_FSB_OAM_vlan_requirements: + type: list + required: true + entry_schema: + type: json + port_FSB2_Internal2_exCP_naming: + type: list + required: true + entry_schema: + type: json + port_FSB2_Internal2_network_role: + type: list + required: true + entry_schema: + type: string + port_FSB2_Internal1_ip_requirements: + type: list + required: true + entry_schema: + type: json + port_FSB2_Internal1_network_role: + type: list + required: true + entry_schema: + type: string + port_FSB_OAM_ip_requirements: + type: list + required: true + entry_schema: + type: json + port_FSB1_Internal_network_role_tag: + type: list + required: true + entry_schema: + type: string + port_FSB2_Internal1_mac_address: + type: list + required: true + entry_schema: + type: string + port_FSB2_Internal1_vlan_requirements: + type: list + required: true + entry_schema: + type: json + port_FSB1_Internal_vlan_requirements: + type: list + required: true + entry_schema: + type: json + port_FSB1_Internal_exCP_naming: + type: list + required: true + entry_schema: + type: json + port_FSB_OAM_network_role: + type: list + required: true + entry_schema: + type: string + port_FSB_OAM_network: + type: list + required: true + entry_schema: + type: string + port_FSB1_Internal_network_role: + type: list + required: true + entry_schema: + type: string + port_FSB2_Internal1_network: + type: list + required: true + entry_schema: + type: string + port_FSB2_Internal2_mac_address: + type: list + required: true + entry_schema: + type: string + port_FSB2_Internal2_mac_requirements: + type: list + required: true + entry_schema: + type: json + port_FSB_OAM_subnetpoolid: + type: list + required: true + entry_schema: + type: string + port_FSB2_Internal2_ip_requirements: + type: list + required: true + entry_schema: + type: json + port_FSB_OAM_mac_requirements: + type: list + required: true + entry_schema: + type: json compute_FSB1_availability_zone: type: list required: true @@ -38,40 +166,72 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_FSB_OAM_order: + type: list + required: true + entry_schema: + type: integer port_FSB2_Internal2_network: type: list required: true entry_schema: type: string - vm_flavor_name: - type: string + port_FSB2_Internal2_vlan_requirements: + type: list required: true - port_FSB2_Internal1_mac_address: + entry_schema: + type: json + port_FSB2_Internal1_order: + type: list + required: true + entry_schema: + type: integer + port_FSB2_Internal2_subnetpoolid: type: list required: true entry_schema: type: string + port_FSB1_Internal_order: + type: list + required: true + entry_schema: + type: integer + port_FSB2_Internal1_network_role_tag: + type: list + required: true + entry_schema: + type: string + port_FSB2_Internal1_mac_requirements: + type: list + required: true + entry_schema: + type: json port_FSB_OAM_fixed_ips: type: list required: true entry_schema: type: json - compute_FSB1_name: + port_FSB2_Internal2_order: type: list required: true entry_schema: - type: string - port_FSB_OAM_network: + type: integer + port_FSB2_Internal1_subnetpoolid: type: list required: true entry_schema: type: string - port_FSB2_Internal1_network: + port_FSB1_Internal_mac_requirements: type: list required: true entry_schema: - type: string - port_FSB2_Internal2_mac_address: + type: json + port_FSB_OAM_exCP_naming: + type: list + required: true + entry_schema: + type: json + compute_FSB1_name: type: list required: true entry_schema: @@ -80,6 +240,38 @@ topology_template: FSB1_FSB1_Internal: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + exCP_naming: + get_input: + - port_FSB1_Internal_exCP_naming + - index_value + vlan_requirements: + get_input: + - port_FSB1_Internal_vlan_requirements + - index_value + ip_requirements: + get_input: + - port_FSB1_Internal_ip_requirements + - index_value + network_role_tag: + get_input: + - port_FSB1_Internal_network_role_tag + - index_value + mac_requirements: + get_input: + - port_FSB1_Internal_mac_requirements + - index_value + order: + get_input: + - port_FSB1_Internal_order + - index_value + network_role: + get_input: + - port_FSB1_Internal_network_role + - index_value + subnetpoolid: + get_input: + - port_FSB1_Internal_subnetpoolid + - index_value network: get_input: - port_FSB1_Internal_network @@ -96,6 +288,38 @@ topology_template: FSB1_FSB_OAM: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + exCP_naming: + get_input: + - port_FSB_OAM_exCP_naming + - index_value + vlan_requirements: + get_input: + - port_FSB_OAM_vlan_requirements + - index_value + ip_requirements: + get_input: + - port_FSB_OAM_ip_requirements + - index_value + network_role_tag: + get_input: + - port_FSB_OAM_network_role_tag + - index_value + mac_requirements: + get_input: + - port_FSB_OAM_mac_requirements + - index_value + order: + get_input: + - port_FSB_OAM_order + - index_value + network_role: + get_input: + - port_FSB_OAM_network_role + - index_value + subnetpoolid: + get_input: + - port_FSB_OAM_subnetpoolid + - index_value fixed_ips: get_input: - port_FSB_OAM_fixed_ips @@ -112,6 +336,38 @@ topology_template: FSB1_FSB2_Internal2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + exCP_naming: + get_input: + - port_FSB2_Internal2_exCP_naming + - index_value + vlan_requirements: + get_input: + - port_FSB2_Internal2_vlan_requirements + - index_value + ip_requirements: + get_input: + - port_FSB2_Internal2_ip_requirements + - index_value + network_role_tag: + get_input: + - port_FSB2_Internal2_network_role_tag + - index_value + mac_requirements: + get_input: + - port_FSB2_Internal2_mac_requirements + - index_value + order: + get_input: + - port_FSB2_Internal2_order + - index_value + network_role: + get_input: + - port_FSB2_Internal2_network_role + - index_value + subnetpoolid: + get_input: + - port_FSB2_Internal2_subnetpoolid + - index_value network: get_input: - port_FSB2_Internal2_network @@ -152,6 +408,38 @@ topology_template: FSB1_FSB2_Internal1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + exCP_naming: + get_input: + - port_FSB2_Internal1_exCP_naming + - index_value + vlan_requirements: + get_input: + - port_FSB2_Internal1_vlan_requirements + - index_value + ip_requirements: + get_input: + - port_FSB2_Internal1_ip_requirements + - index_value + network_role_tag: + get_input: + - port_FSB2_Internal1_network_role_tag + - index_value + mac_requirements: + get_input: + - port_FSB2_Internal1_mac_requirements + - index_value + order: + get_input: + - port_FSB2_Internal1_order + - index_value + network_role: + get_input: + - port_FSB2_Internal1_network_role + - index_value + subnetpoolid: + get_input: + - port_FSB2_Internal1_subnetpoolid + - index_value network: get_input: - port_FSB2_Internal1_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml index 916359eb88..78f448ce6f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -295,4 +295,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED + - UNBOUNDED \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoPorts/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoPorts/out/SubstitutionServiceTemplate.yaml index 7c322d53fd..96a3a66c4e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoPorts/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoPorts/out/SubstitutionServiceTemplate.yaml @@ -193,4 +193,4 @@ topology_template: - dependency local_storage_FSB1: - FSB1 - - local_storage + - local_storage \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/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 d570a37afb..dda1f4295d 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 @@ -14,13 +14,119 @@ node_types: status: SUPPORTED entry_schema: type: string + port_FSB_OAM_network_role_tag: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB1_Internal_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB1_Internal_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string compute_FSB1_metadata: type: list required: true status: SUPPORTED entry_schema: type: json - port_FSB_OAM_fixed_ips: + port_FSB2_Internal_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB2_Internal_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer + port_FSB2_Internal_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + vm_flavor_name: + type: string + required: true + status: SUPPORTED + port_FSB_OAM_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB2_Internal_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB_OAM_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB1_Internal_network_role_tag: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB1_Internal_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB2_Internal_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB1_Internal_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB_OAM_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB_OAM_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB1_Internal_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB_OAM_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB_OAM_mac_requirements: type: list required: true status: SUPPORTED @@ -46,29 +152,67 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_FSB2_Internal_network: + port_FSB_OAM_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer + port_FSB2_Internal_mac_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB2_Internal_mac_address: type: list required: true status: SUPPORTED entry_schema: type: string - compute_FSB1_name: + port_FSB2_Internal_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB1_Internal_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer + port_FSB_OAM_fixed_ips: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB2_Internal_network: type: list required: true status: SUPPORTED entry_schema: type: string - vm_flavor_name: - type: string + port_FSB1_Internal_mac_requirements: + type: list required: true status: SUPPORTED - port_FSB2_Internal_mac_address: + entry_schema: + type: json + port_FSB_OAM_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + compute_FSB1_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_FSB_OAM_network: + port_FSB2_Internal_network_role_tag: type: list required: true status: SUPPORTED @@ -565,4 +709,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED + - UNBOUNDED \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/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 58ea943973..76dbaad388 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 @@ -16,12 +16,100 @@ topology_template: required: true entry_schema: type: string + port_FSB_OAM_network_role_tag: + type: list + required: true + entry_schema: + type: string + port_FSB1_Internal_ip_requirements: + type: list + required: true + entry_schema: + type: json + port_FSB1_Internal_subnetpoolid: + type: list + required: true + entry_schema: + type: string compute_FSB1_metadata: type: list required: true entry_schema: type: json - port_FSB_OAM_fixed_ips: + port_FSB2_Internal_vlan_requirements: + type: list + required: true + entry_schema: + type: json + port_FSB2_Internal_order: + type: list + required: true + entry_schema: + type: integer + port_FSB2_Internal_ip_requirements: + type: list + required: true + entry_schema: + type: json + vm_flavor_name: + type: string + required: true + port_FSB_OAM_vlan_requirements: + type: list + required: true + entry_schema: + type: json + port_FSB2_Internal_network_role: + type: list + required: true + entry_schema: + type: string + port_FSB_OAM_ip_requirements: + type: list + required: true + entry_schema: + type: json + port_FSB1_Internal_network_role_tag: + type: list + required: true + entry_schema: + type: string + port_FSB1_Internal_vlan_requirements: + type: list + required: true + entry_schema: + type: json + port_FSB2_Internal_subnetpoolid: + type: list + required: true + entry_schema: + type: string + port_FSB1_Internal_exCP_naming: + type: list + required: true + entry_schema: + type: json + port_FSB_OAM_network_role: + type: list + required: true + entry_schema: + type: string + port_FSB_OAM_network: + type: list + required: true + entry_schema: + type: string + port_FSB1_Internal_network_role: + type: list + required: true + entry_schema: + type: string + port_FSB_OAM_subnetpoolid: + type: list + required: true + entry_schema: + type: string + port_FSB_OAM_mac_requirements: type: list required: true entry_schema: @@ -43,25 +131,57 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_FSB2_Internal_network: + port_FSB_OAM_order: + type: list + required: true + entry_schema: + type: integer + port_FSB2_Internal_mac_requirements: + type: list + required: true + entry_schema: + type: json + port_FSB2_Internal_mac_address: type: list required: true entry_schema: type: string - compute_FSB1_name: + port_FSB2_Internal_exCP_naming: + type: list + required: true + entry_schema: + type: json + port_FSB1_Internal_order: + type: list + required: true + entry_schema: + type: integer + port_FSB_OAM_fixed_ips: + type: list + required: true + entry_schema: + type: json + port_FSB2_Internal_network: type: list required: true entry_schema: type: string - vm_flavor_name: - type: string + port_FSB1_Internal_mac_requirements: + type: list required: true - port_FSB2_Internal_mac_address: + entry_schema: + type: json + port_FSB_OAM_exCP_naming: + type: list + required: true + entry_schema: + type: json + compute_FSB1_name: type: list required: true entry_schema: type: string - port_FSB_OAM_network: + port_FSB2_Internal_network_role_tag: type: list required: true entry_schema: @@ -70,6 +190,38 @@ topology_template: FSB1_FSB1_Internal: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + exCP_naming: + get_input: + - port_FSB1_Internal_exCP_naming + - index_value + vlan_requirements: + get_input: + - port_FSB1_Internal_vlan_requirements + - index_value + ip_requirements: + get_input: + - port_FSB1_Internal_ip_requirements + - index_value + network_role_tag: + get_input: + - port_FSB1_Internal_network_role_tag + - index_value + mac_requirements: + get_input: + - port_FSB1_Internal_mac_requirements + - index_value + order: + get_input: + - port_FSB1_Internal_order + - index_value + network_role: + get_input: + - port_FSB1_Internal_network_role + - index_value + subnetpoolid: + get_input: + - port_FSB1_Internal_subnetpoolid + - index_value network: get_input: - port_FSB1_Internal_network @@ -86,6 +238,38 @@ topology_template: FSB1_FSB2_Internal: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + exCP_naming: + get_input: + - port_FSB2_Internal_exCP_naming + - index_value + vlan_requirements: + get_input: + - port_FSB2_Internal_vlan_requirements + - index_value + ip_requirements: + get_input: + - port_FSB2_Internal_ip_requirements + - index_value + network_role_tag: + get_input: + - port_FSB2_Internal_network_role_tag + - index_value + mac_requirements: + get_input: + - port_FSB2_Internal_mac_requirements + - index_value + order: + get_input: + - port_FSB2_Internal_order + - index_value + network_role: + get_input: + - port_FSB2_Internal_network_role + - index_value + subnetpoolid: + get_input: + - port_FSB2_Internal_subnetpoolid + - index_value network: get_input: - port_FSB2_Internal_network @@ -102,6 +286,38 @@ topology_template: FSB1_FSB_OAM: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + exCP_naming: + get_input: + - port_FSB_OAM_exCP_naming + - index_value + vlan_requirements: + get_input: + - port_FSB_OAM_vlan_requirements + - index_value + ip_requirements: + get_input: + - port_FSB_OAM_ip_requirements + - index_value + network_role_tag: + get_input: + - port_FSB_OAM_network_role_tag + - index_value + mac_requirements: + get_input: + - port_FSB_OAM_mac_requirements + - index_value + order: + get_input: + - port_FSB_OAM_order + - index_value + network_role: + get_input: + - port_FSB_OAM_network_role + - index_value + subnetpoolid: + get_input: + - port_FSB_OAM_subnetpoolid + - index_value fixed_ips: get_input: - port_FSB_OAM_fixed_ips @@ -388,4 +604,4 @@ topology_template: - link dependency_FSB1_FSB2_Internal: - FSB1_FSB2_Internal - - dependency + - dependency \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/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 6183e8703e..e2581559d2 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 @@ -14,12 +14,82 @@ node_types: status: SUPPORTED entry_schema: type: string + port_FSB1_Internal_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB1_Internal_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string compute_FSB1_metadata: type: list required: true status: SUPPORTED entry_schema: type: json + port_FSB2_Internal_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB2_Internal_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer + port_FSB2_Internal_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + vm_flavor_name: + type: string + required: true + status: SUPPORTED + port_FSB2_Internal_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB1_Internal_network_role_tag: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB1_Internal_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB2_Internal_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB1_Internal_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB1_Internal_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string compute_FSB1_availability_zone: type: list required: true @@ -40,23 +110,49 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_FSB2_Internal_network: + port_FSB2_Internal_mac_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB2_Internal_mac_address: type: list required: true status: SUPPORTED entry_schema: type: string - compute_FSB1_name: + port_FSB2_Internal_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB1_Internal_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer + port_FSB2_Internal_network: type: list required: true status: SUPPORTED entry_schema: type: string - vm_flavor_name: - type: string + port_FSB1_Internal_mac_requirements: + type: list required: true status: SUPPORTED - port_FSB2_Internal_mac_address: + entry_schema: + type: json + compute_FSB1_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB2_Internal_network_role_tag: type: list required: true status: SUPPORTED @@ -516,4 +612,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED + - UNBOUNDED \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/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 07c6c2528b..adc80eaf7a 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 @@ -16,11 +16,69 @@ topology_template: required: true entry_schema: type: string + port_FSB1_Internal_ip_requirements: + type: list + required: true + entry_schema: + type: json + port_FSB1_Internal_subnetpoolid: + type: list + required: true + entry_schema: + type: string compute_FSB1_metadata: type: list required: true entry_schema: type: json + port_FSB2_Internal_vlan_requirements: + type: list + required: true + entry_schema: + type: json + port_FSB2_Internal_order: + type: list + required: true + entry_schema: + type: integer + port_FSB2_Internal_ip_requirements: + type: list + required: true + entry_schema: + type: json + vm_flavor_name: + type: string + required: true + port_FSB2_Internal_network_role: + type: list + required: true + entry_schema: + type: string + port_FSB1_Internal_network_role_tag: + type: list + required: true + entry_schema: + type: string + port_FSB1_Internal_vlan_requirements: + type: list + required: true + entry_schema: + type: json + port_FSB2_Internal_subnetpoolid: + type: list + required: true + entry_schema: + type: string + port_FSB1_Internal_exCP_naming: + type: list + required: true + entry_schema: + type: json + port_FSB1_Internal_network_role: + type: list + required: true + entry_schema: + type: string compute_FSB1_availability_zone: type: list required: true @@ -38,20 +96,42 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_FSB2_Internal_mac_requirements: + type: list + required: true + entry_schema: + type: json + port_FSB2_Internal_mac_address: + type: list + required: true + entry_schema: + type: string + port_FSB2_Internal_exCP_naming: + type: list + required: true + entry_schema: + type: json + port_FSB1_Internal_order: + type: list + required: true + entry_schema: + type: integer port_FSB2_Internal_network: type: list required: true entry_schema: type: string + port_FSB1_Internal_mac_requirements: + type: list + required: true + entry_schema: + type: json compute_FSB1_name: type: list required: true entry_schema: type: string - vm_flavor_name: - type: string - required: true - port_FSB2_Internal_mac_address: + port_FSB2_Internal_network_role_tag: type: list required: true entry_schema: @@ -60,6 +140,38 @@ topology_template: FSB1_FSB1_Internal: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + exCP_naming: + get_input: + - port_FSB1_Internal_exCP_naming + - index_value + vlan_requirements: + get_input: + - port_FSB1_Internal_vlan_requirements + - index_value + ip_requirements: + get_input: + - port_FSB1_Internal_ip_requirements + - index_value + network_role_tag: + get_input: + - port_FSB1_Internal_network_role_tag + - index_value + mac_requirements: + get_input: + - port_FSB1_Internal_mac_requirements + - index_value + order: + get_input: + - port_FSB1_Internal_order + - index_value + network_role: + get_input: + - port_FSB1_Internal_network_role + - index_value + subnetpoolid: + get_input: + - port_FSB1_Internal_subnetpoolid + - index_value network: get_input: - port_FSB1_Internal_network @@ -76,6 +188,38 @@ topology_template: FSB1_FSB2_Internal: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + exCP_naming: + get_input: + - port_FSB2_Internal_exCP_naming + - index_value + vlan_requirements: + get_input: + - port_FSB2_Internal_vlan_requirements + - index_value + ip_requirements: + get_input: + - port_FSB2_Internal_ip_requirements + - index_value + network_role_tag: + get_input: + - port_FSB2_Internal_network_role_tag + - index_value + mac_requirements: + get_input: + - port_FSB2_Internal_mac_requirements + - index_value + order: + get_input: + - port_FSB2_Internal_order + - index_value + network_role: + get_input: + - port_FSB2_Internal_network_role + - index_value + subnetpoolid: + get_input: + - port_FSB2_Internal_subnetpoolid + - index_value network: get_input: - port_FSB2_Internal_network @@ -388,4 +532,4 @@ topology_template: - local_storage dependency_FSB1_FSB2_Internal: - FSB1_FSB2_Internal - - dependency + - dependency \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/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 bf0af32231..40048e44db 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 @@ -14,13 +14,119 @@ node_types: status: SUPPORTED entry_schema: type: string + port_FSB_OAM_network_role_tag: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB1_Internal_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB1_Internal_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string compute_FSB1_metadata: type: list required: true status: SUPPORTED entry_schema: type: json - port_FSB_OAM_fixed_ips: + port_FSB2_Internal_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB2_Internal_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer + port_FSB2_Internal_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + vm_flavor_name: + type: string + required: true + status: SUPPORTED + port_FSB_OAM_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB2_Internal_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB_OAM_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB1_Internal_network_role_tag: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB1_Internal_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB2_Internal_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB1_Internal_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB_OAM_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB_OAM_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB1_Internal_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB_OAM_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB_OAM_mac_requirements: type: list required: true status: SUPPORTED @@ -46,29 +152,67 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_FSB2_Internal_network: + port_FSB_OAM_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer + port_FSB2_Internal_mac_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB2_Internal_mac_address: type: list required: true status: SUPPORTED entry_schema: type: string - compute_FSB1_name: + port_FSB2_Internal_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB1_Internal_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer + port_FSB_OAM_fixed_ips: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB2_Internal_network: type: list required: true status: SUPPORTED entry_schema: type: string - vm_flavor_name: - type: string + port_FSB1_Internal_mac_requirements: + type: list required: true status: SUPPORTED - port_FSB2_Internal_mac_address: + entry_schema: + type: json + port_FSB_OAM_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + compute_FSB1_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_FSB_OAM_network: + port_FSB2_Internal_network_role_tag: type: list required: true status: SUPPORTED @@ -601,4 +745,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED + - UNBOUNDED \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/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 b20af41093..4faca73a16 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 @@ -16,12 +16,100 @@ topology_template: required: true entry_schema: type: string + port_FSB_OAM_network_role_tag: + type: list + required: true + entry_schema: + type: string + port_FSB1_Internal_ip_requirements: + type: list + required: true + entry_schema: + type: json + port_FSB1_Internal_subnetpoolid: + type: list + required: true + entry_schema: + type: string compute_FSB1_metadata: type: list required: true entry_schema: type: json - port_FSB_OAM_fixed_ips: + port_FSB2_Internal_vlan_requirements: + type: list + required: true + entry_schema: + type: json + port_FSB2_Internal_order: + type: list + required: true + entry_schema: + type: integer + port_FSB2_Internal_ip_requirements: + type: list + required: true + entry_schema: + type: json + vm_flavor_name: + type: string + required: true + port_FSB_OAM_vlan_requirements: + type: list + required: true + entry_schema: + type: json + port_FSB2_Internal_network_role: + type: list + required: true + entry_schema: + type: string + port_FSB_OAM_ip_requirements: + type: list + required: true + entry_schema: + type: json + port_FSB1_Internal_network_role_tag: + type: list + required: true + entry_schema: + type: string + port_FSB1_Internal_vlan_requirements: + type: list + required: true + entry_schema: + type: json + port_FSB2_Internal_subnetpoolid: + type: list + required: true + entry_schema: + type: string + port_FSB1_Internal_exCP_naming: + type: list + required: true + entry_schema: + type: json + port_FSB_OAM_network_role: + type: list + required: true + entry_schema: + type: string + port_FSB_OAM_network: + type: list + required: true + entry_schema: + type: string + port_FSB1_Internal_network_role: + type: list + required: true + entry_schema: + type: string + port_FSB_OAM_subnetpoolid: + type: list + required: true + entry_schema: + type: string + port_FSB_OAM_mac_requirements: type: list required: true entry_schema: @@ -43,25 +131,57 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_FSB2_Internal_network: + port_FSB_OAM_order: + type: list + required: true + entry_schema: + type: integer + port_FSB2_Internal_mac_requirements: + type: list + required: true + entry_schema: + type: json + port_FSB2_Internal_mac_address: type: list required: true entry_schema: type: string - compute_FSB1_name: + port_FSB2_Internal_exCP_naming: + type: list + required: true + entry_schema: + type: json + port_FSB1_Internal_order: + type: list + required: true + entry_schema: + type: integer + port_FSB_OAM_fixed_ips: + type: list + required: true + entry_schema: + type: json + port_FSB2_Internal_network: type: list required: true entry_schema: type: string - vm_flavor_name: - type: string + port_FSB1_Internal_mac_requirements: + type: list required: true - port_FSB2_Internal_mac_address: + entry_schema: + type: json + port_FSB_OAM_exCP_naming: + type: list + required: true + entry_schema: + type: json + compute_FSB1_name: type: list required: true entry_schema: type: string - port_FSB_OAM_network: + port_FSB2_Internal_network_role_tag: type: list required: true entry_schema: @@ -70,6 +190,38 @@ topology_template: FSB1_FSB1_Internal: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + exCP_naming: + get_input: + - port_FSB1_Internal_exCP_naming + - index_value + vlan_requirements: + get_input: + - port_FSB1_Internal_vlan_requirements + - index_value + ip_requirements: + get_input: + - port_FSB1_Internal_ip_requirements + - index_value + network_role_tag: + get_input: + - port_FSB1_Internal_network_role_tag + - index_value + mac_requirements: + get_input: + - port_FSB1_Internal_mac_requirements + - index_value + order: + get_input: + - port_FSB1_Internal_order + - index_value + network_role: + get_input: + - port_FSB1_Internal_network_role + - index_value + subnetpoolid: + get_input: + - port_FSB1_Internal_subnetpoolid + - index_value network: get_input: - port_FSB1_Internal_network @@ -86,6 +238,38 @@ topology_template: FSB1_FSB2_Internal: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + exCP_naming: + get_input: + - port_FSB2_Internal_exCP_naming + - index_value + vlan_requirements: + get_input: + - port_FSB2_Internal_vlan_requirements + - index_value + ip_requirements: + get_input: + - port_FSB2_Internal_ip_requirements + - index_value + network_role_tag: + get_input: + - port_FSB2_Internal_network_role_tag + - index_value + mac_requirements: + get_input: + - port_FSB2_Internal_mac_requirements + - index_value + order: + get_input: + - port_FSB2_Internal_order + - index_value + network_role: + get_input: + - port_FSB2_Internal_network_role + - index_value + subnetpoolid: + get_input: + - port_FSB2_Internal_subnetpoolid + - index_value network: get_input: - port_FSB2_Internal_network @@ -102,6 +286,38 @@ topology_template: FSB1_FSB_OAM: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + exCP_naming: + get_input: + - port_FSB_OAM_exCP_naming + - index_value + vlan_requirements: + get_input: + - port_FSB_OAM_vlan_requirements + - index_value + ip_requirements: + get_input: + - port_FSB_OAM_ip_requirements + - index_value + network_role_tag: + get_input: + - port_FSB_OAM_network_role_tag + - index_value + mac_requirements: + get_input: + - port_FSB_OAM_mac_requirements + - index_value + order: + get_input: + - port_FSB_OAM_order + - index_value + network_role: + get_input: + - port_FSB_OAM_network_role + - index_value + subnetpoolid: + get_input: + - port_FSB_OAM_subnetpoolid + - index_value fixed_ips: get_input: - port_FSB_OAM_fixed_ips @@ -445,4 +661,4 @@ topology_template: - link dependency_FSB1_FSB2_Internal: - FSB1_FSB2_Internal - - dependency + - dependency \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/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 6772f8c594..84bab83d19 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 @@ -14,12 +14,36 @@ node_types: status: SUPPORTED entry_schema: type: string + port_FSB1_Internal_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB1_Internal_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string compute_FSB1_metadata: type: list required: true status: SUPPORTED entry_schema: type: json + port_FSB2_Internal_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB2_Internal_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer compute_FSB1_availability_zone: type: list required: true @@ -34,23 +58,95 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_FSB2_Internal_mac_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB2_Internal_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + vm_flavor_name: + type: string + required: true + status: SUPPORTED + port_FSB2_Internal_mac_address: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB2_Internal_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB2_Internal_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB1_Internal_network_role_tag: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB1_Internal_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer + port_FSB1_Internal_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json port_FSB2_Internal_network: type: list required: true status: SUPPORTED entry_schema: type: string + port_FSB2_Internal_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB1_Internal_mac_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json compute_FSB1_name: type: list required: true status: SUPPORTED entry_schema: type: string - vm_flavor_name: - type: string + port_FSB1_Internal_exCP_naming: + type: list required: true status: SUPPORTED - port_FSB2_Internal_mac_address: + entry_schema: + type: json + port_FSB1_Internal_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB2_Internal_network_role_tag: type: list required: true status: SUPPORTED @@ -510,4 +606,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED + - UNBOUNDED \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/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 4c5d4ae924..cb7a4127a1 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 @@ -16,11 +16,31 @@ topology_template: required: true entry_schema: type: string + port_FSB1_Internal_ip_requirements: + type: list + required: true + entry_schema: + type: json + port_FSB1_Internal_subnetpoolid: + type: list + required: true + entry_schema: + type: string compute_FSB1_metadata: type: list required: true entry_schema: type: json + port_FSB2_Internal_vlan_requirements: + type: list + required: true + entry_schema: + type: json + port_FSB2_Internal_order: + type: list + required: true + entry_schema: + type: integer compute_FSB1_availability_zone: type: list required: true @@ -33,20 +53,80 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_FSB2_Internal_mac_requirements: + type: list + required: true + entry_schema: + type: json + port_FSB2_Internal_ip_requirements: + type: list + required: true + entry_schema: + type: json + vm_flavor_name: + type: string + required: true + port_FSB2_Internal_mac_address: + type: list + required: true + entry_schema: + type: string + port_FSB2_Internal_network_role: + type: list + required: true + entry_schema: + type: string + port_FSB2_Internal_exCP_naming: + type: list + required: true + entry_schema: + type: json + port_FSB1_Internal_network_role_tag: + type: list + required: true + entry_schema: + type: string + port_FSB1_Internal_order: + type: list + required: true + entry_schema: + type: integer + port_FSB1_Internal_vlan_requirements: + type: list + required: true + entry_schema: + type: json port_FSB2_Internal_network: type: list required: true entry_schema: type: string + port_FSB2_Internal_subnetpoolid: + type: list + required: true + entry_schema: + type: string + port_FSB1_Internal_mac_requirements: + type: list + required: true + entry_schema: + type: json compute_FSB1_name: type: list required: true entry_schema: type: string - vm_flavor_name: - type: string + port_FSB1_Internal_exCP_naming: + type: list required: true - port_FSB2_Internal_mac_address: + entry_schema: + type: json + port_FSB1_Internal_network_role: + type: list + required: true + entry_schema: + type: string + port_FSB2_Internal_network_role_tag: type: list required: true entry_schema: @@ -55,6 +135,38 @@ topology_template: FSB1_FSB1_Internal: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + exCP_naming: + get_input: + - port_FSB1_Internal_exCP_naming + - index_value + vlan_requirements: + get_input: + - port_FSB1_Internal_vlan_requirements + - index_value + ip_requirements: + get_input: + - port_FSB1_Internal_ip_requirements + - index_value + network_role_tag: + get_input: + - port_FSB1_Internal_network_role_tag + - index_value + mac_requirements: + get_input: + - port_FSB1_Internal_mac_requirements + - index_value + order: + get_input: + - port_FSB1_Internal_order + - index_value + network_role: + get_input: + - port_FSB1_Internal_network_role + - index_value + subnetpoolid: + get_input: + - port_FSB1_Internal_subnetpoolid + - index_value network: get_attribute: - FSB1_FSB2_Internal @@ -71,6 +183,38 @@ topology_template: FSB1_FSB2_Internal: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + exCP_naming: + get_input: + - port_FSB2_Internal_exCP_naming + - index_value + vlan_requirements: + get_input: + - port_FSB2_Internal_vlan_requirements + - index_value + ip_requirements: + get_input: + - port_FSB2_Internal_ip_requirements + - index_value + network_role_tag: + get_input: + - port_FSB2_Internal_network_role_tag + - index_value + mac_requirements: + get_input: + - port_FSB2_Internal_mac_requirements + - index_value + order: + get_input: + - port_FSB2_Internal_order + - index_value + network_role: + get_input: + - port_FSB2_Internal_network_role + - index_value + subnetpoolid: + get_input: + - port_FSB2_Internal_subnetpoolid + - index_value device_id: get_attribute: - FSB1 @@ -387,4 +531,4 @@ topology_template: - local_storage dependency_FSB1_FSB2_Internal: - FSB1_FSB2_Internal - - dependency + - dependency \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/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 f1d1182772..b9a448541a 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 @@ -8,7 +8,113 @@ node_types: org.openecomp.resource.abstract.nodes.FSB1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_FSB_OAM_fixed_ips: + port_FSB_OAM_network_role_tag: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB1_Internal_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB1_Internal_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB2_Internal_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB2_Internal_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer + port_FSB2_Internal_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + vm_flavor_name: + type: string + required: true + status: SUPPORTED + port_FSB_OAM_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB2_Internal_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB_OAM_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB1_Internal_network_role_tag: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB1_Internal_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB2_Internal_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB1_Internal_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB_OAM_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB_OAM_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB1_Internal_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB_OAM_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB_OAM_mac_requirements: type: list required: true status: SUPPORTED @@ -28,23 +134,61 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_FSB2_Internal_network: + port_FSB_OAM_order: type: list required: true status: SUPPORTED entry_schema: - type: string - vm_flavor_name: - type: string + type: integer + port_FSB2_Internal_mac_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: json port_FSB2_Internal_mac_address: type: list required: true status: SUPPORTED entry_schema: type: string - port_FSB_OAM_network: + port_FSB2_Internal_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB1_Internal_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer + port_FSB_OAM_fixed_ips: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB2_Internal_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB1_Internal_mac_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB_OAM_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB2_Internal_network_role_tag: type: list required: true status: SUPPORTED @@ -577,4 +721,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED + - UNBOUNDED \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/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 3ef8780d7e..6cd3625e82 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 @@ -11,7 +11,95 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_FSB_OAM_fixed_ips: + port_FSB_OAM_network_role_tag: + type: list + required: true + entry_schema: + type: string + port_FSB1_Internal_ip_requirements: + type: list + required: true + entry_schema: + type: json + port_FSB1_Internal_subnetpoolid: + type: list + required: true + entry_schema: + type: string + port_FSB2_Internal_vlan_requirements: + type: list + required: true + entry_schema: + type: json + port_FSB2_Internal_order: + type: list + required: true + entry_schema: + type: integer + port_FSB2_Internal_ip_requirements: + type: list + required: true + entry_schema: + type: json + vm_flavor_name: + type: string + required: true + port_FSB_OAM_vlan_requirements: + type: list + required: true + entry_schema: + type: json + port_FSB2_Internal_network_role: + type: list + required: true + entry_schema: + type: string + port_FSB_OAM_ip_requirements: + type: list + required: true + entry_schema: + type: json + port_FSB1_Internal_network_role_tag: + type: list + required: true + entry_schema: + type: string + port_FSB1_Internal_vlan_requirements: + type: list + required: true + entry_schema: + type: json + port_FSB2_Internal_subnetpoolid: + type: list + required: true + entry_schema: + type: string + port_FSB1_Internal_exCP_naming: + type: list + required: true + entry_schema: + type: json + port_FSB_OAM_network_role: + type: list + required: true + entry_schema: + type: string + port_FSB_OAM_network: + type: list + required: true + entry_schema: + type: string + port_FSB1_Internal_network_role: + type: list + required: true + entry_schema: + type: string + port_FSB_OAM_subnetpoolid: + type: list + required: true + entry_schema: + type: string + port_FSB_OAM_mac_requirements: type: list required: true entry_schema: @@ -28,20 +116,52 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_FSB2_Internal_network: + port_FSB_OAM_order: type: list required: true entry_schema: - type: string - vm_flavor_name: - type: string + type: integer + port_FSB2_Internal_mac_requirements: + type: list required: true + entry_schema: + type: json port_FSB2_Internal_mac_address: type: list required: true entry_schema: type: string - port_FSB_OAM_network: + port_FSB2_Internal_exCP_naming: + type: list + required: true + entry_schema: + type: json + port_FSB1_Internal_order: + type: list + required: true + entry_schema: + type: integer + port_FSB_OAM_fixed_ips: + type: list + required: true + entry_schema: + type: json + port_FSB2_Internal_network: + type: list + required: true + entry_schema: + type: string + port_FSB1_Internal_mac_requirements: + type: list + required: true + entry_schema: + type: json + port_FSB_OAM_exCP_naming: + type: list + required: true + entry_schema: + type: json + port_FSB2_Internal_network_role_tag: type: list required: true entry_schema: @@ -50,6 +170,38 @@ topology_template: FSB1_FSB1_Internal: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + exCP_naming: + get_input: + - port_FSB1_Internal_exCP_naming + - index_value + vlan_requirements: + get_input: + - port_FSB1_Internal_vlan_requirements + - index_value + ip_requirements: + get_input: + - port_FSB1_Internal_ip_requirements + - index_value + network_role_tag: + get_input: + - port_FSB1_Internal_network_role_tag + - index_value + mac_requirements: + get_input: + - port_FSB1_Internal_mac_requirements + - index_value + order: + get_input: + - port_FSB1_Internal_order + - index_value + network_role: + get_input: + - port_FSB1_Internal_network_role + - index_value + subnetpoolid: + get_input: + - port_FSB1_Internal_subnetpoolid + - index_value network: get_input: - port_FSB1_Internal_network @@ -66,6 +218,38 @@ topology_template: FSB1_FSB2_Internal: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + exCP_naming: + get_input: + - port_FSB2_Internal_exCP_naming + - index_value + vlan_requirements: + get_input: + - port_FSB2_Internal_vlan_requirements + - index_value + ip_requirements: + get_input: + - port_FSB2_Internal_ip_requirements + - index_value + network_role_tag: + get_input: + - port_FSB2_Internal_network_role_tag + - index_value + mac_requirements: + get_input: + - port_FSB2_Internal_mac_requirements + - index_value + order: + get_input: + - port_FSB2_Internal_order + - index_value + network_role: + get_input: + - port_FSB2_Internal_network_role + - index_value + subnetpoolid: + get_input: + - port_FSB2_Internal_subnetpoolid + - index_value network: get_input: - port_FSB2_Internal_network @@ -82,6 +266,38 @@ topology_template: FSB1_FSB_OAM: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + exCP_naming: + get_input: + - port_FSB_OAM_exCP_naming + - index_value + vlan_requirements: + get_input: + - port_FSB_OAM_vlan_requirements + - index_value + ip_requirements: + get_input: + - port_FSB_OAM_ip_requirements + - index_value + network_role_tag: + get_input: + - port_FSB_OAM_network_role_tag + - index_value + mac_requirements: + get_input: + - port_FSB_OAM_mac_requirements + - index_value + order: + get_input: + - port_FSB_OAM_order + - index_value + network_role: + get_input: + - port_FSB_OAM_network_role + - index_value + subnetpoolid: + get_input: + - port_FSB_OAM_subnetpoolid + - index_value fixed_ips: get_input: - port_FSB_OAM_fixed_ips @@ -420,4 +636,4 @@ topology_template: - link dependency_FSB1_FSB2_Internal: - FSB1_FSB2_Internal - - dependency + - dependency \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/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 b441d659c0..ac134c31c5 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 @@ -181,16 +181,18 @@ topology_template: properties: port_FSB1_Internal_mac_address: - get_input: fsb1-Internal1-mac - port_FSB1_Internal_network: - - Internal1-net vm_flavor_name: get_input: fsb-flavor - port_FSB2_Internal_mac_address: - - get_input: fsb1-Internal2-mac vm_image_name: get_input: fsb-image compute_FSB_admin_pass: - STATIC-DATA-FSB1 + port_FSB_OAM_network: + - jsa_net1 + port_FSB1_Internal_network: + - Internal1-net + port_FSB2_Internal_mac_address: + - get_input: fsb1-Internal2-mac port_FSB_OAM_fixed_ips: - - ip_address: get_input: fsb1-oam-ip @@ -202,8 +204,6 @@ topology_template: - path: /path2/etc/sysconfig/network-scripts/ifcfg-eth1 compute_FSB_availability_zone: - get_input: fsb1_zone - port_FSB_OAM_network: - - jsa_net1 compute_FSB_name: - get_input: fsb1-name service_template_filter: @@ -225,4 +225,4 @@ topology_template: - FSB2_Internal2 - FSB1_Internal1 - FSB1_OAM - - FSB1_template + - FSB1_template \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/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 e2adb3038b..8bb81bc2fa 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 @@ -162,22 +162,22 @@ topology_template: - get_input: fsb1-Internal1-mac port_FSB1_Internal2_network: - Internal2-net + port_FSB1_Internal1_network: + - Internal1-net + vm_flavor_name: + get_input: fsb-flavor + port_FSB1_Internal2_mac_address: + - get_input: fsb1-Internal2-mac vm_image_name: get_input: fsb-image compute_FSB_admin_pass: - STATIC-DATA-FSB1 - port_FSB1_Internal1_network: - - Internal1-net compute_FSB_metadata: - write_files: - path: /path1/etc/sysconfig/network-scripts/ifcfg-eth0 - path: /path2/etc/sysconfig/network-scripts/ifcfg-eth1 compute_FSB_availability_zone: - get_input: fsb1_zone - vm_flavor_name: - get_input: fsb-flavor - port_FSB1_Internal2_mac_address: - - get_input: fsb1-Internal2-mac compute_FSB_name: - get_input: fsb1-name service_template_filter: @@ -198,4 +198,4 @@ topology_template: members: - FSB1_Internal2 - FSB1_Internal1 - - FSB1_template + - FSB1_template \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/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 ce35a8ed2a..92fc5bdb6e 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 @@ -243,6 +243,11 @@ topology_template: port_FSB1_Internal_mac_address: - get_input: fsb1-Internal1-mac - get_input: fsb1-Internal2-mac + compute_FSB_user_data: + - OPTIONAL-DATA-FSB1 + - null + vm_flavor_name: + get_input: fsb-flavor vm_image_name: get_input: fsb-image compute_FSB_admin_pass: @@ -251,6 +256,9 @@ topology_template: port_FSB1_Internal_network: - Internal1-net-fsb1-Internal1 - Internal1-net-fsb1-Internal2 + port_FSB2_Internal_mac_address: + - get_input: fsb2-Internal1-mac + - get_input: fsb2-Internal2-mac port_FSB2_Internal_network: - Internal2-net-fsb2-Internal1 - Internal2-net-fsb2-Internal2 @@ -261,17 +269,9 @@ topology_template: - write_files: - path: /path3/etc/sysconfig/network-scripts/ifcfg-eth0 - path: /path4/etc/sysconfig/network-scripts/ifcfg-eth1 - compute_FSB_user_data: - - OPTIONAL-DATA-FSB1 - - null compute_FSB_availability_zone: - get_input: fsb1_zone - get_input: fsb2_zone - vm_flavor_name: - get_input: fsb-flavor - port_FSB2_Internal_mac_address: - - get_input: fsb2-Internal1-mac - - get_input: fsb2-Internal2-mac compute_FSB_name: - get_input: fsb1-name - get_input: fsb2-name @@ -296,4 +296,4 @@ topology_template: - FSB2_Internal1 - FSB2_Internal2 - FSB1_template - - FSB2_template + - FSB2_template \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/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 index 773801f9fa..209d729be8 100644 --- 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 @@ -148,12 +148,12 @@ topology_template: - get_input: fsb_zone port_FSB1_Internal_network: - Internal1-net - port_FSB2_Internal_network: - - Internal2-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 @@ -291,4 +291,4 @@ topology_template: - abstract_FSB1_0 - FSB1_FSB1_Internal_accessIPv6 - 0 - - OS-EXT-IPS-MAC:mac_addr + - OS-EXT-IPS-MAC:mac_addr \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/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 f8872c5a9d..492e64573c 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 @@ -240,6 +240,11 @@ topology_template: port_FSB1_Internal_mac_address: - get_input: fsb1-Internal1-mac - get_input: fsb1-Internal2-mac + compute_FSB_user_data: + - STATIC-DATA-FSB1 + - STATIC-DATA-FSB2 + vm_flavor_name: + get_input: fsb-flavor vm_image_name: get_input: fsb-image compute_FSB_admin_pass: @@ -248,6 +253,9 @@ topology_template: port_FSB1_Internal_network: - Internal1-net-fsb1-Internal1 - Internal1-net-fsb1-Internal2 + port_FSB2_Internal_mac_address: + - get_input: fsb2-Internal1-mac + - get_input: fsb2-Internal2-mac port_FSB2_Internal_network: - Internal2-net-fsb2-Internal1 - Internal2-net-fsb2-Internal2 @@ -258,17 +266,9 @@ topology_template: - write_files: - path: /path3/etc/sysconfig/network-scripts/ifcfg-eth0 - path: /path4/etc/sysconfig/network-scripts/ifcfg-eth1 - compute_FSB_user_data: - - STATIC-DATA-FSB1 - - STATIC-DATA-FSB2 compute_FSB_availability_zone: - get_input: fsb1_zone - get_input: fsb2_zone - vm_flavor_name: - get_input: fsb-flavor - port_FSB2_Internal_mac_address: - - get_input: fsb2-Internal1-mac - - get_input: fsb2-Internal2-mac compute_FSB_name: - get_input: fsb1-name - get_input: fsb2-name @@ -317,4 +317,4 @@ topology_template: - FSB2_template - jsa_net - jsa_net1 - - packet_mirror_network_name + - packet_mirror_network_name \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/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 af3ef63b0f..ce8bde09d3 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 @@ -98,30 +98,30 @@ topology_template: directives: - substitutable properties: - port_port2_network: - - get_input: port_name + compute_smp_availability_zone: + - get_input: availability_zone_0 + vm_flavor_name: + get_input: flavor_smp_name + compute_smp_user_data_format: + - RAW vm_image_name: get_input: image_smp_name port_port2_replacement_policy: - AUTO compute_smp_name: - get_input: smp_name_1 - compute_smp_availability_zone: - - get_input: availability_zone_0 port_port1_replacement_policy: - AUTO port_port1_network: - get_input: port_name - vm_flavor_name: - get_input: flavor_smp_name + port_port2_network: + - get_input: port_name compute_smp_metadata: - jx_vm_role: smp2 vnf_id: get_input: vnf_id jx_lab_name: get_input: lab_name - compute_smp_user_data_format: - - RAW compute_smp_scheduler_hints: - group: BE_Affinity_group service_template_filter: @@ -164,4 +164,4 @@ topology_template: name: abc affinity: host targets: - - FE_SMP_Affinity_group + - FE_SMP_Affinity_group \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/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 b98c6e07bb..b7bb7cbb43 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 @@ -253,6 +253,11 @@ topology_template: port_FSB1_Internal_mac_address: - get_input: fsb1-Internal1-mac - get_input: fsb1-Internal2-mac + compute_FSB_user_data: + - OPTIONAL-DATA-FSB1 + - null + vm_flavor_name: + get_input: fsb-flavor vm_image_name: get_input: fsb-image compute_FSB_admin_pass: @@ -261,6 +266,9 @@ topology_template: port_FSB1_Internal_network: - Internal1-net-fsb1-Internal1 - Internal1-net-fsb1-Internal2 + port_FSB2_Internal_mac_address: + - get_input: fsb2-Internal1-mac + - get_input: fsb2-Internal2-mac port_FSB2_Internal_network: - Internal2-net-fsb2-Internal1 - Internal2-net-fsb2-Internal2 @@ -271,17 +279,9 @@ topology_template: - write_files: - path: /path3/etc/sysconfig/network-scripts/ifcfg-eth0 - path: /path4/etc/sysconfig/network-scripts/ifcfg-eth1 - compute_FSB_user_data: - - OPTIONAL-DATA-FSB1 - - null compute_FSB_availability_zone: - get_input: fsb1_zone - get_input: fsb2_zone - vm_flavor_name: - get_input: fsb-flavor - port_FSB2_Internal_mac_address: - - get_input: fsb2-Internal1-mac - - get_input: fsb2-Internal2-mac compute_FSB_name: - get_input: fsb1-name - get_input: fsb2-name @@ -319,4 +319,4 @@ topology_template: - jsa_net - jsa_net1 - packet_mirror_network - - jsa_security_group + - jsa_security_group \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/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 6ebaa53c6a..44452b959f 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 @@ -99,14 +99,14 @@ topology_template: properties: compute_QRouter_availability_zone: - Availability-test - port_oam_private_net_network_port_network: - - get_input: oam_private_net_name - vm_image_name: Image-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 service_template_filter: @@ -127,4 +127,4 @@ topology_template: - packet_mirror_network - packet_internal_network - cdr_network_port - - oam_private_net_network_port + - oam_private_net_network_port \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/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 f554f0a844..5cd7faa646 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 @@ -240,6 +240,11 @@ topology_template: port_FSB1_Internal_mac_address: - get_input: fsb1-Internal1-mac - get_input: fsb1-Internal2-mac + compute_FSB_user_data: + - OPTIONAL-DATA-FSB1 + - null + vm_flavor_name: + get_input: fsb-flavor vm_image_name: get_input: fsb-image compute_FSB_admin_pass: @@ -248,6 +253,9 @@ topology_template: port_FSB1_Internal_network: - Internal1-net-fsb1-Internal1 - Internal1-net-fsb1-Internal2 + port_FSB2_Internal_mac_address: + - get_input: fsb2-Internal1-mac + - get_input: fsb2-Internal2-mac port_FSB2_Internal_network: - Internal2-net-fsb2-Internal1 - Internal2-net-fsb2-Internal2 @@ -258,17 +266,9 @@ topology_template: - write_files: - path: /path3/etc/sysconfig/network-scripts/ifcfg-eth0 - path: /path4/etc/sysconfig/network-scripts/ifcfg-eth1 - compute_FSB_user_data: - - OPTIONAL-DATA-FSB1 - - null compute_FSB_availability_zone: - get_input: fsb1_zone - get_input: fsb2_zone - vm_flavor_name: - get_input: fsb-flavor - port_FSB2_Internal_mac_address: - - get_input: fsb2-Internal1-mac - - get_input: fsb2-Internal2-mac compute_FSB_name: - get_input: fsb1-name - get_input: fsb2-name @@ -309,4 +309,4 @@ topology_template: - FSB2_template - jsa_net - jsa_net1 - - packet_mirror_network_name + - packet_mirror_network_name \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/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 45b3f46412..1779261886 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 @@ -175,16 +175,18 @@ topology_template: properties: port_FSB1_Internal_mac_address: - get_input: fsb1-Internal1-mac - port_FSB1_Internal_network: - - Internal1-net vm_flavor_name: get_input: fsb-flavor - port_FSB2_Internal_mac_address: - - get_input: fsb1-Internal2-mac vm_image_name: get_input: fsb-image compute_FSB_admin_pass: - STATIC-DATA-FSB1 + port_FSB_OAM_network: + - jsa_net1 + port_FSB1_Internal_network: + - Internal1-net + port_FSB2_Internal_mac_address: + - get_input: fsb1-Internal2-mac port_FSB_OAM_fixed_ips: - - ip_address: get_input: fsb1-oam-ip @@ -196,8 +198,6 @@ topology_template: - path: /path2/etc/sysconfig/network-scripts/ifcfg-eth1 compute_FSB_availability_zone: - get_input: fsb1_zone - port_FSB_OAM_network: - - jsa_net1 compute_FSB_name: - get_input: fsb1-name service_template_filter: @@ -233,4 +233,4 @@ topology_template: - FSB1_Internal1 - FSB1_OAM - FSB1_template - - packet_mirror_network_name + - packet_mirror_network_name \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/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 5e53a1d849..e5513bd30a 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 @@ -280,6 +280,11 @@ topology_template: port_FSB1_Internal_mac_address: - get_input: fsb1-Internal1-mac - get_input: fsb1-Internal2-mac + compute_FSB_user_data: + - OPTIONAL-DATA-FSB1 + - null + vm_flavor_name: + get_input: fsb-flavor vm_image_name: get_input: fsb-image compute_FSB_admin_pass: @@ -288,6 +293,9 @@ topology_template: port_FSB1_Internal_network: - Internal1-net-fsb1-Internal1 - Internal1-net-fsb1-Internal2 + port_FSB2_Internal_mac_address: + - get_input: fsb2-Internal1-mac + - get_input: fsb2-Internal2-mac port_FSB2_Internal_network: - Internal2-net-fsb2-Internal1 - Internal2-net-fsb2-Internal2 @@ -298,17 +306,9 @@ topology_template: - write_files: - path: /path3/etc/sysconfig/network-scripts/ifcfg-eth0 - path: /path4/etc/sysconfig/network-scripts/ifcfg-eth1 - compute_FSB_user_data: - - OPTIONAL-DATA-FSB1 - - null compute_FSB_availability_zone: - get_input: fsb1_zone - get_input: fsb2_zone - vm_flavor_name: - get_input: fsb-flavor - port_FSB2_Internal_mac_address: - - get_input: fsb2-Internal1-mac - - get_input: fsb2-Internal2-mac compute_FSB_name: - get_input: fsb1-name - get_input: fsb2-name @@ -357,4 +357,4 @@ topology_template: - FSB2_template - jsa_net - jsa_net1 - - packet_mirror_network_name + - packet_mirror_network_name \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/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 06b43188e5..54d4cfe9ee 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 @@ -195,16 +195,18 @@ topology_template: properties: port_FSB1_Internal_mac_address: - get_input: fsb1-Internal1-mac - port_FSB1_Internal_network: - - Internal1-net vm_flavor_name: get_input: fsb-flavor - port_FSB2_Internal_mac_address: - - get_input: fsb1-Internal2-mac vm_image_name: get_input: fsb-image compute_FSB_admin_pass: - STATIC-DATA-FSB1 + port_FSB_OAM_network: + - jsa_net1 + port_FSB1_Internal_network: + - Internal1-net + port_FSB2_Internal_mac_address: + - get_input: fsb1-Internal2-mac port_FSB_OAM_fixed_ips: - - ip_address: get_input: fsb1-oam-ip @@ -216,8 +218,6 @@ topology_template: - path: /path2/etc/sysconfig/network-scripts/ifcfg-eth1 compute_FSB_availability_zone: - get_input: fsb1_zone - port_FSB_OAM_network: - - jsa_net1 compute_FSB_name: - get_input: fsb1-name service_template_filter: @@ -261,4 +261,4 @@ topology_template: - FSB1_Internal1 - FSB1_OAM - FSB1_template - - packet_mirror_network_name + - packet_mirror_network_name \ No newline at end of file -- cgit 1.2.3-korg