aboutsummaryrefslogtreecommitdiffstats
path: root/tools/pkt_fwd/testpmd.py
diff options
context:
space:
mode:
Diffstat (limited to 'tools/pkt_fwd/testpmd.py')
-rw-r--r--tools/pkt_fwd/testpmd.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/tools/pkt_fwd/testpmd.py b/tools/pkt_fwd/testpmd.py
index 30e80386..970259dc 100644
--- a/tools/pkt_fwd/testpmd.py
+++ b/tools/pkt_fwd/testpmd.py
@@ -1,4 +1,4 @@
-# Copyright 2016 Intel Corporation.
+# Copyright 2016-2017 Intel Corporation.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -41,6 +41,14 @@ class TestPMD(IPktFwd):
def __init__(self, guest=False):
vswitchd_args = settings.getValue('VSWITCHD_DPDK_ARGS')
+
+ # override socket-mem settings
+ for tmp_arg in vswitchd_args:
+ if tmp_arg.startswith('--socket-mem'):
+ vswitchd_args.remove(tmp_arg)
+ vswitchd_args += ['--socket-mem ' +
+ ','.join(settings.getValue('DPDK_SOCKET_MEM'))]
+
if guest:
vswitchd_args += _TESTPMD_PVP_CONST_ARGS
vswitchd_args += _VSWITCHD_CONST_ARGS
@@ -100,5 +108,3 @@ class TestPMD(IPktFwd):
except pexpect.EOF:
pass
dpdk.cleanup()
-
-