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_VLC2ServiceTemplate.yaml | 387 ++++----------------- 1 file changed, 64 insertions(+), 323 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_VLC2ServiceTemplate.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_VLC2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_VLC2ServiceTemplate.yaml index 0254ce3d48..48c2c1d7b3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_VLC2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_VLC2ServiceTemplate.yaml @@ -11,27 +11,31 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_VLC_GTP_exCP_naming: + port_VLC_SCTP_A_network: type: list required: true entry_schema: - type: json + type: string port_VLC_OAM_network_role_tag: - type: string + type: list required: true + entry_schema: + type: string port_VLC_GTP_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: json port_VLC2_Internal2_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: json port_VLC_SCTP_A_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.MacRequirements vm_flavor_name: type: string required: true @@ -39,182 +43,70 @@ topology_template: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: json port_VLC_SCTP_A_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_VLC2_Internal1_network_role_tag: - type: list - required: true - entry_schema: - type: string - port_VLC2_Internal2_mac_address: - type: string - required: true - port_VLC_GTP_network_role_tag: - type: list - required: true - entry_schema: - type: string - vm_image_name: - type: string - required: true - port_VLC2_Internal1_mac_address: - type: string - required: true - port_VLC2_Internal2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_VLC2_Internal1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_VLC_SCTP_B_network: - type: list - required: true - entry_schema: - type: string - port_VLC_GTP_network: - type: list - required: true - entry_schema: - type: string - port_VLC2_Internal1_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_VLC_GTP_order: - type: list - required: true - entry_schema: - type: integer - port_VLC_OAM_exCP_naming: type: list required: true entry_schema: type: json - port_VLC_SCTP_A_network_role_tag: - type: list - required: true - entry_schema: - type: string - port_VLC_GTP_vlan_requirements: + port_VLC_OAM_ip_requirements: type: list required: true entry_schema: type: json - port_VLC_GTP_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_VLC_OAM_network: - type: list - required: true - entry_schema: - type: string - port_VLC2_Internal2_network: - type: list - required: true - entry_schema: - type: string - port_VLC_SCTP_A_network: + port_VLC2_Internal2_mac_address: type: list required: true entry_schema: type: string - port_VLC_SCTP_A_vlan_requirements: - type: list - required: true - entry_schema: - type: json - port_VLC_SCTP_A_order: - type: list - required: true - entry_schema: - type: integer - port_VLC_SCTP_B_exCP_naming: - type: list - required: true - entry_schema: - type: json - port_VLC_SCTP_A_exCP_naming: - type: list - required: true - entry_schema: - type: json - port_VLC_OAM_vlan_requirements: + port_VLC_OAM_fixed_ips: type: list required: true entry_schema: type: json - port_VLC_OAM_ip_requirements: - type: list + vm_image_name: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_VLC_OAM_fixed_ips: + port_VLC2_Internal1_mac_address: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_VLC2_Internal1_order: + type: string + port_VLC2_Internal2_mac_requirements: type: list required: true entry_schema: - type: integer - port_VLC_OAM_network_role: + type: org.openecomp.datatypes.network.MacRequirements + port_VLC2_Internal1_mac_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.MacRequirements port_VLC_SCTP_A_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_VLC2_Internal2_vlan_requirements: type: list required: true entry_schema: type: json - port_VLC_SCTP_A_subnetpoolid: + port_VLC_SCTP_B_network: type: list required: true entry_schema: type: string - port_VLC_OAM_subnetpoolid: + port_VLC_GTP_network: type: list required: true entry_schema: type: string - port_VLC_SCTP_B_network_role_tag: + port_VLC2_Internal1_ip_requirements: type: list required: true entry_schema: - type: string + type: json compute_VLC2_name: type: list required: true entry_schema: type: string - port_VLC_OAM_order: - type: list - required: true - entry_schema: - type: integer - port_VLC2_Internal1_network_role: - type: list - required: true - entry_schema: - type: string - port_VLC2_Internal2_network_role: - type: list - required: true - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -222,39 +114,16 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_VLC_SCTP_B_subnetpoolid: - type: list - required: true - entry_schema: - type: string - port_VLC2_Internal2_network_role_tag: - type: list - required: true - entry_schema: - type: string port_VLC_SCTP_B_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_VLC_GTP_network_role: - type: list - required: true - entry_schema: - type: string - port_VLC_SCTP_A_network_role: - type: list - required: true - entry_schema: - type: string - port_VLC2_Internal2_order: + type: json + port_VLC_GTP_mac_requirements: type: list required: true entry_schema: - type: integer - port_VLC_GTP_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true + type: org.openecomp.datatypes.network.MacRequirements port_VLC2_Internal1_network: type: list required: true @@ -265,53 +134,27 @@ topology_template: required: true entry_schema: type: string - port_VLC2_Internal1_exCP_naming: + port_VLC_GTP_fixed_ips: type: list required: true entry_schema: type: json port_VLC_OAM_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_VLC2_Internal1_vlan_requirements: type: list required: true entry_schema: - type: json - port_VLC2_Internal2_subnetpoolid: + type: org.openecomp.datatypes.network.MacRequirements + port_VLC_OAM_network: type: list required: true entry_schema: type: string port_VLC_SCTP_B_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_VLC2_Internal2_exCP_naming: - type: list - required: true - entry_schema: - type: json - port_VLC_SCTP_B_order: - type: list - required: true - entry_schema: - type: integer - port_VLC_GTP_subnetpoolid: type: list required: true entry_schema: - type: string - port_VLC2_Internal1_subnetpoolid: - type: list - required: true - entry_schema: - type: string - port_VLC_SCTP_B_vlan_requirements: - type: list - required: true - entry_schema: - type: json - port_VLC_SCTP_B_network_role: + type: org.openecomp.datatypes.network.MacRequirements + port_VLC2_Internal2_network: type: list required: true entry_schema: @@ -320,40 +163,22 @@ topology_template: VLC2_VLC2_Internal2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_VLC2_Internal2_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_VLC2_Internal2_vlan_requirements - - index_value ip_requirements: - get_input: port_VLC2_Internal2_ip_requirements - network_role_tag: get_input: - - port_VLC2_Internal2_network_role_tag + - port_VLC2_Internal2_ip_requirements - index_value mac_requirements: - get_input: port_VLC2_Internal2_mac_requirements - order: - get_input: - - port_VLC2_Internal2_order - - index_value - network_role: get_input: - - port_VLC2_Internal2_network_role - - index_value - subnetpoolid: - get_input: - - port_VLC2_Internal2_subnetpoolid + - port_VLC2_Internal2_mac_requirements - index_value network: get_input: - port_VLC2_Internal2_network - index_value mac_address: - get_input: port_VLC2_Internal2_mac_address + get_input: + - port_VLC2_Internal2_mac_address + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -362,34 +187,22 @@ topology_template: VLC2_VLC_OAM: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_VLC_OAM_exCP_naming - - index_value - vlan_requirements: + ip_requirements: get_input: - - port_VLC_OAM_vlan_requirements + - port_VLC_OAM_ip_requirements - index_value - ip_requirements: - get_input: port_VLC_OAM_ip_requirements network_role_tag: - get_input: port_VLC_OAM_network_role_tag - mac_requirements: - get_input: port_VLC_OAM_mac_requirements - order: get_input: - - port_VLC_OAM_order + - port_VLC_OAM_network_role_tag - index_value - network_role: + mac_requirements: get_input: - - port_VLC_OAM_network_role + - port_VLC_OAM_mac_requirements - index_value - subnetpoolid: + fixed_ips: get_input: - - port_VLC_OAM_subnetpoolid + - port_VLC_OAM_fixed_ips - index_value - fixed_ips: - get_input: port_VLC_OAM_fixed_ips network: get_input: - port_VLC_OAM_network @@ -402,40 +215,22 @@ topology_template: VLC2_VLC2_Internal1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_VLC2_Internal1_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_VLC2_Internal1_vlan_requirements - - index_value ip_requirements: - get_input: port_VLC2_Internal1_ip_requirements - network_role_tag: get_input: - - port_VLC2_Internal1_network_role_tag + - port_VLC2_Internal1_ip_requirements - index_value mac_requirements: - get_input: port_VLC2_Internal1_mac_requirements - order: get_input: - - port_VLC2_Internal1_order - - index_value - network_role: - get_input: - - port_VLC2_Internal1_network_role - - index_value - subnetpoolid: - get_input: - - port_VLC2_Internal1_subnetpoolid + - port_VLC2_Internal1_mac_requirements - index_value network: get_input: - port_VLC2_Internal1_network - index_value mac_address: - get_input: port_VLC2_Internal1_mac_address + get_input: + - port_VLC2_Internal1_mac_address + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -444,36 +239,18 @@ topology_template: VLC2_VLC_SCTP_A: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_VLC_SCTP_A_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_VLC_SCTP_A_vlan_requirements - - index_value ip_requirements: - get_input: port_VLC_SCTP_A_ip_requirements - network_role_tag: get_input: - - port_VLC_SCTP_A_network_role_tag + - port_VLC_SCTP_A_ip_requirements - index_value mac_requirements: - get_input: port_VLC_SCTP_A_mac_requirements - order: get_input: - - port_VLC_SCTP_A_order + - port_VLC_SCTP_A_mac_requirements - index_value - network_role: - get_input: - - port_VLC_SCTP_A_network_role - - index_value - subnetpoolid: + fixed_ips: get_input: - - port_VLC_SCTP_A_subnetpoolid + - port_VLC_SCTP_A_fixed_ips - index_value - fixed_ips: - get_input: port_VLC_SCTP_A_fixed_ips network: get_input: - port_VLC_SCTP_A_network @@ -486,36 +263,18 @@ topology_template: VLC2_VLC_SCTP_B: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_VLC_SCTP_B_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_VLC_SCTP_B_vlan_requirements - - index_value ip_requirements: - get_input: port_VLC_SCTP_B_ip_requirements - network_role_tag: get_input: - - port_VLC_SCTP_B_network_role_tag + - port_VLC_SCTP_B_ip_requirements - index_value mac_requirements: - get_input: port_VLC_SCTP_B_mac_requirements - order: get_input: - - port_VLC_SCTP_B_order + - port_VLC_SCTP_B_mac_requirements - index_value - network_role: - get_input: - - port_VLC_SCTP_B_network_role - - index_value - subnetpoolid: + fixed_ips: get_input: - - port_VLC_SCTP_B_subnetpoolid + - port_VLC_SCTP_B_fixed_ips - index_value - fixed_ips: - get_input: port_VLC_SCTP_B_fixed_ips network: get_input: - port_VLC_SCTP_B_network @@ -528,36 +287,18 @@ topology_template: VLC2_VLC_GTP: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_VLC_GTP_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_VLC_GTP_vlan_requirements - - index_value ip_requirements: - get_input: port_VLC_GTP_ip_requirements - network_role_tag: get_input: - - port_VLC_GTP_network_role_tag + - port_VLC_GTP_ip_requirements - index_value mac_requirements: - get_input: port_VLC_GTP_mac_requirements - order: - get_input: - - port_VLC_GTP_order - - index_value - network_role: get_input: - - port_VLC_GTP_network_role + - port_VLC_GTP_mac_requirements - index_value - subnetpoolid: + fixed_ips: get_input: - - port_VLC_GTP_subnetpoolid + - port_VLC_GTP_fixed_ips - index_value - fixed_ips: - get_input: port_VLC_GTP_fixed_ips network: get_input: - port_VLC_GTP_network @@ -948,4 +689,4 @@ topology_template: - dependency dependency_VLC2_VLC_GTP: - VLC2_VLC_GTP - - dependency + - dependency \ No newline at end of file -- cgit 1.2.3-korg