From b8e2faf476202b6ffe61bc3a9a37df1304881d40 Mon Sep 17 00:00:00 2001 From: Avi Ziv Date: Tue, 18 Jul 2017 19:45:38 +0300 Subject: [SDC] Onboarding 1710 rebase. Change-Id: If3b6b81d221fde13908f1e8160db6f7d9433c535 Signed-off-by: Avi Ziv --- .../out/nested4ServiceTemplate.yaml | 120 ++++++++++++++++----- 1 file changed, 95 insertions(+), 25 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested4ServiceTemplate.yaml') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested4ServiceTemplate.yaml index 720662bde6..fafbdbe307 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested4ServiceTemplate.yaml @@ -23,20 +23,37 @@ topology_template: immutable: false type: string description: UID of OAM network + port_cmaui_port_8_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true p2: hidden: false immutable: false type: string - cmaui_image: + port_cmaui_port_8_order: + type: integer + required: true + port_cmaui_port_7_network_role_tag: + type: string + required: true + availability_zone_0: + label: availabilityzone name hidden: false immutable: false type: string - description: Image for CMAUI server - cmaui_flavor: + description: availabilityzone name + net: hidden: false immutable: false type: string - description: Flavor for CMAUI server + port_cmaui_port_8_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_cmaui_port_7_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true security_group_name: hidden: false immutable: false @@ -44,43 +61,89 @@ topology_template: description: CMAUI1, CMAUI2 server names entry_schema: type: string - availability_zone_0: - label: availabilityzone name + port_cmaui_port_8_network_role_tag: + type: string + required: true + port_cmaui_port_8_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_cmaui_port_7_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_cmaui_port_7_order: + type: integer + required: true + cmaui_image: hidden: false immutable: false type: string - description: availabilityzone name - cmaui_oam_ips: + description: Image for CMAUI server + cmaui_flavor: hidden: false immutable: false type: string - net: + description: Flavor for CMAUI server + port_cmaui_port_7_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_cmaui_port_7_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_cmaui_port_7_subnetpoolid: + type: string + required: true + port_cmaui_port_7_network_role: + type: string + required: true + port_cmaui_port_8_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + cmaui_oam_ips: hidden: false immutable: false type: string + port_cmaui_port_8_network_role: + type: string + required: true + port_cmaui_port_8_subnetpoolid: + type: string + required: true node_templates: cmaui_port_7: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false + get_input: port_cmaui_port_7_ip_requirements security_groups: - get_input: p1 + network_role: + get_input: port_cmaui_port_7_network_role fixed_ips: - ip_address: get_input: - cmaui_oam_ips - 0 + subnetpoolid: + get_input: port_cmaui_port_7_subnetpoolid mac_requirements: - mac_count_required: - is_required: false + get_input: port_cmaui_port_7_mac_requirements + exCP_naming: + get_input: port_cmaui_port_7_exCP_naming + vlan_requirements: + get_input: port_cmaui_port_7_vlan_requirements + network_role_tag: + get_input: port_cmaui_port_7_network_role_tag network: get_input: net + order: + get_input: port_cmaui_port_7_order requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -91,24 +154,31 @@ topology_template: properties: replacement_policy: AUTO ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false + get_input: port_cmaui_port_8_ip_requirements security_groups: - get_input: p2 - get_input: p2 + network_role: + get_input: port_cmaui_port_8_network_role fixed_ips: - ip_address: get_input: - cmaui_oam_ips - 0 + subnetpoolid: + get_input: port_cmaui_port_8_subnetpoolid mac_requirements: - mac_count_required: - is_required: false + get_input: port_cmaui_port_8_mac_requirements + exCP_naming: + get_input: port_cmaui_port_8_exCP_naming + vlan_requirements: + get_input: port_cmaui_port_8_vlan_requirements + network_role_tag: + get_input: port_cmaui_port_8_network_role_tag network: get_input: net + order: + get_input: port_cmaui_port_8_order requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -138,7 +208,7 @@ topology_template: - cmaui_port_8 - server_cmaui substitution_mappings: - node_type: org.openecomp.resource.abstract.nodes.heat.nested4 + node_type: org.openecomp.resource.abstract.nodes.heat.cmaui capabilities: cpu.delta_server_cmaui: - server_cmaui @@ -347,4 +417,4 @@ topology_template: - dependency local_storage_server_cmaui: - server_cmaui - - local_storage \ No newline at end of file + - local_storage -- cgit 1.2.3-korg