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, 195 insertions, 229 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 4840c96647..fb7153670f 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,6 +14,12 @@ 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 @@ -26,6 +32,12 @@ 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 @@ -40,22 +52,38 @@ 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 - port_vdbe_untr_2_port_subinterface_indicator: + subinterface_vlan1_subinterfaces_name_prefix: type: list required: true status: SUPPORTED entry_schema: - type: boolean + 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 @@ -72,6 +100,12 @@ 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 @@ -88,176 +122,130 @@ node_types: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_vdbe_untr_2_port_ip_requirements: + subinterface_vlan1_vn_network_list: 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 - required: true - status: SUPPORTED - port_vdbe_untr_1_port_order: - type: integer - required: true - status: SUPPORTED - port_vdbe_untr_1_port_subnetpoolid: + type: string + port_vdbe_untr_2_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: string - subinterface_vlan1_aap_untrusted_ip_prefix_len: - type: list + port_vdbe_untr_2_port_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: string - subinterface_vlan1_ip_address: + subinterface_vlan1_service_template_filter_count: type: list required: true status: SUPPORTED entry_schema: - type: string - compute_vdbe_name: + type: float + port_vdbe_untr_2_port_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_vdbe_untr_1_port_network_role_tag: - 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_1_port_subinterface_indicator: - type: list + port_vdbe_untr_1_port_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: boolean - subinterface_vlan1_ip_v6_address: + subinterface_vlan1_parent_interface: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_vlan1_aap_untrusted_ip_prefix: + subinterface_vlan1_aap_address_mode: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_2_port_virtual_network_refs: - type: list - required: true + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 status: SUPPORTED - entry_schema: - type: json - subinterface_vlan1_subinterfaces_name_prefix: - type: list + constraints: + - greater_or_equal: 0 + port_vdbe_untr_1_port_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: string - port_vdbe_untr_1_port_network_role: + port_vdbe_untr_1_port_subnetpoolid: type: string required: true status: SUPPORTED - port_vdbe_untr_2_port_name: + subinterface_vlan1_optional_property_1: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_virtual_network_refs: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - subinterface_vlan1_vn_network_list: + port_vdbe_untr_1_port_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_2_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_vdbe_untr_2_port_order: - type: integer + port_vdbe_untr_2_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - subinterface_vlan1_service_template_filter_count: + subinterface_vlan1_optional_property_2: type: list required: true status: SUPPORTED entry_schema: - type: float - subinterface_vlan1_parent_interface: - type: list + 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 status: SUPPORTED - entry_schema: - type: string - subinterface_vlan1_aap_address_mode: + subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: 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 - 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: + subinterface_vlan1_mac_address: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_name: + subinterface_vlan1_aap_untrusted_ip_prefix_len: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_vlan1_optional_property_2: + subinterface_vlan1_ip_address: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: + 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 + compute_vdbe_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 + port_vdbe_untr_1_port_network_role_tag: + type: string required: true status: SUPPORTED port_vdbe_untr_1_port_vlan_requirements: 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 f556f19079..1cbb297669 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 @@ -476,65 +476,29 @@ 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 - subinterface_vlan1_counter: - - get_input: counter - - get_input: counter - port_vdbe_untr_2_port_subinterface_indicator: - - false - - false - vm_image_name: - get_input: vdbe_image_name - compute_vdbe_metadata: - - vf_module_id: - get_input: vf_module_id - vnf_id: - get_input: vnf_id - vnf_name: - get_input: vnf_name - - vf_module_id: - get_input: vf_module_id - vnf_id: - get_input: vnf_id - vnf_name: - get_input: vnf_name - 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 - port_vdbe_untr_1_port_subinterface_indicator: - - true - - true - 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_counter: + - get_input: counter + - get_input: counter subinterface_vlan1_subinterfaces_name_prefix: - str_replace: template: VM_NAMEDBE001p1n004 @@ -550,9 +514,27 @@ topology_template: 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 + vnf_id: + get_input: vnf_id + vnf_name: + get_input: vnf_name + - vf_module_id: + get_input: vf_module_id + vnf_id: + get_input: vnf_id + vnf_name: + get_input: vnf_name + 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 port_vdbe_untr_1_port_virtual_network_refs: - - control_int_net - - control_int_net @@ -592,6 +574,18 @@ 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 @@ -640,4 +634,4 @@ topology_template: value: get_attribute: - abstract_vdbe - - vdbe_vdbe_untr_1_port_vlan1_aap_address_mode
\ No newline at end of file + - vdbe_vdbe_untr_1_port_vlan1_aap_address_mode 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 eb21b34ada..13006c7a6e 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,147 +16,94 @@ topology_template: required: true entry_schema: type: string - subinterface_vlan1_aap_sec_untrusted_ip_prefix: + subinterface_vlan1_ip_v6_address: type: list required: true entry_schema: type: string - compute_vdbe_availability_zone: + subinterface_vlan1_aap_sec_untrusted_ip_prefix: type: list required: true entry_schema: type: string - port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses: + compute_vdbe_availability_zone: type: list required: true entry_schema: - type: json - port_vdbe_untr_2_port_network_role_tag: - type: string - required: true - vm_flavor_name: - type: string - required: true - subinterface_vlan1_counter: + type: string + subinterface_vlan1_aap_untrusted_ip_prefix: type: list required: true entry_schema: - type: float - port_vdbe_untr_2_port_subinterface_indicator: + type: string + port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses: type: list required: true entry_schema: - type: boolean - vm_image_name: + type: json + port_vdbe_untr_2_port_network_role_tag: type: string required: true - port_vdbe_untr_2_port_network_role: + vm_flavor_name: type: string required: true - compute_vdbe_metadata: + port_vdbe_untr_2_port_virtual_network_refs: type: list required: true entry_schema: type: json - subinterface_vlan1_aap_untrusted_v6_ip_prefix_len: - type: list - required: true - entry_schema: - type: string - port_vdbe_untr_1_port_ip_requirements: - type: list - required: true - 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: + subinterface_vlan1_counter: 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_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: float + subinterface_vlan1_subinterfaces_name_prefix: type: list required: true entry_schema: type: string - subinterface_vlan1_aap_untrusted_ip_prefix_len: - type: list + vm_image_name: + type: string required: true - entry_schema: - type: string - subinterface_vlan1_ip_address: - type: list + port_vdbe_untr_1_port_network_role: + type: string required: true - entry_schema: - type: string - compute_vdbe_name: + port_vdbe_untr_2_port_name: type: list required: true entry_schema: type: string - port_vdbe_untr_1_port_network_role_tag: + port_vdbe_untr_2_port_network_role: type: string required: true - port_vdbe_untr_1_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean - subinterface_vlan1_ip_v6_address: + compute_vdbe_metadata: type: list required: true entry_schema: - type: string - subinterface_vlan1_aap_untrusted_ip_prefix: + type: json + subinterface_vlan1_aap_untrusted_v6_ip_prefix_len: type: list required: true entry_schema: type: string - port_vdbe_untr_2_port_virtual_network_refs: + port_vdbe_untr_1_port_virtual_network_refs: type: list required: true entry_schema: type: json - subinterface_vlan1_subinterfaces_name_prefix: + port_vdbe_untr_1_port_ip_requirements: type: list required: true entry_schema: - type: string - port_vdbe_untr_1_port_network_role: - type: string - required: true - port_vdbe_untr_2_port_name: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_2_port_vlan_requirements: type: list required: true entry_schema: - type: string - port_vdbe_untr_1_port_virtual_network_refs: - type: list + type: org.openecomp.datatypes.network.VlanRequirements + port_vdbe_untr_2_port_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json subinterface_vlan1_vn_network_list: type: list required: true @@ -173,6 +120,17 @@ 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 @@ -193,6 +151,9 @@ 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 @@ -203,19 +164,48 @@ 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 @@ -266,10 +256,7 @@ topology_template: - index_value vlan_requirements: get_input: port_vdbe_untr_2_port_vlan_requirements - subinterface_indicator: - get_input: - - port_vdbe_untr_2_port_subinterface_indicator - - index_value + subinterface_indicator: false virtual_network_refs: get_input: - port_vdbe_untr_2_port_virtual_network_refs @@ -399,10 +386,7 @@ topology_template: - index_value vlan_requirements: get_input: port_vdbe_untr_1_port_vlan_requirements - subinterface_indicator: - get_input: - - port_vdbe_untr_1_port_subinterface_indicator - - index_value + subinterface_indicator: true virtual_network_refs: get_input: - port_vdbe_untr_1_port_virtual_network_refs |