diff options
Diffstat (limited to 'resources')
17 files changed, 350 insertions, 864 deletions
diff --git a/resources/api/vpp/supported_crcs.yaml b/resources/api/vpp/supported_crcs.yaml index fb6a499d42..5ea52861d2 100644 --- a/resources/api/vpp/supported_crcs.yaml +++ b/resources/api/vpp/supported_crcs.yaml @@ -27,389 +27,8 @@ # Use bash command "env LC_COLLATE=C sort -u" if not clear. # https://packagecloud.io/app/fdio/release -# /search?q=24.02&filter=debs&filter=all&dist=debian -24.02-with-srv6-bug: - # plugins/acl/acl.api - acl_add_replace: '0xee5c2f18' # dev - acl_add_replace_reply: '0xac407b0c' # dev - acl_details: '0x95babae0' # dev teardown - acl_dump: '0xef34fea4' # dev teardown - acl_interface_list_details: '0xe695d256' # dev teardown - acl_interface_list_dump: '0xf9e6675e' # dev teardown - acl_interface_set_acl_list: '0x473982bd' # dev - acl_interface_set_acl_list_reply: '0xe8d4e804' # dev - - # vlibmemory/vlib.api - add_node_next: '0x2457116d' # dev - add_node_next_reply: '0x2ed75f32' # dev - - # plugins/adl/adl.api - adl_allowlist_enable_disable: '0xea88828d' # dev - adl_allowlist_enable_disable_reply: '0xe8d4e804' # dev - adl_interface_enable_disable: '0x5501adee' # dev - adl_interface_enable_disable_reply: '0xe8d4e804' # dev - - # plugins/af_xdp/af_xdp.api - af_xdp_create_v3: '0xcf4b1827' # perf - af_xdp_create_v3_reply: '0x5383d31f' # perf - - # plugins/avf/avf.api - avf_create: '0xdaab8ae2' # dev - avf_create_reply: '0x5383d31f' # dev - - # vnet/bonding/bond.api - bond_add_member: '0xe7d14948' # perf - bond_add_member_reply: '0xe8d4e804' # perf - bond_create2: '0x912fda76' # perf - bond_create2_reply: '0x5383d31f' # perf - # 4x^ 64B-1c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr - # ^ ndrpdrAND1cAND64bAND1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm - - # vnet/l2/l2.api - bridge_domain_add_del_v2: '0x600b7170' # dev - bridge_domain_add_del_v2_reply: '0xfcb1e980' # dev - # bridge_domain_dump / details # honeycomb - - # vnet/classify/classify.api - classify_add_del_session: '0xf20879f0' # dev - classify_add_del_session_reply: '0xe8d4e804' # dev - classify_add_del_table: '0x6849e39e' # dev - classify_add_del_table_reply: '0x05486349' # dev - # classify_session_dump / details # honeycomb - # classify_table_by_interface / reply # honeycomb - # classify_table_info / reply # honeycomb - - # vlibmemory/vlib.api - cli_inband: '0xf8377302' # dev setup - cli_inband_reply: '0x05879051' # dev setup - - # vnet/interface.api - create_loopback_instance: '0xd36a3ee2' # dev - create_loopback_instance_reply: '0x5383d31f' # dev - - # vnet/interface.api - create_subif: '0x790ca755' # perf - create_subif_reply: '0x5383d31f' # perf - # ^^ 64B-1c-dot1ad-l2xcbase-ndrpdr - # ^ ndrpdrAND1cAND64bANDdot1ad-l2xcbase - - # plugins/vhost/vhost_user.api - create_vhost_user_if_v2: '0xdba1cc1d' # dev - create_vhost_user_if_v2_reply: '0x5383d31f' # dev - - # vnet/interface.api - create_vlan_subif: '0xaf34ac8b' # dev - create_vlan_subif_reply: '0x5383d31f' # dev - - # plugins/crypto_sw_scheduler/crypto_sw_scheduler.api - crypto_set_async_dispatch_v2: '0x667d2d54' # perf - crypto_set_async_dispatch_v2_reply: '0xe8d4e804' # perf - crypto_sw_scheduler_set_worker: '0xb4274502' # perf - crypto_sw_scheduler_set_worker_reply: '0xe8d4e804' # perf - # 4^ 64B-1c-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes128gcm-udir-ndrpdr - # ^ ndrpdrAND1cAND64BANDethip4ipsec8tnlswasync-scheduler-ip4base-int-\ - # aes128gcm-udir - - # plugins/nat/det44/det44.api - det44_add_del_map: '0x1150a190' # dev - det44_add_del_map_reply: '0xe8d4e804' # dev - det44_interface_add_del_feature: '0xdc17a836' # dev - det44_interface_add_del_feature_reply: '0xe8d4e804' # dev - det44_interface_details: '0xe60cc5be' # dev teardown - det44_interface_dump: '0x51077d14' # dev teardown - det44_map_details: '0xad91dc83' # dev teardown - det44_map_dump: '0x51077d14' # dev teardown - det44_plugin_enable_disable: '0x617b6bf8' # dev - det44_plugin_enable_disable_reply: '0xe8d4e804' # dev - det44_session_dump: '0xe45a3af7' # dev - # TODO: Which test to run to verify det44_* messages? - # dhcp_proxy_dump / details # honeycomb - - # vnet/flow/flow.api - flow_add_v2: '0x5b757558' # dev - flow_add_v2_reply: '0x8587dc85' # dev - flow_del: '0xb6b9b02c' # dev - flow_del_reply: '0xe8d4e804' # dev - flow_disable: '0x2024be69' # dev - flow_disable_reply: '0xe8d4e804' # dev - flow_enable: '0x2024be69' # dev - flow_enable_reply: '0xe8d4e804' # dev - - # plugins/geneve/geneve.api - geneve_add_del_tunnel2: '0x8c2a9999' # dev - geneve_add_del_tunnel2_reply: '0x5383d31f' # dev - geneve_tunnel_details: '0x6b16eb24' # dev - geneve_tunnel_dump: '0xf9e6675e' # dev - - # plugins/lisp/lisp-gpe/lisp_gpe.api - gpe_enable_disable: '0xc264d7bf' # dev - gpe_enable_disable_reply: '0xe8d4e804' # dev - - # gre_tunnel_add_del / reply # unused L1 keyword: create_gre_tunnel_interface - - # plugins/gtpu/gtpu.api - gtpu_add_del_tunnel_v2: '0xa0c30713' # perf - gtpu_add_del_tunnel_v2_reply: '0x62b41304' # perf - # ^^ 64B-1c-ethip4gtpusw-ip4base-ndrpdr - # ^ ndrpdrAND1cAND64BANDethip4gtpusw-ip4base - gtpu_offload_rx: '0xf0b08786' # perf - gtpu_offload_rx_reply: '0xe8d4e804' # perf - - # vnet/interface.api - hw_interface_set_mtu: '0xe6746899' # dev - hw_interface_set_mtu_reply: '0xe8d4e804' # dev - - # vnet/classify/classify.api - input_acl_set_interface: '0xde7ad708' # dev - input_acl_set_interface_reply: '0xe8d4e804' # dev - - # vnet/ip/ip.api - ip_address_details: '0xee29b797' # dev - ip_address_dump: '0x2d033de4' # dev - - # vnet/ip-neighbor/ip_neighbor.api - ip_neighbor_add_del: '0x0607c257' # dev - ip_neighbor_add_del_reply: '0x1992deab' # dev - - # ip_probe_neighbor / reply # unused L1 keyword vpp_ip_probe - - # vnet/ip/ip.api - ip_route_add_del: '0xb8ecfe0d' # dev - ip_route_add_del_reply: '0x1992deab' # dev - # ip_source_check_interface_add_del / reply # unused L1 keyword vpp_ip_source_check_setup - ip_table_add_del: '0x0ffdaec0' # dev - ip_table_add_del_reply: '0xe8d4e804' # dev - - # vnet/ipip/ipip.api - ipip_add_tunnel: '0x2ac399f5' # dev - ipip_add_tunnel_reply: '0x5383d31f' # dev - - # vnet/ipsec/ipsec.api - ipsec_interface_add_del_spd: '0x80f80cbb' # dev - ipsec_interface_add_del_spd_reply: '0xe8d4e804' # dev - ipsec_sa_v5_details: '0x3cfecfbd' # dev teardown - ipsec_sa_v5_dump: '0x2076c2f4' # dev teardown - ipsec_sad_entry_add_v2: '0x9611297a' # dev - ipsec_sad_entry_add_v2_reply: '0x9ffac24b' # dev - ipsec_select_backend: '0x5bcfd3b7' # perf - ipsec_select_backend_reply: '0xe8d4e804' # perf - # ^^ 64B-1c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr - # ^ ndrpdrAND1cAND64BANDethip4ipsec1tnlhw-ip4base-int-aes256gcm - ipsec_set_async_mode: '0xa6465f7c' # perf - ipsec_set_async_mode_reply: '0xe8d4e804' # perf - ipsec_spd_add_del: '0x20e89a95' # dev - ipsec_spd_add_del_reply: '0xe8d4e804' # dev - ipsec_spd_entry_add_del_v2: '0x7bfe69fc' # dev - ipsec_spd_entry_add_del_v2_reply: '0x9ffac24b' # dev - ipsec_tunnel_protect_update: '0x30d5f133' # dev - ipsec_tunnel_protect_update_reply: '0xe8d4e804' # dev - # ^^ 64B-1c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr - # ^ See ipsec_select_backend. - - # vnet/l2/l2.api - # l2_fib_table_dump / details # honeycomb - l2_interface_vlan_tag_rewrite: '0x62cc0bbc' # perf - l2_interface_vlan_tag_rewrite_reply: '0xe8d4e804' # perf - # ^^ 64B-1c-dot1ad-l2xcbase-ndrpdr - # ^ ndrpdrAND1cAND64BANDdot1ad-l2xcbase - l2_patch_add_del: '0xa1f6a6f3' # dev - l2_patch_add_del_reply: '0xe8d4e804' # dev - # l2fib_add_del / reply # unused L1 keyword: vpp_add_l2fib_entry - - # plugins/lb/lb.api - lb_add_del_as: '0x35d72500' # perf - lb_add_del_as_reply: '0xe8d4e804' # perf - lb_add_del_intf_nat4: '0x47d6e753' # perf - lb_add_del_intf_nat4_reply: '0xe8d4e804' # perf - lb_add_del_vip_v2: '0x7c520e0f' # perf - lb_add_del_vip_v2_reply: '0xe8d4e804' # perf - lb_conf: '0x56cd3261' # perf - lb_conf_reply: '0xe8d4e804' # perf - # 8x^ 64B-1c-ethip4-loadbalancer-nat4-ndrpdr - # ^ 2n: ndrpdrAND1cAND64BANDethip4-loadbalancer-nat4 - - # plugins/lisp/lisp-cp/lisp.api - lisp_add_del_adjacency: '0x2ce0e6f6' # dev - lisp_add_del_adjacency_reply: '0xe8d4e804' # dev - lisp_add_del_local_eid: '0x4e5a83a2' # dev - lisp_add_del_local_eid_reply: '0xe8d4e804' # dev - lisp_add_del_locator: '0xaf4d8f13' # dev - lisp_add_del_locator_reply: '0xe8d4e804' # dev - lisp_add_del_locator_set: '0x6fcd6471' # dev - lisp_add_del_locator_set_reply: '0xb6666db4' # dev - # lisp_add_del_map_resolver / reply # unused L2 keyword: Configure LISP map resolver address - lisp_add_del_remote_mapping: '0x6d5c789e' # dev - lisp_add_del_remote_mapping_reply: '0xe8d4e804' # dev - lisp_eid_table_add_del_map: '0x9481416b' # dev - lisp_eid_table_add_del_map_reply: '0xe8d4e804' # dev - lisp_enable_disable: '0xc264d7bf' # dev - lisp_enable_disable_reply: '0xe8d4e804' # dev - - # plugins/acl/acl.api - macip_acl_add: '0xce6fbad0' # dev - macip_acl_add_reply: '0xac407b0c' # dev - macip_acl_details: '0x27135b59' # dev teardown - macip_acl_dump: '0xef34fea4' # dev teardown - macip_acl_interface_add_del: '0x4b8690b1' # dev - macip_acl_interface_add_del_reply: '0xe8d4e804' # dev - macip_acl_interface_get: '0x51077d14' # dev teardown - macip_acl_interface_get_reply: '0xaccf9b05' # dev teardown - - # plugins/memif/memif.api - memif_create_v2: '0x8c7de5f7' # dev - memif_create_v2_reply: '0x5383d31f' # dev - memif_details: '0xda34feb9' # dev - memif_dump: '0x51077d14' # dev - memif_socket_filename_add_del_v2: '0x34223bdf' # dev - memif_socket_filename_add_del_v2_reply: '0x9f29bdb9' # dev - - # plugins/nat/nat44-ed/nat44_ed.api - nat44_add_del_address_range: '0x6f2b8055' # dev - nat44_add_del_address_range_reply: '0xe8d4e804' # dev - nat44_address_details: '0x0d1beac1' # dev teardown - nat44_address_dump: '0x51077d14' # dev teardown - nat44_ed_plugin_enable_disable: '0xbe17f8dd' # dev - nat44_ed_plugin_enable_disable_reply: '0xe8d4e804' # dev - nat44_interface_add_del_feature: '0xf3699b83' # dev - nat44_interface_add_del_feature_reply: '0xe8d4e804' # dev - nat44_interface_addr_details: '0xe4aca9ca' # dev teardown - nat44_interface_addr_dump: '0x51077d14' # dev teardown - nat44_interface_details: '0x5d286289' # dev teardown - nat44_interface_dump: '0x51077d14' # dev teardown - nat44_show_running_config: '0x51077d14' # dev teardown - nat44_show_running_config_reply: '0x93d8e267' # dev teardown - nat44_static_mapping_details: '0x06cb40b2' # dev teardown - nat44_static_mapping_dump: '0x51077d14' # dev teardown - # nat44_user_dump and nat44_user_session_dump can be called - # by show_nat_user_data function - nat_worker_details: '0x84bf06fc' # dev teardown - nat_worker_dump: '0x51077d14' # dev teardown - - # plugins/nsim/nsim.api - nsim_configure2: '0x64de8ed3' # perf - nsim_configure2_reply: '0xe8d4e804' # perf - nsim_output_feature_enable_disable: '0x3865946c' # perf - nsim_output_feature_enable_disable_reply: '0xe8d4e804' # perf - # 4x^ 1280B-1c-eth-ip4udpquicscale10cl1s-vppecho-bps - # ^ 1280BAND1cANDeth-ip4udpquicscale10cl1s-vppecho - - # vnet/policer/policer.api - policer_add: '0x4d949e35' # dev - policer_add_reply: '0xa177cef2' # dev - - # vnet/classify/classify.api - policer_classify_set_interface: '0xde7ad708' # dev - policer_classify_set_interface_reply: '0xe8d4e804' # dev - - # plugins/rdma/rdma.api - rdma_create_v4: '0xc6287ea8' # perf - rdma_create_v4_reply: '0x5383d31f' # perf - # 2x^ Any test with drv_rdma. Currently only available on 2n-clx. - # - Not testable by devicetest (until we have environment with right NICs). - - # vlibmemory/vlib.api - show_threads: '0x51077d14' # dev - show_threads_reply: '0xefd78e83' # dev - - # vpp/api/vpe.api - show_version: '0x51077d14' # dev setup - show_version_reply: '0xc919bde1' # dev setup - - # vnet/srv6/sr.api - sr_localsid_add_del: '0x5a36c324' # dev - sr_localsid_add_del_reply: '0xe8d4e804' # dev - sr_localsids_details: '0x2e9221b9' # dev teardown - sr_localsids_dump: '0x51077d14' # dev teardown - sr_policies_v2_details: '0x96dcb699' # dev teardown - sr_policies_v2_dump: '0x51077d14' # dev teardown - sr_policy_add_v2: '0xf6297f36' # dev - sr_policy_add_reply: '0xe8d4e804' # dev but wrong - sr_set_encap_source: '0xd3bad5e1' # dev - sr_set_encap_source_reply: '0xe8d4e804' # dev - sr_steering_add_del: '0xe46b0a0f' # dev - sr_steering_add_del_reply: '0xe8d4e804' # dev - sr_steering_pol_details: '0xd41258c9' # dev teardown - sr_steering_pol_dump: '0x51077d14' # dev teardown - - # vnet/bonding/bond.api - sw_bond_interface_details: '0x9428a69c' # perf - sw_bond_interface_dump: '0xf9e6675e' # perf - # ^^ see bond_* - - # vnet/interface.api - sw_interface_add_del_address: '0x5463d73b' # dev - sw_interface_add_del_address_reply: '0xe8d4e804' # dev - sw_interface_details: '0x6c221fc7' # dev - sw_interface_dump: '0xaa610c27' # dev - # sw_interface_get_table / reply # honeycomb - - # vnet/ip6-nd/ip6_nd.api - sw_interface_ip6nd_ra_config: '0x3eb00b1c' # dev - sw_interface_ip6nd_ra_config_reply: '0xe8d4e804' # dev - - # vnet/interface.api - sw_interface_rx_placement_details: '0x9e44a7ce' # dev - sw_interface_rx_placement_dump: '0xf9e6675e' # dev - sw_interface_set_flags: '0xf5aec1b8' # dev - sw_interface_set_flags_reply: '0xe8d4e804' # dev - - # sw_interface_set_geneve_bypass can be called - # by enable_interface_geneve_bypass function - - # vnet/l2/l2.api - sw_interface_set_l2_bridge: '0xd0678b13' # dev - sw_interface_set_l2_bridge_reply: '0xe8d4e804' # dev - sw_interface_set_l2_xconnect: '0x4fa28a85' # dev - sw_interface_set_l2_xconnect_reply: '0xe8d4e804' # dev - - # vnet/interface.api - sw_interface_set_mac_address: '0xc536e7eb' # dev - sw_interface_set_mac_address_reply: '0xe8d4e804' # dev - sw_interface_set_rx_placement: '0xdb65f3c9' # dev - sw_interface_set_rx_placement_reply: '0xe8d4e804' # dev - sw_interface_set_table: '0xdf42a577' # dev - sw_interface_set_table_reply: '0xe8d4e804' # dev - sw_interface_set_unnumbered: '0x154a6439' # dev - sw_interface_set_unnumbered_reply: '0xe8d4e804' # dev - - # plugins/vxlan/vxlan.api - sw_interface_set_vxlan_bypass: '0x65247409' # dev - sw_interface_set_vxlan_bypass_reply: '0xe8d4e804' # dev - - # vnet/devices/tap/tapv2.api - sw_interface_tap_v2_details: '0x1e2b2a47' # dev - sw_interface_tap_v2_dump: '0xf9e6675e' # dev - - # plugins/vhost/vhost_user.api - sw_interface_vhost_user_details: '0x0cee1e53' # dev teardown - sw_interface_vhost_user_dump: '0xf9e6675e' # dev deardown - - # vnet/bonding/bond.api - sw_member_interface_details: '0x3c4a0e23' # perf - sw_member_interface_dump: '0xf9e6675e' # perf - # ^^ see bond_* - - # vnet/devices/tap/tapv2.api - tap_create_v3: '0x3f3fd1df' # dev - tap_create_v3_reply: '0x5383d31f' # dev - - # plugins/vxlan/vxlan.api - vxlan_add_del_tunnel_v3: '0x0072b037' # dev - vxlan_add_del_tunnel_v3_reply: '0x5383d31f' # dev - # vxlan_gpe_tunnel_dump / details # honeycomb - # vxlan_tunnel_dump /details # unused L2 keyword: Get VXLAN dump - - # plugins/wireguard/wireguard.api - wireguard_interface_create: '0xa530137e' - wireguard_interface_create_reply: '0x5383d31f' - wireguard_peer_add: '0x9b8aad61' - wireguard_peer_add_reply: '0x084a0cd3' - wg_set_async_mode: '0xa6465f7c' - wg_set_async_mode_reply: '0xe8d4e804' - - # Please keep alphabetic order. - -24.02-with-srv6-fix: +# /search?q=24.06&filter=debs&filter=all&dist=debian +24.06-release: # plugins/acl/acl.api acl_add_replace: '0xee5c2f18' # dev acl_add_replace_reply: '0xac407b0c' # dev diff --git a/resources/job_specs/report_coverage/3na-spr/ip4-00.md b/resources/job_specs/report_coverage/3na-spr/ip4-00.md index fd731142ba..62ec293c72 100644 --- a/resources/job_specs/report_coverage/3na-spr/ip4-00.md +++ b/resources/job_specs/report_coverage/3na-spr/ip4-00.md @@ -63,6 +63,16 @@ 1c AND imix AND ndrpdr AND 2p1cx7veat AND drv_mlx5_core AND ethip4-ip4scale20k 2c AND imix AND ndrpdr AND 2p1cx7veat AND drv_mlx5_core AND ethip4-ip4scale20k 4c AND imix AND ndrpdr AND 2p1cx7veat AND drv_mlx5_core AND ethip4-ip4scale20k +##### ethip4-ip4scale60k-rnd +3c AND 64b AND ndrpdr AND 6p3cx7veat AND drv_mlx5_core AND ethip4-ip4scale60k-rnd +6c AND 64b AND ndrpdr AND 6p3cx7veat AND drv_mlx5_core AND ethip4-ip4scale60k-rnd +12c AND 64b AND ndrpdr AND 6p3cx7veat AND drv_mlx5_core AND ethip4-ip4scale60k-rnd +3c AND 1518b AND ndrpdr AND 6p3cx7veat AND drv_mlx5_core AND ethip4-ip4scale60k-rnd +6c AND 1518b AND ndrpdr AND 6p3cx7veat AND drv_mlx5_core AND ethip4-ip4scale60k-rnd +12c AND 1518b AND ndrpdr AND 6p3cx7veat AND drv_mlx5_core AND ethip4-ip4scale60k-rnd +3c AND imix AND ndrpdr AND 6p3cx7veat AND drv_mlx5_core AND ethip4-ip4scale60k-rnd +6c AND imix AND ndrpdr AND 6p3cx7veat AND drv_mlx5_core AND ethip4-ip4scale60k-rnd +12c AND imix AND ndrpdr AND 6p3cx7veat AND drv_mlx5_core AND ethip4-ip4scale60k-rnd ##### ethip4-ip4scale200k 1c AND 64b AND ndrpdr AND 2p1cx7veat AND drv_mlx5_core AND ethip4-ip4scale200k 2c AND 64b AND ndrpdr AND 2p1cx7veat AND drv_mlx5_core AND ethip4-ip4scale200k diff --git a/resources/job_specs/report_iterative/3na-spr/vpp-mrr-00.md b/resources/job_specs/report_iterative/3na-spr/vpp-mrr-00.md index 09fab4fb31..1e785815ef 100644 --- a/resources/job_specs/report_iterative/3na-spr/vpp-mrr-00.md +++ b/resources/job_specs/report_iterative/3na-spr/vpp-mrr-00.md @@ -114,6 +114,12 @@ 3c AND 64b AND mrr AND 6p3cx7veat AND drv_mlx5_core AND ethip4-ip4scale60k-rnd 6c AND 64b AND mrr AND 6p3cx7veat AND drv_mlx5_core AND ethip4-ip4scale60k-rnd 12c AND 64b AND mrr AND 6p3cx7veat AND drv_mlx5_core AND ethip4-ip4scale60k-rnd +3c AND 1518b AND mrr AND 6p3cx7veat AND drv_mlx5_core AND ethip4-ip4scale60k-rnd +6c AND 1518b AND mrr AND 6p3cx7veat AND drv_mlx5_core AND ethip4-ip4scale60k-rnd +12c AND 1518b AND mrr AND 6p3cx7veat AND drv_mlx5_core AND ethip4-ip4scale60k-rnd +3c AND imix AND mrr AND 6p3cx7veat AND drv_mlx5_core AND ethip4-ip4scale60k-rnd +6c AND imix AND mrr AND 6p3cx7veat AND drv_mlx5_core AND ethip4-ip4scale60k-rnd +12c AND imix AND mrr AND 6p3cx7veat AND drv_mlx5_core AND ethip4-ip4scale60k-rnd ##### ethip4-ip4scale200k-rnd 1c AND 64b AND mrr AND 2p1cx7veat AND drv_mlx5_core AND ethip4-ip4scale200k-rnd 2c AND 64b AND mrr AND 2p1cx7veat AND drv_mlx5_core AND ethip4-ip4scale200k-rnd diff --git a/resources/job_specs/report_iterative/3na-spr/vpp-ndrpdr-00.md b/resources/job_specs/report_iterative/3na-spr/vpp-ndrpdr-00.md index 6ad23b0dd2..caf7b2908a 100644 --- a/resources/job_specs/report_iterative/3na-spr/vpp-ndrpdr-00.md +++ b/resources/job_specs/report_iterative/3na-spr/vpp-ndrpdr-00.md @@ -114,6 +114,12 @@ 3c AND 64b AND ndrpdr AND 6p3cx7veat AND drv_mlx5_core AND ethip4-ip4scale60k-rnd 6c AND 64b AND ndrpdr AND 6p3cx7veat AND drv_mlx5_core AND ethip4-ip4scale60k-rnd 12c AND 64b AND ndrpdr AND 6p3cx7veat AND drv_mlx5_core AND ethip4-ip4scale60k-rnd +3c AND 1518b AND ndrpdr AND 6p3cx7veat AND drv_mlx5_core AND ethip4-ip4scale60k-rnd +6c AND 1518b AND ndrpdr AND 6p3cx7veat AND drv_mlx5_core AND ethip4-ip4scale60k-rnd +12c AND 1518b AND ndrpdr AND 6p3cx7veat AND drv_mlx5_core AND ethip4-ip4scale60k-rnd +3c AND imix AND ndrpdr AND 6p3cx7veat AND drv_mlx5_core AND ethip4-ip4scale60k-rnd +6c AND imix AND ndrpdr AND 6p3cx7veat AND drv_mlx5_core AND ethip4-ip4scale60k-rnd +12c AND imix AND ndrpdr AND 6p3cx7veat AND drv_mlx5_core AND ethip4-ip4scale60k-rnd ##### ethip4-ip4scale200k-rnd 1c AND 64b AND ndrpdr AND 2p1cx7veat AND drv_mlx5_core AND ethip4-ip4scale200k-rnd 2c AND 64b AND ndrpdr AND 2p1cx7veat AND drv_mlx5_core AND ethip4-ip4scale200k-rnd diff --git a/resources/job_specs/vpp_device/vpp-1n-alt.md b/resources/job_specs/vpp_device/vpp-1n-alt.md index 9d9c8e5bfb..ddf7fc6f9b 100644 --- a/resources/job_specs/vpp_device/vpp-1n-alt.md +++ b/resources/job_specs/vpp_device/vpp-1n-alt.md @@ -82,7 +82,7 @@ ### intel-x710 #### avf ##### ethip4-ip4base -0c AND 64b AND scapy AND x710 AND drv_avf AND ethip4-ip4base +# 0c AND 64b AND scapy AND x710 AND drv_avf AND ethip4-ip4base ## ./ip4_tunnel/lisp ### mellanox-cx6dx #### mlx5-core @@ -150,7 +150,7 @@ 0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2bdbasemaclrn-oacl1sl #### avf ##### ethip4-l2bdbasemaclrn -0c AND 64b AND scapy AND x710 AND drv_avf AND ethip4-l2bdbasemaclrn +# 0c AND 64b AND scapy AND x710 AND drv_avf AND ethip4-l2bdbasemaclrn ## ./l2patch ### mellanox-cx6dx #### mlx5-core @@ -202,4 +202,4 @@ ### mellanox-cx6dx #### mlx5-core ##### ethip6-ip6base-eth-2vhost-1vm -# 0c AND 78b AND scapy AND cx6dx AND drv_mlx5_core AND ethip6-ip6base-eth-2vhost-1vm
\ No newline at end of file +# 0c AND 78b AND scapy AND cx6dx AND drv_mlx5_core AND ethip6-ip6base-eth-2vhost-1vm diff --git a/resources/job_specs/vpp_device/vpp-1n-skx.md b/resources/job_specs/vpp_device/vpp-1n-skx.md deleted file mode 100644 index 2b025b796c..0000000000 --- a/resources/job_specs/vpp_device/vpp-1n-skx.md +++ /dev/null @@ -1,208 +0,0 @@ -# 1n-skx -## ./container_memif -### intel-x710 -#### dpdk-vfio-pci -##### ethip4-l2xcbase-eth-2memif-1dcr -0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2xcbase-eth-2memif-1dcr -##### ethip4-l2bdbasemaclrn-eth-2memif-1dcr -0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2bdbasemaclrn-eth-2memif-1dcr -##### ethip4-ip4base-eth-2memif-1dcr -0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-ip4base-eth-2memif-1dcr -## ./crypto/ethip4 -### intel-x710 -#### dpdk-vfio-pci -##### ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha -0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha -##### ethip4ipsec11tnlsw-ip4base-int-aes128cbc-hmac512sha -0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4ipsec11tnlsw-ip4base-int-aes128cbc-hmac512sha -##### ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha -0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha -##### ethip4ipsec1tptsw-ip4base-policy-aes128cbc-hmac512sha -0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4ipsec1tptsw-ip4base-policy-aes128cbc-hmac512sha -## ./crypto/ethip6 -### intel-x710 -#### dpdk-vfio-pci -##### ethip6ipsec1tnlsw-ip6base-policy-aes128cbc-hmac512sha -0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6ipsec1tnlsw-ip6base-policy-aes128cbc-hmac512sha -##### ethip6ipsec1tptsw-ip6base-policy-aes128cbc-hmac512sha -0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6ipsec1tptsw-ip6base-policy-aes128cbc-hmac512sha -## ./flow -### intel-e810cq -#### avf -##### ethip4-flow-ip4-ipsec-ah -0c AND 64b AND scapy AND e810cq AND drv_avf AND ethip4-flow-ip4-ipsec-ah -##### ethip4-flow-ip4-ipsec-esp -0c AND 64b AND scapy AND e810cq AND drv_avf AND ethip4-flow-ip4-ipsec-esp -##### ethip4-flow-ip4-l2tpv3oip -0c AND 64b AND scapy AND e810cq AND drv_avf AND ethip4-flow-ip4-l2tpv3oip -##### ethip4-flow-ip4-ntuple-tcp -0c AND 64b AND scapy AND e810cq AND drv_avf AND ethip4-flow-ip4-ntuple-tcp -##### ethip4-flow-ip4-ntuple-udp -0c AND 64b AND scapy AND e810cq AND drv_avf AND ethip4-flow-ip4-ntuple-udp -##### ethip4-flow-ip4-tcp -0c AND 64b AND scapy AND e810cq AND drv_avf AND ethip4-flow-ip4-tcp -##### ethip4-flow-ip4-udp -0c AND 64b AND scapy AND e810cq AND drv_avf AND ethip4-flow-ip4-udp -##### ethip6-flow-ip6-ntuple-tcp -0c AND 64b AND scapy AND e810cq AND drv_avf AND ethip6-flow-ip6-ntuple-tcp -##### ethip6-flow-ip6-ntuple-udp -0c AND 64b AND scapy AND e810cq AND drv_avf AND ethip6-flow-ip6-ntuple-udp -##### ethip6-flow-ip6-tcp -0c AND 64b AND scapy AND e810cq AND drv_avf AND ethip6-flow-ip6-tcp -##### ethip6-flow-ip6-udp -0c AND 64b AND scapy AND e810cq AND drv_avf AND ethip6-flow-ip6-udp -#### dpdk-vfio-pci -##### ethip4-flow-ip4-gtpu -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-flow-ip4-gtpu -##### ethip4-flow-ip4-ipsec-ah -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-flow-ip4-ipsec-ah -##### ethip4-flow-ip4-ipsec-esp -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-flow-ip4-ipsec-esp -##### ethip4-flow-ip4-l2tpv3oip -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-flow-ip4-l2tpv3oip -##### ethip4-flow-ip4-ntuple-tcp -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-flow-ip4-ntuple-tcp -##### ethip4-flow-ip4-ntuple-udp -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-flow-ip4-ntuple-udp -##### ethip4-flow-ip4-tcp -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-flow-ip4-tcp -##### ethip4-flow-ip4-udp -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-flow-ip4-udp -##### ethip6-flow-ip6-ntuple-tcp -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip6-flow-ip6-ntuple-tcp -##### ethip6-flow-ip6-ntuple-udp -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip6-flow-ip6-ntuple-udp -##### ethip6-flow-ip6-tcp -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip6-flow-ip6-tcp -##### ethip6-flow-ip6-udp -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip6-flow-ip6-udp -## ./interfaces -### intel-x710 -#### dpdk-vfio-pci -##### ethicmp4-ip4base-eth-1tap -0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethicmp4-ip4base-eth-1tap -##### ethicmp4-ip4base-eth-1tap-namespace -0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethicmp4-ip4base-eth-1tap-namespace -##### ethip4-l2bdbasemaclrn-eth-2tap -0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2bdbasemaclrn-eth-2tap -## ./ip4 -### intel-x710 -#### dpdk-vfio-pci -##### ethip4-ip4base-adlalwlistbase -0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-ip4base-adlalwlistbase -##### ethip4-ip4base-adlblklistbase -0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-ip4base-adlblklistbase -##### ethip4-ip4base -0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-ip4base -##### ethip4-ip4base-iacldstbase -0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-ip4base-iacldstbase -##### ethip4-ip4base-ipolicemarkbase -0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-ip4base-ipolicemarkbase -##### ethip4tcp-nat44det -0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4tcp-nat44det -##### ethip4tcp-nat44ed -0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4tcp-nat44ed -##### ethip4udp-nat44det -0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4udp-nat44det -##### ethip4udp-nat44ed -0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4udp-nat44ed -## ./ip4_tunnel/lisp -### intel-x710 -#### dpdk-vfio-pci -##### ethip4lisp-ip4base -0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4lisp-ip4base -##### ethip4lispgpe-ip4base -0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4lispgpe-ip4base -##### ethip4lispgpe-ip6base -0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4lispgpe-ip6base -## ./ip4_tunnel -### intel-x710 -#### dpdk-vfio-pci -##### ethip4--ethip4udpgeneve-1tun-ip4base -0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4--ethip4udpgeneve-1tun-ip4base -##### ethip4vxlan-l2bdbasemaclrn -0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4vxlan-l2bdbasemaclrn -##### ethip4vxlan-l2xcbase -0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4vxlan-l2xcbase -## ./ip6 -### intel-x710 -#### dpdk-vfio-pci -##### ethip6-ip6base-adlalwlistbase -0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6-ip6base-adlalwlistbase -##### ethip6-ip6base-adlblklistbase -0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6-ip6base-adlblklistbase -##### ethip6-ip6base-iacldstbase -0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6-ip6base-iacldstbase -##### ethip6-ip6base-ipolicemarkbase -0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6-ip6base-ipolicemarkbase -##### ethip6-ip6base -0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6-ip6base -## ./ip6_tunnels/lisp -### intel-x710 -#### dpdk-vfio-pci -##### ethip6lispgpe-ip4base -0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6lispgpe-ip4base -##### ethip6lispgpe-ip6base -0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6lispgpe-ip6base -## ./l2bd -### intel-x710 -#### avf -##### ethip4-l2bdbasemaclrn -0c AND 64b AND scapy AND x710 AND drv_avf AND ethip4-l2bdbasemaclrn -#### dpdk-vfio-pci -##### ethip4-l2bdbasemaclrn -0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2bdbasemaclrn -##### ethip4-l2bdbasemaclrn-iacl1sf -0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2bdbasemaclrn-iacl1sf -##### ethip4-l2bdbasemaclrn-iacl1sl -0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2bdbasemaclrn-iacl1sl -##### ethip4-l2bdbasemaclrn-macip-iacl1sl -0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2bdbasemaclrn-macip-iacl1sl -##### ethip4-l2bdbasemaclrn-oacl1sf -0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2bdbasemaclrn-oacl1sf -##### ethip4-l2bdbasemaclrn-oacl1sl -0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2bdbasemaclrn-oacl1sl -## ./l2patch -### intel-x710 -#### dpdk-vfio-pci -##### ethip4-l2patch -0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2patch -## ./l2xc -### intel-x710 -#### dpdk-vfio-pci -##### ethip4-l2xcbase -0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2xcbase -## ./srv6 -### intel-x710 -#### dpdk-vfio-pci -##### ethip6ip6-ip6base-srv6enc1sid -0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6ip6-ip6base-srv6enc1sid -##### ethip6srhip6-ip6base-srv6enc2sids -0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6srhip6-ip6base-srv6enc2sids -##### ethip6srhip6-ip6base-srv6enc2sids-nodecaps -0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6srhip6-ip6base-srv6enc2sids-nodecaps -##### ethip6srhip6-ip6base-srv6proxy-dyn -0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6srhip6-ip6base-srv6proxy-dyn -##### ethip6srhip6-ip6base-srv6proxy-masq -0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6srhip6-ip6base-srv6proxy-masq -##### ethip6srhip6-ip6base-srv6proxy-stat -0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6srhip6-ip6base-srv6proxy-stat -## ./stats -### intel-x710 -#### dpdk-vfio-pci -##### ethip4-l2xcbase-stats -0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2xcbase-stats -## ./vm/ethip4 -### intel-x710 -#### dpdk-vfio-pci -##### ethip4-ip4base-eth-2vhost-1vm -# 0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-ip4base-eth-2vhost-1vm -##### ethip4-l2bdbasemaclrn-eth-2vhost-1vm -# 0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2bdbasemaclrn-eth-2vhost-1vm -##### ethip4-l2xcbase-eth-2vhost-1vm -# 0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2xcbase-eth-2vhost-1vm -## ./vm/ethip6 -### intel-x710 -#### dpdk-vfio-pci -##### ethip6-ip6base-eth-2vhost-1vm -# 0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6-ip6base-eth-2vhost-1vm diff --git a/resources/job_specs/vpp_device/vpp-1n-spr.md b/resources/job_specs/vpp_device/vpp-1n-spr.md index d5ab8d7ae3..72391b07c8 100644 --- a/resources/job_specs/vpp_device/vpp-1n-spr.md +++ b/resources/job_specs/vpp_device/vpp-1n-spr.md @@ -1,151 +1,151 @@ # 1n-spr ## ./container_memif -### intel-e810cq +### intel-x710 #### dpdk-vfio-pci ##### ethip4-l2xcbase-eth-2memif-1dcr 0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2xcbase-eth-2memif-1dcr ##### ethip4-l2bdbasemaclrn-eth-2memif-1dcr 0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2bdbasemaclrn-eth-2memif-1dcr ##### ethip4-ip4base-eth-2memif-1dcr -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-ip4base-eth-2memif-1dcr +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-ip4base-eth-2memif-1dcr ## ./crypto/ethip4 -### intel-e810cq +### intel-x710 #### dpdk-vfio-pci ##### ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha ##### ethip4ipsec11tnlsw-ip4base-int-aes128cbc-hmac512sha -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4ipsec11tnlsw-ip4base-int-aes128cbc-hmac512sha +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4ipsec11tnlsw-ip4base-int-aes128cbc-hmac512sha ##### ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha ##### ethip4ipsec1tptsw-ip4base-policy-aes128cbc-hmac512sha -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4ipsec1tptsw-ip4base-policy-aes128cbc-hmac512sha +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4ipsec1tptsw-ip4base-policy-aes128cbc-hmac512sha ## ./crypto/ethip6 ### intel-e810 #### dpdk-vfio-pci ##### ethip6ipsec1tnlsw-ip6base-policy-aes128cbc-hmac512sha -0c AND 78b AND scapy AND e810cq AND drv_vfio_pci AND ethip6ipsec1tnlsw-ip6base-policy-aes128cbc-hmac512sha +0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6ipsec1tnlsw-ip6base-policy-aes128cbc-hmac512sha ##### ethip6ipsec1tptsw-ip6base-policy-aes128cbc-hmac512sha -0c AND 78b AND scapy AND e810cq AND drv_vfio_pci AND ethip6ipsec1tptsw-ip6base-policy-aes128cbc-hmac512sha +0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6ipsec1tptsw-ip6base-policy-aes128cbc-hmac512sha ## ./flow -### intel-e810cq +### intel-x710 #### avf ##### ethip4-flow-ip4-ipsec-ah -# 0c AND 64b AND scapy AND e810cq AND drv_avf AND ethip4-flow-ip4-ipsec-ah +# 0c AND 64b AND scapy AND x710 AND drv_avf AND ethip4-flow-ip4-ipsec-ah ##### ethip4-flow-ip4-ipsec-esp -# 0c AND 64b AND scapy AND e810cq AND drv_avf AND ethip4-flow-ip4-ipsec-esp +# 0c AND 64b AND scapy AND x710 AND drv_avf AND ethip4-flow-ip4-ipsec-esp ##### ethip4-flow-ip4-l2tpv3oip -# 0c AND 64b AND scapy AND e810cq AND drv_avf AND ethip4-flow-ip4-l2tpv3oip +# 0c AND 64b AND scapy AND x710 AND drv_avf AND ethip4-flow-ip4-l2tpv3oip ##### ethip4-flow-ip4-ntuple-tcp -# 0c AND 64b AND scapy AND e810cq AND drv_avf AND ethip4-flow-ip4-ntuple-tcp +# 0c AND 64b AND scapy AND x710 AND drv_avf AND ethip4-flow-ip4-ntuple-tcp ##### ethip4-flow-ip4-ntuple-udp -# 0c AND 64b AND scapy AND e810cq AND drv_avf AND ethip4-flow-ip4-ntuple-udp +# 0c AND 64b AND scapy AND x710 AND drv_avf AND ethip4-flow-ip4-ntuple-udp ##### ethip4-flow-ip4-tcp -# 0c AND 64b AND scapy AND e810cq AND drv_avf AND ethip4-flow-ip4-tcp +# 0c AND 64b AND scapy AND x710 AND drv_avf AND ethip4-flow-ip4-tcp ##### ethip4-flow-ip4-udp -# 0c AND 64b AND scapy AND e810cq AND drv_avf AND ethip4-flow-ip4-udp +# 0c AND 64b AND scapy AND x710 AND drv_avf AND ethip4-flow-ip4-udp ##### ethip6-flow-ip6-ntuple-tcp -# 0c AND 64b AND scapy AND e810cq AND drv_avf AND ethip6-flow-ip6-ntuple-tcp +# 0c AND 64b AND scapy AND x710 AND drv_avf AND ethip6-flow-ip6-ntuple-tcp ##### ethip6-flow-ip6-ntuple-udp -# k0c AND 64b AND scapy AND e810cq AND drv_avf AND ethip6-flow-ip6-ntuple-udp +# k0c AND 64b AND scapy AND x710 AND drv_avf AND ethip6-flow-ip6-ntuple-udp ##### ethip6-flow-ip6-tcp -# 0c AND 64b AND scapy AND e810cq AND drv_avf AND ethip6-flow-ip6-tcp +# 0c AND 64b AND scapy AND x710 AND drv_avf AND ethip6-flow-ip6-tcp ##### ethip6-flow-ip6-udp -# 0c AND 64b AND scapy AND e810cq AND drv_avf AND ethip6-flow-ip6-udp +# 0c AND 64b AND scapy AND x710 AND drv_avf AND ethip6-flow-ip6-udp #### dpdk-vfio-pci ##### ethip4-flow-ip4-gtpu -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-flow-ip4-gtpu +# 0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-flow-ip4-gtpu ##### ethip4-flow-ip4-ipsec-ah -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-flow-ip4-ipsec-ah +# 0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-flow-ip4-ipsec-ah ##### ethip4-flow-ip4-ipsec-esp -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-flow-ip4-ipsec-esp +# 0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-flow-ip4-ipsec-esp ##### ethip4-flow-ip4-l2tpv3oip -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-flow-ip4-l2tpv3oip +# 0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-flow-ip4-l2tpv3oip ##### ethip4-flow-ip4-ntuple-tcp -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-flow-ip4-ntuple-tcp +# 0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-flow-ip4-ntuple-tcp ##### ethip4-flow-ip4-ntuple-udp -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-flow-ip4-ntuple-udp +# 0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-flow-ip4-ntuple-udp ##### ethip4-flow-ip4-tcp -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-flow-ip4-tcp +# 0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-flow-ip4-tcp ##### ethip4-flow-ip4-udp -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-flow-ip4-udp +# 0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-flow-ip4-udp ##### ethip6-flow-ip6-ntuple-tcp -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip6-flow-ip6-ntuple-tcp +# 0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip6-flow-ip6-ntuple-tcp ##### ethip6-flow-ip6-ntuple-udp -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip6-flow-ip6-ntuple-udp +# 0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip6-flow-ip6-ntuple-udp ##### ethip6-flow-ip6-tcp -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip6-flow-ip6-tcp +# 0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip6-flow-ip6-tcp ##### ethip6-flow-ip6-udp -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip6-flow-ip6-udp +# 0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip6-flow-ip6-udp ## ./interfaces -### intel-e810cq +### intel-x710 #### dpdk-vfio-pci ##### ethicmp4-ip4base-eth-1tap -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethicmp4-ip4base-eth-1tap +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethicmp4-ip4base-eth-1tap ##### ethicmp4-ip4base-eth-1tap-namespace -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethicmp4-ip4base-eth-1tap-namespace +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethicmp4-ip4base-eth-1tap-namespace ##### ethip4-l2bdbasemaclrn-eth-2tap 0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2bdbasemaclrn-eth-2tap ## ./ip4 -### intel-e810cq +### intel-x710 #### dpdk-vfio-pci ##### ethip4-ip4base-adlalwlistbase -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-ip4base-adlalwlistbase +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-ip4base-adlalwlistbase ##### ethip4-ip4base-adlblklistbase -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-ip4base-adlblklistbase +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-ip4base-adlblklistbase ##### ethip4-ip4base -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-ip4base +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-ip4base ##### ethip4-ip4base-iacldstbase -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-ip4base-iacldstbase +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-ip4base-iacldstbase ##### ethip4-ip4base-ipolicemarkbase -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-ip4base-ipolicemarkbase +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-ip4base-ipolicemarkbase ##### ethip4tcp-nat44det -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4tcp-nat44det +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4tcp-nat44det ##### ethip4tcp-nat44ed -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4tcp-nat44ed +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4tcp-nat44ed ##### ethip4udp-nat44det -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4udp-nat44det +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4udp-nat44det ##### ethip4udp-nat44ed -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4udp-nat44ed +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4udp-nat44ed ## ./ip4_tunnel/lisp -### intel-e810cq +### intel-x710 #### dpdk-vfio-pci ##### ethip4lisp-ip4base -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4lisp-ip4base +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4lisp-ip4base ##### ethip4lispgpe-ip4base -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4lispgpe-ip4base +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4lispgpe-ip4base ##### ethip4lispgpe-ip6base -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4lispgpe-ip6base +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4lispgpe-ip6base ## ./ip4_tunnel -### intel-e810cq +### intel-x710 #### dpdk-vfio-pci ##### ethip4--ethip4udpgeneve-1tun-ip4base -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4--ethip4udpgeneve-1tun-ip4base +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4--ethip4udpgeneve-1tun-ip4base ##### ethip4vxlan-l2bdbasemaclrn 0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4vxlan-l2bdbasemaclrn ##### ethip4vxlan-l2xcbase 0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4vxlan-l2xcbase ## ./ip6 -### intel-e810cq +### intel-x710 #### dpdk-vfio-pci ##### ethip6-ip6base-adlalwlistbase -0c AND 78b AND scapy AND e810cq AND drv_vfio_pci AND ethip6-ip6base-adlalwlistbase +0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6-ip6base-adlalwlistbase ##### ethip6-ip6base-adlblklistbase -0c AND 78b AND scapy AND e810cq AND drv_vfio_pci AND ethip6-ip6base-adlblklistbase +0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6-ip6base-adlblklistbase ##### ethip6-ip6base-iacldstbase -0c AND 78b AND scapy AND e810cq AND drv_vfio_pci AND ethip6-ip6base-iacldstbase +0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6-ip6base-iacldstbase ##### ethip6-ip6base-ipolicemarkbase -0c AND 78b AND scapy AND e810cq AND drv_vfio_pci AND ethip6-ip6base-ipolicemarkbase +0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6-ip6base-ipolicemarkbase ##### ethip6-ip6base -0c AND 78b AND scapy AND e810cq AND drv_vfio_pci AND ethip6-ip6base +0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6-ip6base ## ./ip6_tunnels/lisp -### intel-e810cq +### intel-x710 #### dpdk-vfio-pci ##### ethip6lispgpe-ip4base -0c AND 78b AND scapy AND e810cq AND drv_vfio_pci AND ethip6lispgpe-ip4base +0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6lispgpe-ip4base ##### ethip6lispgpe-ip6base -0c AND 78b AND scapy AND e810cq AND drv_vfio_pci AND ethip6lispgpe-ip6base +0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6lispgpe-ip6base ## ./l2bd -### intel-e810cq +### intel-x710 #### avf ##### ethip4-l2bdbasemaclrn 0c AND 64b AND scapy AND x710 AND drv_avf AND ethip4-l2bdbasemaclrn @@ -163,46 +163,46 @@ ##### ethip4-l2bdbasemaclrn-oacl1sl 0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2bdbasemaclrn-oacl1sl ## ./l2patch -### intel-e810cq +### intel-x710 #### dpdk-vfio-pci ##### ethip4-l2patch 0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2patch ## ./l2xc -### intel-e810cq +### intel-x710 #### dpdk-vfio-pci ##### ethip4-l2xcbase 0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2xcbase ## ./srv6 -### intel-e810cq +### intel-x710 #### dpdk-vfio-pci ##### ethip6ip6-ip6base-srv6enc1sid -0c AND 78b AND scapy AND e810cq AND drv_vfio_pci AND ethip6ip6-ip6base-srv6enc1sid +0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6ip6-ip6base-srv6enc1sid ##### ethip6srhip6-ip6base-srv6enc2sids -0c AND 78b AND scapy AND e810cq AND drv_vfio_pci AND ethip6srhip6-ip6base-srv6enc2sids +0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6srhip6-ip6base-srv6enc2sids ##### ethip6srhip6-ip6base-srv6enc2sids-nodecaps -0c AND 78b AND scapy AND e810cq AND drv_vfio_pci AND ethip6srhip6-ip6base-srv6enc2sids-nodecaps +0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6srhip6-ip6base-srv6enc2sids-nodecaps ##### ethip6srhip6-ip6base-srv6proxy-dyn -0c AND 78b AND scapy AND e810cq AND drv_vfio_pci AND ethip6srhip6-ip6base-srv6proxy-dyn +0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6srhip6-ip6base-srv6proxy-dyn ##### ethip6srhip6-ip6base-srv6proxy-masq -0c AND 78b AND scapy AND e810cq AND drv_vfio_pci AND ethip6srhip6-ip6base-srv6proxy-masq +0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6srhip6-ip6base-srv6proxy-masq ##### ethip6srhip6-ip6base-srv6proxy-stat -0c AND 78b AND scapy AND e810cq AND drv_vfio_pci AND ethip6srhip6-ip6base-srv6proxy-stat +0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6srhip6-ip6base-srv6proxy-stat ## ./stats -### intel-e810cq +### intel-x710 #### dpdk-vfio-pci ##### ethip4-l2xcbase-stats 0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2xcbase-stats ## ./vm/ethip4 -### intel-e810cq +### intel-x710 #### dpdk-vfio-pci ##### ethip4-ip4base-eth-2vhost-1vm -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-ip4base-eth-2vhost-1vm +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-ip4base-eth-2vhost-1vm ##### ethip4-l2bdbasemaclrn-eth-2vhost-1vm -# 0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-l2bdbasemaclrn-eth-2vhost-1vm +# 0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2bdbasemaclrn-eth-2vhost-1vm ##### ethip4-l2xcbase-eth-2vhost-1vm -# 0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-l2xcbase-eth-2vhost-1vm +# 0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2xcbase-eth-2vhost-1vm ## ./vm/ethip6 -### intel-e810cq +### intel-x710 #### dpdk-vfio-pci ##### ethip6-ip6base-eth-2vhost-1vm -# 0c AND 78b AND scapy AND e810cq AND drv_vfio_pci AND ethip6-ip6base-eth-2vhost-1vm +# 0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6-ip6base-eth-2vhost-1vm diff --git a/resources/libraries/bash/function/ansible.sh b/resources/libraries/bash/function/ansible.sh index 6cf4d16f43..587c59cba7 100644 --- a/resources/libraries/bash/function/ansible.sh +++ b/resources/libraries/bash/function/ansible.sh @@ -27,11 +27,17 @@ function ansible_adhoc () { set -exuo pipefail - case "$FLAVOR" in - "aws" | "c6in" | "c6gn" | "c7gn") + case "${TEST_CODE}" in + *"1n-aws" | *"2n-aws" | *"3n-aws") INVENTORY_PATH="cloud_inventory" ;; - "x-"*) + *"2n-c7gn" | *"3n-c7gn") + INVENTORY_PATH="cloud_inventory" + ;; + *"1n-c6in" | *"2n-c6in" | *"3n-c6in") + INVENTORY_PATH="cloud_inventory" + ;; + *"-x-2n"* | *"-x-3n"*) INVENTORY_PATH="external_inventory" ;; *) @@ -72,11 +78,17 @@ function ansible_playbook () { set -exuo pipefail - case "$FLAVOR" in - "aws" | "c6in" | "c6gn" | "c7gn") + case "${TEST_CODE}" in + *"1n-aws" | *"2n-aws" | *"3n-aws") + INVENTORY_PATH="cloud_inventory" + ;; + *"2n-c7gn" | *"3n-c7gn") + INVENTORY_PATH="cloud_inventory" + ;; + *"1n-c6in" | *"2n-c6in" | *"3n-c6in") INVENTORY_PATH="cloud_inventory" ;; - "x-"*) + *"-x-2n"* | *"-x-3n"*) INVENTORY_PATH="external_inventory" ;; *) diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh index 8a46fc329d..1226211ddd 100644 --- a/resources/libraries/bash/function/common.sh +++ b/resources/libraries/bash/function/common.sh @@ -17,11 +17,6 @@ set -exuo pipefail # This library defines functions used by multiple entry scripts. # Keep functions ordered alphabetically, please. -# TODO: Add a link to bash style guide. -# TODO: Consider putting every die into a {} block, -# the code might become more readable (but longer). - - function activate_docker_topology () { # Create virtual vpp-device topology. Output of the function is topology @@ -536,13 +531,15 @@ function get_test_code () { NODENESS="3n" FLAVOR="alt" ;; - *"2n-x-"*) - NODENESS="2n" - FLAVOR="${TEST_CODE#*2n-}" + *"-x-2n"*) + TESTBED="${TEST_CODE#${TEST_CODE%2n*}}" + NODENESS="${TESTBED%-${TEST_CODE#*-x-2n*-}}" + FLAVOR="${TEST_CODE#*-x-2n*-}" ;; - *"3n-x-"*) - NODENESS="3n" - FLAVOR="${TEST_CODE#*3n-}" + *"-x-3n"*) + TESTBED="${TEST_CODE#${TEST_CODE%3n*}}" + NODENESS="${TESTBED%-${TEST_CODE#*-x-3n*-}}" + FLAVOR="${TEST_CODE#*-x-3n*-}" ;; esac } @@ -982,7 +979,7 @@ function select_tags () { *"1n-c6in" | *"2n-c6in" | *"3n-c6in") default_nic="nic_amazon-nitro-200g" ;; - *"2n-x-"* | *"3n-x-"*) + *"-x-2n"* | *"-x-3n"*) default_nic="nic_intel-e810cq" ;; *) @@ -1148,7 +1145,7 @@ function select_tags () { *"1n-c6in" | *"2n-c6in" | *"3n-c6in") test_tag_array+=("!ipsechw") ;; - *"2n-x-"* | *"3n-x-"*) + *"-x-2n"* | *"-x-3n"*) ;; esac @@ -1210,103 +1207,102 @@ function select_topology () { set -exuo pipefail - case_text="${NODENESS}_${FLAVOR}" - case "${case_text}" in - "1n_aws") + case "${TEST_CODE}" in + *"1n-aws") TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*1n-aws*.yaml ) TOPOLOGIES_TAGS="1_node_single_link_topo" ;; - "1n_c6in") + *"1n-c6in") TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*1n-c6in*.yaml ) TOPOLOGIES_TAGS="1_node_single_link_topo" ;; - "1n_alt" | "1n_spr") + *"1n-alt" | *"1n-spr") TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*vpp_device*.template ) TOPOLOGIES_TAGS="2_node_single_link_topo" ;; - "1n_vbox") + *"1n-vbox") TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*vpp_device*.template ) TOPOLOGIES_TAGS="2_node_single_link_topo" ;; - "2n_aws") + *"2n-aws") TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n-aws*.yaml ) TOPOLOGIES_TAGS="2_node_single_link_topo" ;; - "2n_c7gn") + *"2n-c7gn") TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n-c7gn*.yaml ) TOPOLOGIES_TAGS="2_node_single_link_topo" ;; - "2n_c6in") + *"2n-c6in") TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n-c6in*.yaml ) TOPOLOGIES_TAGS="2_node_single_link_topo" ;; - "2n_clx") + *"2n-clx") TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_clx_*.yaml ) TOPOLOGIES_TAGS="2_node_*_link_topo" ;; - "2n_icx") + *"2n-icx") TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_icx_*.yaml ) TOPOLOGIES_TAGS="2_node_*_link_topo" ;; - "2n_spr") + *"2n-spr") TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_spr_*.yaml ) TOPOLOGIES_TAGS="2_node_*_link_topo" ;; - "2n_tx2") + *"2n-tx2") TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_tx2_*.yaml ) TOPOLOGIES_TAGS="2_node_single_link_topo" ;; - "2n_zn2") + *"2n-zn2") TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_zn2_*.yaml ) TOPOLOGIES_TAGS="2_node_*_link_topo" ;; - "3n_alt") + *"3n-alt") TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_alt_*.yaml ) TOPOLOGIES_TAGS="3_node_single_link_topo" ;; - "3n_aws") + *"3n-aws") TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n-aws*.yaml ) TOPOLOGIES_TAGS="3_node_single_link_topo" ;; - "3n_c7gn") + *"3n-c7gn") TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n-c7gn*.yaml ) TOPOLOGIES_TAGS="3_node_single_link_topo" ;; - "3n_c6in") + *"3n-c6in") TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n-c6in*.yaml ) TOPOLOGIES_TAGS="3_node_single_link_topo" ;; - "3n_icx") + *"3n-icx") TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_icx_*.yaml ) # Trailing underscore is needed to distinguish from 3n_icxd. TOPOLOGIES_TAGS="3_node_*_link_topo" ;; - "3n_icxd") + *"3n-icxd") TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_icxd_*.yaml ) TOPOLOGIES_TAGS="3_node_single_link_topo" ;; - "3n_snr") + *"3n-snr") TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_snr_*.yaml ) TOPOLOGIES_TAGS="3_node_single_link_topo" ;; - "3n_tsh") + *"3n-tsh") TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_tsh_*.yaml ) TOPOLOGIES_TAGS="3_node_single_link_topo" ;; - "3na_spr") + *"3na-spr") TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3na_spr_*.yaml ) TOPOLOGIES_TAGS="3_node_*_link_topo" ;; - "3nb_spr") + *"3nb-spr") TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3nb_spr_*.yaml ) TOPOLOGIES_TAGS="3_node_*_link_topo" ;; - "2n_x"*) - TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_"${FLAVOR}"*.yaml ) + *"-x-2n"*) + TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*_x_"${NODENESS}_${FLAVOR}"*.yaml ) TOPOLOGIES_TAGS="2_node_single_link_topo" ;; - "3n_x"*) - TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_"${FLAVOR}"*.yaml ) + *"-x-3n"*) + TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*_x_"${NODENESS}_${FLAVOR}"*.yaml ) TOPOLOGIES_TAGS="3_node_single_link_topo" ;; *) @@ -1362,7 +1358,7 @@ function set_environment_variables () { # Maciek's workaround for Zen2 with lower amount of cores. export TREX_CORE_COUNT=14 ;; - *"2n-x-"* | *"3n-x-"* ) + *"-x-2n"* | *"-x-3n"* ) export TREX_CORE_COUNT=6 export TREX_PORT_MTU=9000 ;; diff --git a/resources/libraries/bash/function/device.sh b/resources/libraries/bash/function/device.sh index a0ba5a67a9..7a6f5aaa13 100644 --- a/resources/libraries/bash/function/device.sh +++ b/resources/libraries/bash/function/device.sh @@ -332,8 +332,8 @@ function get_available_interfaces () { # Add Intel Corporation E810 Virtual Function to the # whitelist. pci_id="0x154c\|0x1889" - tg_netdev=(enp42s0 ens5) - dut1_netdev=(enp61s0 ens7) + tg_netdev=(ens2 ens5) + dut1_netdev=(ens4 ens7) ports_per_nic=2 ;; "1n_vbox") diff --git a/resources/libraries/bash/function/gather.sh b/resources/libraries/bash/function/gather.sh index e432777e32..a5820a5a61 100644 --- a/resources/libraries/bash/function/gather.sh +++ b/resources/libraries/bash/function/gather.sh @@ -1,5 +1,5 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. -# Copyright (c) 2023 PANTHEON.tech and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. +# Copyright (c) 2024 PANTHEON.tech and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -19,14 +19,12 @@ set -exuo pipefail # Keep functions ordered alphabetically, please. -# TODO: Add a link to bash style guide. - - function gather_build () { # Variables read: # - TEST_CODE - String affecting test selection, usually jenkins job name. # - DOWNLOAD_DIR - Path to directory robot takes the build to test from. + # - BASH_FUNCTION_DIR = Path to Bash script directory. # Variables set: # - DUT - CSIT test/ subdirectory containing suites to execute. # Directories updated: @@ -38,27 +36,23 @@ function gather_build () { # Multiple other side effects are possible, # see functions called from here for their current description. - # TODO: Separate DUT-from-TEST_CODE from gather-for-DUT, - # when the first one becomes relevant for per_patch. - set -exuo pipefail pushd "${DOWNLOAD_DIR}" || die "Pushd failed." case "${TEST_CODE}" in - *"hc2vpp"*) - DUT="hc2vpp" - # FIXME: Avoid failing on empty ${DOWNLOAD_DIR}. - ;; *"vpp"*) DUT="vpp" + source "${BASH_FUNCTION_DIR}/gather_${DUT}.sh" || die "Source fail." gather_vpp || die "The function should have died on error." ;; *"dpdk"*) DUT="dpdk" + source "${BASH_FUNCTION_DIR}/gather_${DUT}.sh" || die "Source fail." gather_dpdk || die "The function should have died on error." ;; *"trex"*) DUT="trex" + source "${BASH_FUNCTION_DIR}/gather_${DUT}.sh" || die "Source fail." gather_trex || die "The function should have died on error." ;; *) @@ -67,121 +61,3 @@ function gather_build () { esac popd || die "Popd failed." } - - -function gather_dpdk () { - - # Ensure latest DPDK archive is downloaded. - # - # Variables read: - # - TEST_CODE - The test selection string from environment or argument. - # Hardcoded: - # - dpdk archive name to download if TEST_CODE is not time based. - # Directories updated: - # - ./ - Assumed ${DOWNLOAD_DIR}, dpdk-*.tar.xz is downloaded if not there. - # Functions called: - # - die - Print to stderr and exit, defined in common.sh - - set -exuo pipefail - - dpdk_repo="https://fast.dpdk.org/rel" - # Use downloaded packages with specific version - if [[ "${TEST_CODE}" == *"daily"* ]] || \ - [[ "${TEST_CODE}" == *"weekly"* ]] || \ - [[ "${TEST_CODE}" == *"timed"* ]]; - then - echo "Downloading latest DPDK packages from repo..." - # URL is not in quotes, calling command from variable keeps them. - wget_command=("wget" "--no-check-certificate" "--compression=auto") - wget_command+=("-nv" "-O" "-") - wget_command+=("${dpdk_repo}") - dpdk_stable_ver="$("${wget_command[@]}" | grep -v "2015"\ - | grep -Eo 'dpdk-[^\"]+xz' | tail -1)" || { - die "Composite piped command failed." - } - else - echo "Downloading DPDK package of specific version from repo ..." - # Downloading DPDK version based on what VPP is using. Currently - # it is not easy way to detect from VPP version automatically. - dpdk_stable_ver="$(< "${CSIT_DIR}/DPDK_VPP_VER")".tar.xz || { - die "Failed to read DPDK VPP version!" - } - fi - # TODO: Use "wget -N" instead checking for file presence? - if [[ ! -f "${dpdk_stable_ver}" ]]; then - wget -nv --no-check-certificate "${dpdk_repo}/${dpdk_stable_ver}" || { - die "Failed to get DPDK package from: ${dpdk_repo}" - } - fi -} - -function gather_trex () { - - # This function is required to bypass download dir check. - # Currently it creates empty file in download dir. - # TODO: Add required packages - - set -exuo pipefail - - touch trex-download-to-be-added.txt -} - -function gather_vpp () { - - # Variables read: - # - BASH_FUNCTION_DIR - Bash directory with functions. - # - TEST_CODE - The test selection string from environment or argument. - # - DOWNLOAD_DIR - Path to directory robot takes the build to test from. - # - CSIT_DIR - Path to existing root of local CSIT git repository. - # Variables set: - # - VPP_VERSION - VPP stable version under test. - # Files read: - # - ${CSIT_DIR}/DPDK_STABLE_VER - DPDK version to use - # by csit-vpp not-timed jobs. - # - ${CSIT_DIR}/${VPP_VER_FILE} - Ubuntu VPP version to use. - # - ../*vpp*.deb|rpm - Relative to ${DOWNLOAD_DIR}, - # copied for vpp-csit jobs. - # Directories updated: - # - ${DOWNLOAD_DIR}, vpp-*.deb files are copied here for vpp-csit jobs. - # - ./ - Assumed ${DOWNLOAD_DIR}, *vpp*.deb|rpm files - # are downloaded here for csit-vpp. - # Functions called: - # - die - Print to stderr and exit, defined in common_functions.sh - # Bash scripts executed: - # - ${CSIT_DIR}/resources/tools/scripts/download_install_vpp_pkgs.sh - # - Should download and extract requested files to ./. - - set -exuo pipefail - - case "${TEST_CODE}" in - "csit-"*) - # Use downloaded packages with specific version. - if [[ "${TEST_CODE}" == *"daily"* ]] || \ - { [[ "${TEST_CODE}" == *"weekly"* ]] && \ - [[ "${TEST_CODE}" != *"device"* ]]; } || \ - [[ "${TEST_CODE}" == *"semiweekly"* ]] || \ - [[ "${TEST_CODE}" == *"hourly"* ]]; - then - warn "Downloading latest VPP packages from Packagecloud." - else - warn "Downloading stable VPP packages from Packagecloud." - VPP_VERSION="$(<"${CSIT_DIR}/${VPP_VER_FILE}")" || { - die "Read VPP stable version failed." - } - fi - source "${BASH_FUNCTION_DIR}/artifacts.sh" || die "Source failed." - download_artifacts || die - ;; - "vpp-csit-"*) - # Shorten line. - pkgs="${PKG_SUFFIX}" - # Use locally built packages. - mv "${DOWNLOAD_DIR}"/../*vpp*."${pkgs}" "${DOWNLOAD_DIR}"/ || { - die "Move command failed." - } - ;; - *) - die "Unable to identify job type from: ${TEST_CODE}" - ;; - esac -} diff --git a/resources/libraries/bash/function/gather_dpdk.sh b/resources/libraries/bash/function/gather_dpdk.sh new file mode 100644 index 0000000000..da3fa930e6 --- /dev/null +++ b/resources/libraries/bash/function/gather_dpdk.sh @@ -0,0 +1,66 @@ +# Copyright (c) 2024 Cisco and/or its affiliates. +# Copyright (c) 2024 PANTHEON.tech and/or its affiliates. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -exuo pipefail + +# This library defines functions used mainly by "bootstrap" entry scripts. +# Generally, the functions assume "common.sh" library has been sourced already. + +# Keep functions ordered alphabetically, please. + +function gather_dpdk () { + + # Ensure latest DPDK archive is downloaded. + # + # Variables read: + # - TEST_CODE - The test selection string from environment or argument. + # Hardcoded: + # - dpdk archive name to download if TEST_CODE is not time based. + # Directories updated: + # - ./ - Assumed ${DOWNLOAD_DIR}, dpdk-*.tar.xz is downloaded if not there. + # Functions called: + # - die - Print to stderr and exit, defined in common.sh + + set -exuo pipefail + + dpdk_repo="https://fast.dpdk.org/rel" + # Use downloaded packages with specific version + if [[ "${TEST_CODE}" == *"daily"* ]] || \ + [[ "${TEST_CODE}" == *"weekly"* ]] || \ + [[ "${TEST_CODE}" == *"timed"* ]]; + then + echo "Downloading latest DPDK packages from repo..." + # URL is not in quotes, calling command from variable keeps them. + wget_command=("wget" "--no-check-certificate" "--compression=auto") + wget_command+=("-nv" "-O" "-") + wget_command+=("${dpdk_repo}") + dpdk_stable_ver="$("${wget_command[@]}" | grep -v "2015"\ + | grep -Eo 'dpdk-[^\"]+xz' | tail -1)" || { + die "Composite piped command failed." + } + else + echo "Downloading DPDK package of specific version from repo ..." + # Downloading DPDK version based on what VPP is using. Currently + # it is not easy way to detect from VPP version automatically. + dpdk_stable_ver="$(< "${CSIT_DIR}/DPDK_VPP_VER")".tar.xz || { + die "Failed to read DPDK VPP version!" + } + fi + # TODO: Use "wget -N" instead checking for file presence? + if [[ ! -f "${dpdk_stable_ver}" ]]; then + wget -nv --no-check-certificate "${dpdk_repo}/${dpdk_stable_ver}" || { + die "Failed to get DPDK package from: ${dpdk_repo}" + } + fi +} diff --git a/resources/libraries/bash/function/gather_trex.sh b/resources/libraries/bash/function/gather_trex.sh new file mode 100644 index 0000000000..99591affc3 --- /dev/null +++ b/resources/libraries/bash/function/gather_trex.sh @@ -0,0 +1,30 @@ +# Copyright (c) 2024 Cisco and/or its affiliates. +# Copyright (c) 2024 PANTHEON.tech and/or its affiliates. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -exuo pipefail + +# This library defines functions used mainly by "bootstrap" entry scripts. +# Generally, the functions assume "common.sh" library has been sourced already. + +# Keep functions ordered alphabetically, please. + +function gather_trex () { + + # This function is required to bypass download dir check. + # Currently it creates empty file in download dir. + + set -exuo pipefail + + touch trex-download-to-be-added.txt +} diff --git a/resources/libraries/bash/function/gather_vpp.sh b/resources/libraries/bash/function/gather_vpp.sh new file mode 100644 index 0000000000..6ed4aa981c --- /dev/null +++ b/resources/libraries/bash/function/gather_vpp.sh @@ -0,0 +1,80 @@ +# Copyright (c) 2024 Cisco and/or its affiliates. +# Copyright (c) 2024 PANTHEON.tech and/or its affiliates. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -exuo pipefail + +# This library defines functions used mainly by "bootstrap" entry scripts. +# Generally, the functions assume "common.sh" library has been sourced already. + +# Keep functions ordered alphabetically, please. + +function gather_vpp () { + + # Variables read: + # - BASH_FUNCTION_DIR - Bash directory with functions. + # - TEST_CODE - The test selection string from environment or argument. + # - DOWNLOAD_DIR - Path to directory robot takes the build to test from. + # - CSIT_DIR - Path to existing root of local CSIT git repository. + # Variables set: + # - VPP_VERSION - VPP stable version under test. + # Files read: + # - ${CSIT_DIR}/DPDK_STABLE_VER - DPDK version to use + # by csit-vpp not-timed jobs. + # - ${CSIT_DIR}/${VPP_VER_FILE} - Ubuntu VPP version to use. + # - ../*vpp*.deb|rpm - Relative to ${DOWNLOAD_DIR}, + # copied for vpp-csit jobs. + # Directories updated: + # - ${DOWNLOAD_DIR}, vpp-*.deb files are copied here for vpp-csit jobs. + # - ./ - Assumed ${DOWNLOAD_DIR}, *vpp*.deb|rpm files + # are downloaded here for csit-vpp. + # Functions called: + # - die - Print to stderr and exit, defined in common_functions.sh + # Bash scripts executed: + # - ${CSIT_DIR}/resources/tools/scripts/download_install_vpp_pkgs.sh + # - Should download and extract requested files to ./. + + set -exuo pipefail + + case "${TEST_CODE}" in + "csit-"*) + # Use downloaded packages with specific version. + if [[ "${TEST_CODE}" == *"daily"* ]] || \ + { [[ "${TEST_CODE}" == *"weekly"* ]] && \ + [[ "${TEST_CODE}" != *"device"* ]]; } || \ + [[ "${TEST_CODE}" == *"semiweekly"* ]] || \ + [[ "${TEST_CODE}" == *"hourly"* ]]; + then + warn "Downloading latest VPP packages from Packagecloud." + else + warn "Downloading stable VPP packages from Packagecloud." + VPP_VERSION="$(<"${CSIT_DIR}/${VPP_VER_FILE}")" || { + die "Read VPP stable version failed." + } + fi + source "${BASH_FUNCTION_DIR}/artifacts.sh" || die "Source failed." + download_artifacts || die + ;; + "vpp-csit-"*) + # Shorten line. + pkgs="${PKG_SUFFIX}" + # Use locally built packages. + mv "${DOWNLOAD_DIR}"/../*vpp*."${pkgs}" "${DOWNLOAD_DIR}"/ || { + die "Move command failed." + } + ;; + *) + die "Unable to identify job type from: ${TEST_CODE}" + ;; + esac +} diff --git a/resources/libraries/python/ContainerUtils.py b/resources/libraries/python/ContainerUtils.py index ef08317420..7d6d4d8673 100644 --- a/resources/libraries/python/ContainerUtils.py +++ b/resources/libraries/python/ContainerUtils.py @@ -939,8 +939,7 @@ class LXC(ContainerEngine): image = self.container.image if self.container.image \ else f"-d ubuntu -r jammy -a {target_arch}" - cmd = f"lxc-create -t download --name {self.container.name} " \ - f"-- {image} --no-validate" + cmd = f"lxc-create -t download --name {self.container.name} -- {image}" ret, _, _ = self.container.ssh.exec_command_sudo(cmd, timeout=1800) if int(ret) != 0: diff --git a/resources/libraries/python/IPsecUtil.py b/resources/libraries/python/IPsecUtil.py index 1abfee2cec..e93ae28142 100644 --- a/resources/libraries/python/IPsecUtil.py +++ b/resources/libraries/python/IPsecUtil.py @@ -348,13 +348,7 @@ class IPsecUtil: cmd = "crypto_set_async_dispatch_v2" err_msg = "Failed to set dispatch mode." args = dict(mode=0, adaptive=False) - try: - papi_exec.add(cmd, **args).get_reply(err_msg) - except (AttributeError, RuntimeError): - # Expected when VPP build does not have the _v2 yet - # (after and before the first CRC check). - # TODO: Fail here when testing of pre-23.10 builds is over. - pass + papi_exec.add(cmd, **args).get_reply(err_msg) @staticmethod def vpp_ipsec_crypto_sw_scheduler_set_worker( diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py index 936cb3a06d..950e3c42ea 100644 --- a/resources/libraries/python/TrafficGenerator.py +++ b/resources/libraries/python/TrafficGenerator.py @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -524,7 +524,7 @@ class TrafficGenerator(AbstractMeasurer): command_line.add(f"'{value}'") stdout, _ = exec_cmd_no_error( node, command_line, - message="T-Rex STL runtime error!" + message="T-Rex STL runtime error!", include_reason=True ) self._parse_traffic_results(stdout) @@ -763,7 +763,7 @@ class TrafficGenerator(AbstractMeasurer): self._rate = float(rate[:-3]) if "pps" in rate else float(rate) stdout, _ = exec_cmd_no_error( self._node, command_line, timeout=int(duration) + 60, - message="T-Rex STL runtime error" + message="T-Rex STL runtime error", include_reason=True ) if async_call: |