Update of VPP_STABLE_VER files + quick fix for gre create tunnel

[csit.git] / resources / libraries / python / Constants.py

diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py
index 8a22a42..72310ba 100644 (file)
--- a/resources/libraries/python/Constants.py
+++ b/resources/libraries/python/Constants.py
@@ -34,26 +34,35 @@ class Constants(object):
     # vat templates location
     RESOURCES_TPL_VAT = 'resources/templates/vat'
 
+    # Kubernetes templates location
+    RESOURCES_TPL_K8S = 'resources/templates/kubernetes'
+
+    # KernelVM templates location
+    RESOURCES_TPL_VM = 'resources/templates/vm'
+
     # OpenVPP VAT binary name
     VAT_BIN_NAME = 'vpp_api_test'
 
     # VPP service unit name
     VPP_UNIT = 'vpp'
 
-    # QEMU version to install
-    QEMU_INSTALL_VERSION = 'qemu-2.11.2'
+    # Number of system CPU cores.
+    CPU_CNT_SYSTEM = 1
+
+    # Number of vswitch main thread CPU cores.
+    CPU_CNT_MAIN = 1
 
-    # QEMU install directory
-    QEMU_INSTALL_DIR = '/opt/qemu-2.11.2'
+    # QEMU binary path
+    QEMU_BIN_PATH = '/usr/bin'
 
-    # QEMU performance test VM kernel image path
-    QEMU_PERF_VM_KERNEL = '/opt/boot/vmlinuz'
+    # QEMU VM kernel image path
+    QEMU_VM_KERNEL = '/opt/boot/vmlinuz'
 
-    # QEMU performance test VM nested image path
-    QEMU_PERF_VM_IMAGE = '/var/lib/vm/csit-nested-1.7.img'
+    # QEMU VM nested image path
+    QEMU_VM_IMAGE = '/var/lib/vm/vhost-nested.img'
 
-    # QEMU performance test VM DPDK path
-    QEMU_PERF_VM_DPDK = '/opt/dpdk-19.02'
+    # QEMU VM DPDK path
+    QEMU_VM_DPDK = '/opt/dpdk-19.02'
 
     # TRex install version
     TREX_INSTALL_VERSION = '2.35'
@@ -61,12 +70,6 @@ class Constants(object):
     # TRex install directory
     TREX_INSTALL_DIR = '/opt/trex-core-2.35'
 
-    # Kubernetes templates location
-    RESOURCES_TPL_K8S = 'resources/templates/kubernetes'
-
-    # KernelVM templates location
-    RESOURCES_TPL_VM = 'resources/templates/vm'
-
     # Honeycomb directory location at topology nodes:
     REMOTE_HC_DIR = '/opt/honeycomb'
 
@@ -88,6 +91,9 @@ class Constants(object):
     # 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 = {