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 --- .../generalVf/out/Nested_NCB1ServiceTemplate.yaml | 148 +++++---------------- 1 file changed, 30 insertions(+), 118 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_NCB1ServiceTemplate.yaml') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_NCB1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_NCB1ServiceTemplate.yaml index 2da2afc1ba..4e33b89be8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_NCB1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_NCB1ServiceTemplate.yaml @@ -11,68 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_NCB1_Internal1_network_role: - type: list - required: true - entry_schema: - type: string - port_NCB1_Internal2_network_role: - type: list - required: true - entry_schema: - type: string - port_NCB1_Internal1_network_role_tag: - type: list - required: true - entry_schema: - type: string - vm_flavor_name: - type: string - required: true - compute_NCB1_name: - type: list - required: true - entry_schema: - type: string - port_NCB1_Internal2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string - required: true - port_NCB1_Internal2_order: - type: list - required: true - entry_schema: - type: integer - port_NCB1_Internal2_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_NCB1_Internal1_exCP_naming: - type: list - required: true - entry_schema: - type: json - port_NCB1_Internal1_subnetpoolid: - type: list - required: true - entry_schema: - type: string - port_NCB1_Internal2_vlan_requirements: - type: list - required: true - entry_schema: - type: json - port_NCB1_Internal2_subnetpoolid: + port_NCB1_Internal2_mac_address: type: list required: true entry_schema: type: string - port_NCB1_Internal2_mac_address: - type: string - required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -81,31 +24,33 @@ topology_template: constraints: - greater_or_equal: 0 port_NCB1_Internal1_mac_address: - type: string - required: true - port_NCB1_Internal1_order: type: list required: true entry_schema: - type: integer - port_NCB1_Internal2_exCP_naming: + type: string + port_NCB1_Internal1_ip_requirements: type: list required: true entry_schema: type: json - port_NCB1_Internal1_ip_requirements: + vm_flavor_name: + type: string + required: true + compute_NCB1_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_NCB1_Internal1_vlan_requirements: + type: string + port_NCB1_Internal1_mac_requirements: type: list required: true entry_schema: - type: json - port_NCB1_Internal1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.MacRequirements + port_NCB1_Internal2_mac_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.MacRequirements port_NCB1_Internal1_network: type: list required: true @@ -116,11 +61,14 @@ topology_template: required: true entry_schema: type: string - port_NCB1_Internal2_network_role_tag: + vm_image_name: + type: string + required: true + port_NCB1_Internal2_ip_requirements: type: list required: true entry_schema: - type: string + type: json port_NCB1_Internal2_network: type: list required: true @@ -145,40 +93,22 @@ topology_template: NCB1_NCB1_Internal1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_NCB1_Internal1_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_NCB1_Internal1_vlan_requirements - - index_value ip_requirements: - get_input: port_NCB1_Internal1_ip_requirements - network_role_tag: get_input: - - port_NCB1_Internal1_network_role_tag + - port_NCB1_Internal1_ip_requirements - index_value mac_requirements: - get_input: port_NCB1_Internal1_mac_requirements - order: get_input: - - port_NCB1_Internal1_order - - index_value - network_role: - get_input: - - port_NCB1_Internal1_network_role - - index_value - subnetpoolid: - get_input: - - port_NCB1_Internal1_subnetpoolid + - port_NCB1_Internal1_mac_requirements - index_value network: get_input: - port_NCB1_Internal1_network - index_value mac_address: - get_input: port_NCB1_Internal1_mac_address + get_input: + - port_NCB1_Internal1_mac_address + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -187,40 +117,22 @@ topology_template: NCB1_NCB1_Internal2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_NCB1_Internal2_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_NCB1_Internal2_vlan_requirements - - index_value ip_requirements: - get_input: port_NCB1_Internal2_ip_requirements - network_role_tag: get_input: - - port_NCB1_Internal2_network_role_tag + - port_NCB1_Internal2_ip_requirements - index_value mac_requirements: - get_input: port_NCB1_Internal2_mac_requirements - order: - get_input: - - port_NCB1_Internal2_order - - index_value - network_role: get_input: - - port_NCB1_Internal2_network_role - - index_value - subnetpoolid: - get_input: - - port_NCB1_Internal2_subnetpoolid + - port_NCB1_Internal2_mac_requirements - index_value network: get_input: - port_NCB1_Internal2_network - index_value mac_address: - get_input: port_NCB1_Internal2_mac_address + get_input: + - port_NCB1_Internal2_mac_address + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -436,4 +348,4 @@ topology_template: - dependency dependency_NCB1_NCB1_Internal2: - NCB1_NCB1_Internal2 - - dependency + - dependency \ No newline at end of file -- cgit 1.2.3-korg