Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
FIX: Race condition
[csit.git]
/
resources
/
libraries
/
python
/
Constants.py
diff --git
a/resources/libraries/python/Constants.py
b/resources/libraries/python/Constants.py
index
de7a120
..
437c97f
100644
(file)
--- a/
resources/libraries/python/Constants.py
+++ b/
resources/libraries/python/Constants.py
@@
-139,8
+139,8
@@
class Constants:
# Kubernetes templates location
RESOURCES_TPL_K8S = u"resources/templates/kubernetes"
# Kubernetes templates location
RESOURCES_TPL_K8S = u"resources/templates/kubernetes"
- #
KernelVM t
emplates location
- RESOURCES_TPL
_VM = u"resources/templates/vm
"
+ #
T
emplates location
+ RESOURCES_TPL
= u"resources/templates
"
# Container templates location
RESOURCES_TPL_CONTAINER = u"resources/templates/container"
# Container templates location
RESOURCES_TPL_CONTAINER = u"resources/templates/container"
@@
-148,9
+148,6
@@
class Constants:
# VPP Communications Library templates location
RESOURCES_TPL_VCL = u"resources/templates/vcl"
# VPP Communications Library templates location
RESOURCES_TPL_VCL = u"resources/templates/vcl"
- # HTTP Server www root directory
- RESOURCES_TP_WRK_WWW = u"resources/traffic_profiles/wrk/www"
-
# VPP Communications Library LD_PRELOAD library
VCL_LDPRELOAD_LIBRARY = u"/usr/lib/x86_64-linux-gnu/libvcl_ldpreload.so"
# VPP Communications Library LD_PRELOAD library
VCL_LDPRELOAD_LIBRARY = u"/usr/lib/x86_64-linux-gnu/libvcl_ldpreload.so"
@@
-176,7
+173,7
@@
class Constants:
QEMU_VM_KERNEL_INITRD = u"/opt/boot/initrd.img"
# QEMU VM nested image path
QEMU_VM_KERNEL_INITRD = u"/opt/boot/initrd.img"
# QEMU VM nested image path
- QEMU_VM_IMAGE = u"/var/lib/vm/
vhost-nested.img
"
+ QEMU_VM_IMAGE = u"/var/lib/vm/
image.iso
"
# QEMU VM DPDK path
QEMU_VM_DPDK = u"/opt/dpdk-20.02"
# QEMU VM DPDK path
QEMU_VM_DPDK = u"/opt/dpdk-20.02"
@@
-188,27
+185,41
@@
class Constants:
DOCKER_SUT_IMAGE_UBUNTU_ARM = u"snergster/csit-arm-sut:latest"
# TRex install directory
DOCKER_SUT_IMAGE_UBUNTU_ARM = u"snergster/csit-arm-sut:latest"
# TRex install directory
- TREX_INSTALL_DIR = u"/opt/trex-core-2.73"
+ TREX_INSTALL_DIR = u"/opt/trex-core-2.82"
+
+ # TODO: Find the right way how to use it in trex profiles
+ # TRex pcap files directory
+ TREX_PCAP_DIR = f"{TREX_INSTALL_DIR}/scripts/avl"
# TRex limit memory.
TREX_LIMIT_MEMORY = get_int_from_env(u"TREX_LIMIT_MEMORY", 8192)
# TRex number of cores
# TRex limit memory.
TREX_LIMIT_MEMORY = get_int_from_env(u"TREX_LIMIT_MEMORY", 8192)
# TRex number of cores
- TREX_CORE_COUNT = get_int_from_env(u"TREX_CORE_COUNT",
15
)
+ TREX_CORE_COUNT = get_int_from_env(u"TREX_CORE_COUNT",
8
)
- # Trex force start regardles ports state
+ # Trex force start regardles
s
ports state
TREX_SEND_FORCE = get_pessimistic_bool_from_env(u"TREX_SEND_FORCE")
# TRex extra commandline arguments
TREX_EXTRA_CMDLINE = get_str_from_env(
u"TREX_EXTRA_CMDLINE", u"--mbuf-factor 32")
TREX_SEND_FORCE = get_pessimistic_bool_from_env(u"TREX_SEND_FORCE")
# TRex extra commandline arguments
TREX_EXTRA_CMDLINE = get_str_from_env(
u"TREX_EXTRA_CMDLINE", u"--mbuf-factor 32")
+ # graph node variant value
+ GRAPH_NODE_VARIANT = get_str_from_env(
+ u"GRAPH_NODE_VARIANT", u"")
+
# Sysctl kernel.core_pattern
KERNEL_CORE_PATTERN = u"/tmp/%p-%u-%g-%s-%t-%h-%e.core"
# Core dump directory
CORE_DUMP_DIR = u"/tmp"
# Sysctl kernel.core_pattern
KERNEL_CORE_PATTERN = u"/tmp/%p-%u-%g-%s-%t-%h-%e.core"
# Core dump directory
CORE_DUMP_DIR = u"/tmp"
+ # Perf stat events (comma separated).
+ PERF_STAT_EVENTS = get_str_from_env(
+ u"PERF_STAT_EVENTS",
+ u"cpu-clock,context-switches,cpu-migrations,page-faults,"
+ u"cycles,instructions,branches,branch-misses,L1-icache-load-misses")
+
# Equivalent to ~0 used in vpp code
BITWISE_NON_ZERO = 0xffffffff
# Equivalent to ~0 used in vpp code
BITWISE_NON_ZERO = 0xffffffff
@@
-225,6
+236,11
@@
class Constants:
PERF_TRIAL_LATENCY_DURATION = get_float_from_env(
u"PERF_TRIAL_LATENCY_DURATION", 5.0)
PERF_TRIAL_LATENCY_DURATION = get_float_from_env(
u"PERF_TRIAL_LATENCY_DURATION", 5.0)
+ # Extended debug (incl. vpp packet trace, linux perf stat, ...).
+ # Full list is available as suite variable (__init__.robot) or is
+ # override by test.
+ EXTENDED_DEBUG = get_pessimistic_bool_from_env(u"EXTENDED_DEBUG")
+
# UUID string of DUT1 /tmp volume created outside of the
# DUT1 docker in case of vpp-device test. ${EMPTY} value means that
# /tmp directory is inside the DUT1 docker.
# UUID string of DUT1 /tmp volume created outside of the
# DUT1 docker in case of vpp-device test. ${EMPTY} value means that
# /tmp directory is inside the DUT1 docker.
@@
-253,14
+269,13
@@
class Constants:
u"Intel-X710": 10000000000,
u"Intel-XL710": 24500000000,
u"Intel-XXV710": 24500000000,
u"Intel-X710": 10000000000,
u"Intel-XL710": 24500000000,
u"Intel-XXV710": 24500000000,
+ u"Intel-E810CQ": 100000000000,
u"Mellanox-CX556A": 100000000000,
u"Amazon-Nitro-50G": 10000000000,
u"virtual": 100000000,
}
# Mapping from NIC name to its pps limit.
u"Mellanox-CX556A": 100000000000,
u"Amazon-Nitro-50G": 10000000000,
u"virtual": 100000000,
}
# Mapping from NIC name to its pps limit.
- # The values are unidirectional, assuming the test
- # uses two ports on the same NIC.
NIC_NAME_TO_PPS_LIMIT = {
u"Cisco-VIC-1227": 14880952,
u"Cisco-VIC-1385": 18750000,
NIC_NAME_TO_PPS_LIMIT = {
u"Cisco-VIC-1227": 14880952,
u"Cisco-VIC-1385": 18750000,
@@
-269,9
+284,8
@@
class Constants:
u"Intel-X710": 14880952,
u"Intel-XL710": 18750000,
u"Intel-XXV710": 18750000,
u"Intel-X710": 14880952,
u"Intel-XL710": 18750000,
u"Intel-XXV710": 18750000,
- # The Mellanox card is able to do more, but the current TRex version
- # shows non-negligible duration stretching, depending on cores used.
- u"Mellanox-CX556A": 47000000, # 148809523,
+ u"Intel-E810CQ": 58500000,
+ u"Mellanox-CX556A": 60000000, # 148809523,
u"Amazon-Nitro-50G": 1500000,
u"virtual": 14880952,
}
u"Amazon-Nitro-50G": 1500000,
u"virtual": 14880952,
}
@@
-285,6
+299,7
@@
class Constants:
u"Intel-X710": u"10ge2p1x710",
u"Intel-XL710": u"40ge2p1xl710",
u"Intel-XXV710": u"25ge2p1xxv710",
u"Intel-X710": u"10ge2p1x710",
u"Intel-XL710": u"40ge2p1xl710",
u"Intel-XXV710": u"25ge2p1xxv710",
+ u"Intel-E810CQ": u"100ge2p1e810cq",
u"Amazon-Nitro-50G": u"50ge1p1ENA",
u"Mellanox-CX556A": u"100ge2p1cx556a",
}
u"Amazon-Nitro-50G": u"50ge1p1ENA",
u"Mellanox-CX556A": u"100ge2p1cx556a",
}
@@
-298,6
+313,7
@@
class Constants:
u"Intel-X710": [u"vfio-pci", u"avf"],
u"Intel-XL710": [u"vfio-pci", u"avf"],
u"Intel-XXV710": [u"vfio-pci", u"avf"],
u"Intel-X710": [u"vfio-pci", u"avf"],
u"Intel-XL710": [u"vfio-pci", u"avf"],
u"Intel-XXV710": [u"vfio-pci", u"avf"],
+ u"Intel-E810CQ": [u"vfio-pci", u"avf"],
u"Amazon-Nitro-50G": [u"vfio-pci"],
u"Mellanox-CX556A": [u"rdma-core"],
}
u"Amazon-Nitro-50G": [u"vfio-pci"],
u"Mellanox-CX556A": [u"rdma-core"],
}
@@
-339,6
+355,7
@@
class Constants:
u"Intel-X710": [u"vfio-pci"],
u"Intel-XL710": [u"vfio-pci"],
u"Intel-XXV710": [u"vfio-pci"],
u"Intel-X710": [u"vfio-pci"],
u"Intel-XL710": [u"vfio-pci"],
u"Intel-XXV710": [u"vfio-pci"],
+ u"Intel-E810CQ": [u"vfio-pci"],
u"Amazon-Nitro-50G": [u"vfio-pci"],
u"Mellanox-CX556A": [u"mlx5_core"],
}
u"Amazon-Nitro-50G": [u"vfio-pci"],
u"Mellanox-CX556A": [u"mlx5_core"],
}