From: Chunsong Feng <fengchunsong@huawei.com>
Date: Thu, 14 Oct 2021 11:23:27 +0000 (+0000)
Subject: test/msgr: remove DPDK Non-runtime configure items
X-Git-Tag: v17.1.0~329^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1e5f89fa4a991e1b5e5478a8730feb379fbb5102;p=ceph.git

test/msgr: remove DPDK Non-runtime configure items

The non-runtime configure items of the DPDK must be configured in the
ceph.conf to avoid assert in the _conf.set_val_or_die.

Signed-off-by: Chunsong Feng <fengchunsong@huawei.com>
---

diff --git a/src/test/msgr/test_async_networkstack.cc b/src/test/msgr/test_async_networkstack.cc
index d369833b846b4..14923fd7dfbfd 100644
--- a/src/test/msgr/test_async_networkstack.cc
+++ b/src/test/msgr/test_async_networkstack.cc
@@ -76,15 +76,11 @@ class NetworkWorkerTest : public ::testing::TestWithParam<const char*> {
       addr = "127.0.0.1:15000";
       port_addr = "127.0.0.1:15001";
     } else {
-      g_ceph_context->_conf.set_val_or_die("ms_type", "async+dpdk");
       g_ceph_context->_conf.set_val_or_die("ms_dpdk_debug_allow_loopback", "true");
       g_ceph_context->_conf.set_val_or_die("ms_async_op_threads", "2");
-      g_ceph_context->_conf.set_val_or_die("ms_dpdk_coremask", "0x7");
-      g_ceph_context->_conf.set_val_or_die("ms_dpdk_host_ipv4_addr", "172.16.218.3");
-      g_ceph_context->_conf.set_val_or_die("ms_dpdk_gateway_ipv4_addr", "172.16.218.2");
-      g_ceph_context->_conf.set_val_or_die("ms_dpdk_netmask_ipv4_addr", "255.255.255.0");
-      addr = "172.16.218.3:15000";
-      port_addr = "172.16.218.3:15001";
+      string ipv4_addr = g_ceph_context->_conf.get_val<std::string>("ms_dpdk_host_ipv4_addr");
+      addr = ipv4_addr + std::string(":15000");
+      port_addr = ipv4_addr + std::string(":15001");
     }
     stack = NetworkStack::create(g_ceph_context, GetParam());
     stack->start();