diff options
author | 2017-06-11 14:22:02 +0300 | |
---|---|---|
committer | 2017-06-11 17:48:32 +0300 | |
commit | b3d4898d9e8452ea0b8d848c048e712d43b8d9a3 (patch) | |
tree | 0609319203be13f6c29ccbe24cb39c9d64f90095 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters | |
parent | af9929df75604ce407d0ca542b200630164e0ae6 (diff) |
[SDC-29] rebase continue work to align source
Change-Id: I218f1c5ee23fb2c8314f1c70921d3ad8682c10f4
Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters')
4 files changed, 627 insertions, 27 deletions
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 |