diff options
Diffstat (limited to 'resources/libraries')
| -rw-r--r-- | resources/libraries/bash/function/common.sh | 42 | ||||
| -rw-r--r-- | resources/libraries/python/Constants.py | 9 |
2 files changed, 2 insertions, 49 deletions
diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh index 5aa4f06b0e..5bf7df7ea1 100644 --- a/resources/libraries/bash/function/common.sh +++ b/resources/libraries/bash/function/common.sh @@ -487,10 +487,6 @@ function get_test_code () { NODENESS="2n" FLAVOR="zn2" ;; - *"2n-clx") - NODENESS="2n" - FLAVOR="clx" - ;; *"2n-icx") NODENESS="2n" FLAVOR="icx" @@ -519,14 +515,6 @@ function get_test_code () { NODENESS="3n" FLAVOR="icxd" ;; - *"2n-tx2") - NODENESS="2n" - FLAVOR="tx2" - ;; - *"3n-tsh") - NODENESS="3n" - FLAVOR="tsh" - ;; *"3n-alt") NODENESS="3n" FLAVOR="alt" @@ -954,9 +942,6 @@ function select_tags () { *"3n-icxd") default_nic="nic_intel-e823c" ;; - *"3n-tsh") - default_nic="nic_intel-x520-da2" - ;; *"3n-icx" | *"2n-icx") default_nic="nic_intel-e810cq" ;; @@ -969,10 +954,10 @@ function select_tags () { *"2n-spr") default_nic="nic_intel-e810cq" ;; - *"2n-clx" | *"2n-zn2") + *"2n-zn2") default_nic="nic_intel-xxv710" ;; - *"2n-tx2" | *"3n-alt") + *"3n-alt") default_nic="nic_intel-xl710" ;; *"1n-aws" | *"2n-aws" | *"3n-aws") @@ -997,7 +982,6 @@ function select_tags () { awk_nics_sub_cmd+='gsub("xxv710","25ge2p1xxv710");' awk_nics_sub_cmd+='gsub("x710","10ge2p1x710");' awk_nics_sub_cmd+='gsub("xl710","40ge2p1xl710");' - awk_nics_sub_cmd+='gsub("x520-da2","10ge2p1x520");' awk_nics_sub_cmd+='gsub("cx556a","100ge2p1cx556a");' awk_nics_sub_cmd+='gsub("2p1cx7veat","200ge2p1cx7veat");' awk_nics_sub_cmd+='gsub("6p3cx7veat","200ge6p3cx7veat");' @@ -1108,17 +1092,11 @@ function select_tags () { *"1n-alt") test_tag_array+=("!flow") ;; - *"2n-clx") - test_tag_array+=("!ipsechw") - ;; *"2n-icx") test_tag_array+=("!ipsechw") ;; *"2n-spr") ;; - *"2n-tx2") - test_tag_array+=("!ipsechw") - ;; *"2n-zn2") test_tag_array+=("!ipsechw") ;; @@ -1137,10 +1115,6 @@ function select_tags () { ;; *"3nb-spr") ;; - *"3n-tsh") - test_tag_array+=("!drv_avf") - test_tag_array+=("!ipsechw") - ;; *"1n-aws" | *"2n-aws" | *"3n-aws") test_tag_array+=("!ipsechw") ;; @@ -1241,10 +1215,6 @@ function select_topology () { TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n-c6in*.yaml ) TOPOLOGIES_TAGS="2_node_single_link_topo" ;; - *"2n-clx") - TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_clx_*.yaml ) - TOPOLOGIES_TAGS="2_node_*_link_topo" - ;; *"2n-icx") TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_icx_*.yaml ) TOPOLOGIES_TAGS="2_node_*_link_topo" @@ -1253,10 +1223,6 @@ function select_topology () { TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_spr_*.yaml ) TOPOLOGIES_TAGS="2_node_*_link_topo" ;; - *"2n-tx2") - TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_tx2_*.yaml ) - TOPOLOGIES_TAGS="2_node_single_link_topo" - ;; *"2n-zn2") TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_zn2_*.yaml ) TOPOLOGIES_TAGS="2_node_*_link_topo" @@ -1290,10 +1256,6 @@ function select_topology () { TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_snr_*.yaml ) TOPOLOGIES_TAGS="3_node_single_link_topo" ;; - *"3n-tsh") - TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_tsh_*.yaml ) - TOPOLOGIES_TAGS="3_node_single_link_topo" - ;; *"3na-spr") TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3na_spr_*.yaml ) TOPOLOGIES_TAGS="3_node_*_link_topo" diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py index 7e6d70b6cb..3fabe0141b 100644 --- a/resources/libraries/python/Constants.py +++ b/resources/libraries/python/Constants.py @@ -318,7 +318,6 @@ class Constants: # Mapping from NIC name to its bps limit. NIC_NAME_TO_BPS_LIMIT = { - "Intel-X520-DA2": 10000000000, "Intel-X710": 10000000000, "Intel-XL710": 24500000000, "Intel-XXV710": 24500000000, @@ -337,7 +336,6 @@ class Constants: # Mapping from NIC name to its pps limit. NIC_NAME_TO_PPS_LIMIT = { - "Intel-X520-DA2": 14880952, "Intel-X710": 14880952, "Intel-XL710": 18750000, "Intel-XXV710": 18750000, @@ -356,7 +354,6 @@ class Constants: # Suite file names use codes for NICs. NIC_NAME_TO_CODE = { - "Intel-X520-DA2": "10ge2p1x520", "Intel-X710": "10ge2p1x710", "Intel-XL710": "40ge2p1xl710", "Intel-XXV710": "25ge2p1xxv710", @@ -374,7 +371,6 @@ class Constants: "virtual": "1ge1p82540em", } NIC_CODE_TO_NAME = { - "10ge2p1x520": "Intel-X520-DA2", "10ge2p1x710": "Intel-X710", "40ge2p1xl710": "Intel-XL710", "25ge2p1xxv710": "Intel-XXV710", @@ -394,7 +390,6 @@ class Constants: # Shortened lowercase NIC model name, useful for presentation. NIC_CODE_TO_SHORT_NAME = { - "10ge2p1x520": "x520", "10ge2p1x710": "x710", "40ge2p1xl710": "xl710", "25ge2p1xxv710": "xxv710", @@ -414,7 +409,6 @@ class Constants: # Not each driver is supported by each NIC. NIC_NAME_TO_DRIVER = { - "Intel-X520-DA2": ["vfio-pci", "af_xdp"], "Intel-X710": ["vfio-pci", "avf", "af_xdp"], "Intel-XL710": ["vfio-pci", "avf", "af_xdp"], "Intel-XXV710": ["vfio-pci", "avf", "af_xdp"], @@ -469,7 +463,6 @@ class Constants: # Number of physical interfaces of physical nic. NIC_CODE_TO_PFS = { - "10ge2p1x520": "nic_pfs}= | 2", "10ge2p1x710": "nic_pfs}= | 2", "40ge2p1xl710": "nic_pfs}= | 2", "25ge2p1xxv710": "nic_pfs}= | 2", @@ -488,7 +481,6 @@ class Constants: } NIC_CODE_TO_CORESCALE = { - "10ge2p1x520": 1, "10ge2p1x710": 1, "40ge2p1xl710": 1, "25ge2p1xxv710": 1, @@ -508,7 +500,6 @@ class Constants: # Not each driver is supported by each NIC. DPDK_NIC_NAME_TO_DRIVER = { - "Intel-X520-DA2": ["vfio-pci"], "Intel-X710": ["vfio-pci"], "Intel-XL710": ["vfio-pci"], "Intel-XXV710": ["vfio-pci"], |