aboutsummaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
Diffstat (limited to 'resources')
-rw-r--r--resources/libraries/python/Constants.py2
-rw-r--r--resources/libraries/python/DpdkUtil.py4
-rw-r--r--resources/libraries/python/QemuUtils.py5
-rw-r--r--resources/tools/presentation/conf.py4
4 files changed, 6 insertions, 9 deletions
diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py
index 14fb7958b8..79b94be7ff 100644
--- a/resources/libraries/python/Constants.py
+++ b/resources/libraries/python/Constants.py
@@ -176,7 +176,7 @@ class Constants:
QEMU_VM_IMAGE = u"/var/lib/vm/image.iso"
# QEMU VM DPDK path
- QEMU_VM_DPDK = u"/opt/dpdk-20.02"
+ QEMU_VM_DPDK = u"/opt/dpdk-21.02"
# Docker container SUT image
DOCKER_SUT_IMAGE_UBUNTU = u"csit_sut-ubuntu2004:local"
diff --git a/resources/libraries/python/DpdkUtil.py b/resources/libraries/python/DpdkUtil.py
index dcca73db1d..fd31f1ddb2 100644
--- a/resources/libraries/python/DpdkUtil.py
+++ b/resources/libraries/python/DpdkUtil.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
@@ -161,7 +161,7 @@ class DpdkUtil:
:rtype: OptionString
"""
options = OptionString()
- options.add(u"testpmd")
+ options.add(u"dpdk-testpmd")
options.extend(DpdkUtil.get_eal_options(**kwargs))
options.add(u"--")
options.extend(DpdkUtil.get_testpmd_pmd_options(**kwargs))
diff --git a/resources/libraries/python/QemuUtils.py b/resources/libraries/python/QemuUtils.py
index 21de620448..a765e11e27 100644
--- a/resources/libraries/python/QemuUtils.py
+++ b/resources/libraries/python/QemuUtils.py
@@ -65,16 +65,13 @@ class QemuUtils:
# Architecture specific options
if self._arch == u"aarch64":
- dpdk_target = u"arm64-armv8a"
self._opt[u"machine_args"] = \
u"virt,accel=kvm,usb=off,mem-merge=off,gic-version=3"
self._opt[u"console"] = u"ttyAMA0"
else:
- dpdk_target = u"x86_64-native"
self._opt[u"machine_args"] = u"pc,accel=kvm,usb=off,mem-merge=off"
self._opt[u"console"] = u"ttyS0"
- self._testpmd_path = f"{Constants.QEMU_VM_DPDK}/" \
- f"{dpdk_target}-linux-gcc/app"
+ self._testpmd_path = f"{Constants.QEMU_VM_DPDK}/build/app"
self._vm_info = {
u"host": node[u"host"],
u"type": NodeType.VM,
diff --git a/resources/tools/presentation/conf.py b/resources/tools/presentation/conf.py
index ac29fe43a8..b15af82188 100644
--- a/resources/tools/presentation/conf.py
+++ b/resources/tools/presentation/conf.py
@@ -113,8 +113,8 @@ rst_epilog = u"""
csit_prev_release=u'2009',
vpprelease=u'21.01',
vpp_prev_release=u'20.09',
- dpdkrelease=u'20.11',
- dpdk_prev_release=u'20.08',
+ dpdkrelease=u'21.02',
+ dpdk_prev_release=u'20.11',
sdpdkrelease=u'2011',
trex_version=u'v2.88',
vpp_release_commit_id=u'3d2d96e5547484290c9368bac0a420afa8c4c068')