Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
VAT-to-PAPI: Fix HTTP/TCP tests
[csit.git]
/
resources
/
libraries
/
python
/
Constants.py
diff --git
a/resources/libraries/python/Constants.py
b/resources/libraries/python/Constants.py
index
0f0003a
..
e01536b
100644
(file)
--- a/
resources/libraries/python/Constants.py
+++ b/
resources/libraries/python/Constants.py
@@
-40,6
+40,12
@@
class Constants(object):
# KernelVM templates location
RESOURCES_TPL_VM = 'resources/templates/vm'
# KernelVM templates location
RESOURCES_TPL_VM = 'resources/templates/vm'
+ # Container templates location
+ RESOURCES_TPL_CONTAINER = 'resources/templates/container'
+
+ # HTTP Server www root directory
+ RESOURCES_TP_WRK_WWW = 'resources/traffic_profiles/wrk/www'
+
# OpenVPP VAT binary name
VAT_BIN_NAME = 'vpp_api_test'
# OpenVPP VAT binary name
VAT_BIN_NAME = 'vpp_api_test'
@@
-58,17
+64,26
@@
class Constants(object):
# QEMU VM kernel image path
QEMU_VM_KERNEL = '/opt/boot/vmlinuz'
# QEMU VM kernel image path
QEMU_VM_KERNEL = '/opt/boot/vmlinuz'
+ # QEMU VM kernel initrd path
+ QEMU_VM_KERNEL_INITRD = '/opt/boot/initrd.img'
+
# QEMU VM nested image path
QEMU_VM_IMAGE = '/var/lib/vm/vhost-nested.img'
# QEMU VM DPDK path
QEMU_VM_DPDK = '/opt/dpdk-19.02'
# QEMU VM nested image path
QEMU_VM_IMAGE = '/var/lib/vm/vhost-nested.img'
# QEMU VM DPDK path
QEMU_VM_DPDK = '/opt/dpdk-19.02'
+ # Docker container SUT image
+ DOCKER_SUT_IMAGE_UBUNTU = 'snergster/csit-sut:latest'
+
+ # Docker container arm SUT image
+ DOCKER_SUT_IMAGE_UBUNTU_ARM = 'snergster/csit-arm-sut:latest'
+
# TRex install version
# TRex install version
- TREX_INSTALL_VERSION = '2.
35
'
+ TREX_INSTALL_VERSION = '2.
54
'
# TRex install directory
# TRex install directory
- TREX_INSTALL_DIR = '/opt/trex-core-2.
35
'
+ TREX_INSTALL_DIR = '/opt/trex-core-2.
54
'
# Honeycomb directory location at topology nodes:
REMOTE_HC_DIR = '/opt/honeycomb'
# Honeycomb directory location at topology nodes:
REMOTE_HC_DIR = '/opt/honeycomb'
@@
-91,6
+106,9
@@
class Constants(object):
# Core dump directory
CORE_DUMP_DIR = '/tmp'
# Core dump directory
CORE_DUMP_DIR = '/tmp'
+ # Equivalent to ~0 used in vpp code
+ BITWISE_NON_ZERO = 0xffffffff
+
# Mapping from NIC name to its bps limit.
# TODO: Implement logic to lower limits to TG NIC or software. Or PCI.
NIC_NAME_TO_LIMIT = {
# Mapping from NIC name to its bps limit.
# TODO: Implement logic to lower limits to TG NIC or software. Or PCI.
NIC_NAME_TO_LIMIT = {
@@
-102,6
+120,7
@@
class Constants(object):
"Intel-X710": 10000000000,
"Intel-XL710": 24500000000,
"Intel-XXV710": 24500000000,
"Intel-X710": 10000000000,
"Intel-XL710": 24500000000,
"Intel-XXV710": 24500000000,
+ "virtual": 100000000,
}
# Suite file names use somewhat more rich (less readable) codes for NICs.
}
# Suite file names use somewhat more rich (less readable) codes for NICs.