diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities')
3 files changed, 222 insertions, 196 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml index fb7153670f..b7b6ef9288 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -14,12 +14,6 @@ node_types: status: SUPPORTED entry_schema: type: string - subinterface_vlan1_ip_v6_address: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string subinterface_vlan1_aap_sec_untrusted_ip_prefix: type: list required: true @@ -32,12 +26,6 @@ node_types: status: SUPPORTED entry_schema: type: string - subinterface_vlan1_aap_untrusted_ip_prefix: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses: type: list required: true @@ -52,38 +40,16 @@ node_types: type: string required: true status: SUPPORTED - port_vdbe_untr_2_port_virtual_network_refs: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json subinterface_vlan1_counter: type: list required: true status: SUPPORTED entry_schema: type: float - subinterface_vlan1_subinterfaces_name_prefix: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string vm_image_name: type: string required: true status: SUPPORTED - port_vdbe_untr_1_port_network_role: - type: string - required: true - status: SUPPORTED - port_vdbe_untr_2_port_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string port_vdbe_untr_2_port_network_role: type: string required: true @@ -100,12 +66,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_virtual_network_refs: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json port_vdbe_untr_1_port_ip_requirements: type: list required: true @@ -122,130 +82,182 @@ node_types: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - subinterface_vlan1_vn_network_list: + port_vdbe_untr_2_port_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_vdbe_untr_2_port_subnetpoolid: - type: string + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_1_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_vdbe_untr_2_port_order: + port_vdbe_untr_1_port_order: type: integer required: true status: SUPPORTED - subinterface_vlan1_service_template_filter_count: + port_vdbe_untr_1_port_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_2_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + required: true + status: SUPPORTED + subinterface_vlan1_mac_address: type: list required: true status: SUPPORTED entry_schema: - type: float - port_vdbe_untr_2_port_ip_requirements: + type: string + subinterface_vlan1_aap_untrusted_ip_prefix_len: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_vdbe_untr_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: string + subinterface_vlan1_ip_address: + type: list required: true status: SUPPORTED - port_vdbe_untr_1_port_order: - type: integer + entry_schema: + type: string + compute_vdbe_name: + type: list required: true status: SUPPORTED - subinterface_vlan1_parent_interface: + entry_schema: + type: string + port_vdbe_untr_1_port_network_role_tag: + type: string + required: true + status: SUPPORTED + subinterface_vlan1_ip_v6_address: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_vlan1_aap_address_mode: + port_vdbe_untr_1_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + subinterface_vlan1_aap_untrusted_ip_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 + port_vdbe_untr_2_port_virtual_network_refs: + type: list + required: true status: SUPPORTED - constraints: - - greater_or_equal: 0 - port_vdbe_untr_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + entry_schema: + type: json + subinterface_vlan1_subinterfaces_name_prefix: + type: list required: true status: SUPPORTED - port_vdbe_untr_1_port_subnetpoolid: + entry_schema: + type: string + port_vdbe_untr_1_port_network_role: type: string required: true status: SUPPORTED - subinterface_vlan1_optional_property_1: + port_vdbe_untr_2_port_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_name: + port_vdbe_untr_2_port_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_vdbe_untr_2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_vdbe_untr_1_port_virtual_network_refs: + type: list required: true status: SUPPORTED - subinterface_vlan1_optional_property_2: + entry_schema: + type: json + subinterface_vlan1_vn_network_list: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + port_vdbe_untr_2_port_subnetpoolid: + type: string required: true status: SUPPORTED - subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: + port_vdbe_untr_2_port_order: + type: integer + required: true + status: SUPPORTED + subinterface_vlan1_service_template_filter_count: + type: list + required: true + status: SUPPORTED + entry_schema: + type: float + subinterface_vlan1_parent_interface: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_vlan1_mac_address: + subinterface_vlan1_aap_address_mode: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_vlan1_aap_untrusted_ip_prefix_len: + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + port_vdbe_untr_1_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + subinterface_vlan1_optional_property_1: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_vlan1_ip_address: + port_vdbe_untr_1_port_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_2_port_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + subinterface_vlan1_optional_property_2: + type: list required: true status: SUPPORTED - compute_vdbe_name: + entry_schema: + type: string + subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_network_role_tag: - type: string + port_vdbe_untr_2_port_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true status: SUPPORTED port_vdbe_untr_1_port_vlan_requirements: @@ -837,4 +849,4 @@ node_types: type: tosca.capabilities.Node 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/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/MainServiceTemplate.yaml index 9b01aa7c8a..70051fa4b7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/MainServiceTemplate.yaml @@ -471,49 +471,22 @@ topology_template: subinterface_vlan1_aap_untrusted_v6_ip_prefix: - get_input: vdbe_aap_untrusted_v6_ip_prefix - get_input: vdbe_aap_untrusted_v6_ip_prefix - subinterface_vlan1_ip_v6_address: - - get_input: vdbe_untrusted_v6_ip_1 - - get_input: vdbe_untrusted_v6_ip_1 subinterface_vlan1_aap_sec_untrusted_ip_prefix: - get_input: vdbe_aap_sec_untrusted_ip_prefix - get_input: vdbe_aap_sec_untrusted_ip_prefix compute_vdbe_availability_zone: - get_input: availability_zone_1 - get_input: availability_zone_1 - subinterface_vlan1_aap_untrusted_ip_prefix: - - get_input: vdbe_aap_untrusted_ip_prefix - - get_input: vdbe_aap_untrusted_ip_prefix port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses: - - get_input: vdbe_hw_untr_mac_1 - - get_input: vdbe_hw_untr_mac_1 vm_flavor_name: get_input: vdbe_flavor_name - port_vdbe_untr_2_port_virtual_network_refs: - - - fabric_int_net - - - fabric_int_net subinterface_vlan1_counter: - get_input: counter - get_input: counter - subinterface_vlan1_subinterfaces_name_prefix: - - str_replace: - template: VM_NAMEDBE001p1n004 - params: - DBE: - get_input: vdbe_device_name - VM_NAME: - get_input: vdbe_name_1 - - str_replace: - template: VM_NAMEDBE001p1n004 - params: - DBE: - get_input: vdbe_device_name - VM_NAME: - get_input: vdbe_name_1 vm_image_name: get_input: vdbe_image_name - port_vdbe_untr_2_port_name: - - Port_2 - - Port_4 compute_vdbe_metadata: - vf_module_id: get_input: vf_module_id @@ -530,6 +503,45 @@ topology_template: subinterface_vlan1_aap_untrusted_v6_ip_prefix_len: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len - get_input: vdbe_aap_untrusted_v6_ip_prefix_len + subinterface_vlan1_mac_address: + - get_input: vdbe_hw_untr_mac_1 + - get_input: vdbe_hw_untr_mac_1 + subinterface_vlan1_aap_untrusted_ip_prefix_len: + - get_input: vdbe_aap_untrusted_ip_prefix_len + - get_input: vdbe_aap_untrusted_ip_prefix_len + subinterface_vlan1_ip_address: + - get_input: vdbe_untrusted_ip_1 + - get_input: vdbe_untrusted_ip_1 + compute_vdbe_name: + - get_input: vdbe_name_1 + - get_input: vdbe_name_1 + subinterface_vlan1_ip_v6_address: + - get_input: vdbe_untrusted_v6_ip_1 + - get_input: vdbe_untrusted_v6_ip_1 + subinterface_vlan1_aap_untrusted_ip_prefix: + - get_input: vdbe_aap_untrusted_ip_prefix + - get_input: vdbe_aap_untrusted_ip_prefix + port_vdbe_untr_2_port_virtual_network_refs: + - - fabric_int_net + - - fabric_int_net + subinterface_vlan1_subinterfaces_name_prefix: + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 + port_vdbe_untr_2_port_name: + - Port_2 + - Port_4 port_vdbe_untr_1_port_virtual_network_refs: - - control_int_net - - control_int_net @@ -569,18 +581,6 @@ topology_template: subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: - get_input: vdbe_aap_sec_untrusted_ip_prefix_len - get_input: vdbe_aap_sec_untrusted_ip_prefix_len - subinterface_vlan1_mac_address: - - get_input: vdbe_hw_untr_mac_1 - - get_input: vdbe_hw_untr_mac_1 - subinterface_vlan1_aap_untrusted_ip_prefix_len: - - get_input: vdbe_aap_untrusted_ip_prefix_len - - get_input: vdbe_aap_untrusted_ip_prefix_len - subinterface_vlan1_ip_address: - - get_input: vdbe_untrusted_ip_1 - - get_input: vdbe_untrusted_ip_1 - compute_vdbe_name: - - get_input: vdbe_name_1 - - get_input: vdbe_name_1 port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses: - - get_input: vdbe_hw_untr_mac_1 - - get_input: vdbe_hw_untr_mac_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/Nested_vdbeServiceTemplate.yaml index 13006c7a6e..3b803ba26b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/Nested_vdbeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/Nested_vdbeServiceTemplate.yaml @@ -16,11 +16,6 @@ topology_template: required: true entry_schema: type: string - subinterface_vlan1_ip_v6_address: - type: list - required: true - entry_schema: - type: string subinterface_vlan1_aap_sec_untrusted_ip_prefix: type: list required: true @@ -31,11 +26,6 @@ topology_template: required: true entry_schema: type: string - subinterface_vlan1_aap_untrusted_ip_prefix: - type: list - required: true - entry_schema: - type: string port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses: type: list required: true @@ -47,63 +37,126 @@ topology_template: vm_flavor_name: type: string required: true - port_vdbe_untr_2_port_virtual_network_refs: + subinterface_vlan1_counter: type: list required: true entry_schema: - type: json - subinterface_vlan1_counter: + type: float + vm_image_name: + type: string + required: true + port_vdbe_untr_2_port_network_role: + type: string + required: true + compute_vdbe_metadata: type: list required: true entry_schema: - type: float - subinterface_vlan1_subinterfaces_name_prefix: + type: json + subinterface_vlan1_aap_untrusted_v6_ip_prefix_len: type: list required: true entry_schema: type: string - vm_image_name: - type: string + port_vdbe_untr_1_port_ip_requirements: + type: list required: true - port_vdbe_untr_1_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_2_port_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_vdbe_untr_2_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_vdbe_untr_2_port_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_1_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_vdbe_untr_1_port_order: + type: integer + required: true + port_vdbe_untr_1_port_subnetpoolid: type: string required: true - port_vdbe_untr_2_port_name: + port_vdbe_untr_2_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + required: true + subinterface_vlan1_mac_address: type: list required: true entry_schema: type: string - port_vdbe_untr_2_port_network_role: + subinterface_vlan1_aap_untrusted_ip_prefix_len: + type: list + required: true + entry_schema: + type: string + subinterface_vlan1_ip_address: + type: list + required: true + entry_schema: + type: string + compute_vdbe_name: + type: list + required: true + entry_schema: + type: string + port_vdbe_untr_1_port_network_role_tag: type: string required: true - compute_vdbe_metadata: + subinterface_vlan1_ip_v6_address: type: list required: true entry_schema: - type: json - subinterface_vlan1_aap_untrusted_v6_ip_prefix_len: + type: string + port_vdbe_untr_1_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + subinterface_vlan1_aap_untrusted_ip_prefix: type: list required: true entry_schema: type: string - port_vdbe_untr_1_port_virtual_network_refs: + port_vdbe_untr_2_port_virtual_network_refs: type: list required: true entry_schema: type: json - port_vdbe_untr_1_port_ip_requirements: + subinterface_vlan1_subinterfaces_name_prefix: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_vdbe_untr_2_port_vlan_requirements: + type: string + port_vdbe_untr_1_port_network_role: + type: string + required: true + port_vdbe_untr_2_port_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_untr_2_port_exCP_naming: - type: org.openecomp.datatypes.Naming + type: string + port_vdbe_untr_2_port_related_networks: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_vdbe_untr_1_port_virtual_network_refs: + type: list + required: true + entry_schema: + type: json subinterface_vlan1_vn_network_list: type: list required: true @@ -120,17 +173,6 @@ topology_template: required: true entry_schema: type: float - port_vdbe_untr_2_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_vdbe_untr_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_vdbe_untr_1_port_order: - type: integer - required: true subinterface_vlan1_parent_interface: type: list required: true @@ -151,9 +193,6 @@ topology_template: port_vdbe_untr_1_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_vdbe_untr_1_port_subnetpoolid: - type: string - required: true subinterface_vlan1_optional_property_1: type: list required: true @@ -164,48 +203,19 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true subinterface_vlan1_optional_property_2: type: list required: true entry_schema: type: string - port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - required: true subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: type: list required: true entry_schema: type: string - subinterface_vlan1_mac_address: - type: list - required: true - entry_schema: - type: string - subinterface_vlan1_aap_untrusted_ip_prefix_len: - type: list - required: true - entry_schema: - type: string - subinterface_vlan1_ip_address: - type: list - required: true - entry_schema: - type: string port_vdbe_untr_2_port_virtual_machine_interface_allowed_address_pairs: type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true - compute_vdbe_name: - type: list - required: true - entry_schema: - type: string - port_vdbe_untr_1_port_network_role_tag: - type: string - required: true port_vdbe_untr_1_port_vlan_requirements: type: list required: true @@ -257,6 +267,8 @@ topology_template: vlan_requirements: get_input: port_vdbe_untr_2_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_vdbe_untr_2_port_related_networks virtual_network_refs: get_input: - port_vdbe_untr_2_port_virtual_network_refs @@ -387,6 +399,8 @@ topology_template: vlan_requirements: get_input: port_vdbe_untr_1_port_vlan_requirements subinterface_indicator: true + related_networks: + get_input: port_vdbe_untr_1_port_related_networks virtual_network_refs: get_input: - port_vdbe_untr_1_port_virtual_network_refs @@ -644,4 +658,4 @@ topology_template: - dependency subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: - vdbe_vdbe_untr_1_port_vlan1 - - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport + - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport
\ No newline at end of file |