aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Brattain <ross.b.brattain@intel.com>2017-09-01 10:55:29 -0700
committerRoss Brattain <ross.b.brattain@intel.com>2017-09-01 11:02:43 -0700
commit3bfed58fb8986d7c3bb01443c3db51b6b087a8cb (patch)
treee6fa5a480b812c96b399fa304236024e5ceaef6e
parentf3f9196cd76a46f6b5fbf1dc06533d6bc65991c3 (diff)
sample_vnf: default to 16GB of 2048Kb hugepages
8192 * 2048kB = 16GB Change-Id: I82bf420794e5174e88cfaea08b9fab0d77c2be7f Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
-rw-r--r--tests/unit/network_services/vnf_generic/vnf/test_sample_vnf.py2
-rw-r--r--yardstick/network_services/vnf_generic/vnf/sample_vnf.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/unit/network_services/vnf_generic/vnf/test_sample_vnf.py b/tests/unit/network_services/vnf_generic/vnf/test_sample_vnf.py
index 455e44ec9..0264facf5 100644
--- a/tests/unit/network_services/vnf_generic/vnf/test_sample_vnf.py
+++ b/tests/unit/network_services/vnf_generic/vnf/test_sample_vnf.py
@@ -554,7 +554,7 @@ class TestDpdkVnfSetupEnvHelper(unittest.TestCase):
result = dpdk_setup_helper._setup_hugepages()
expect_start_list = ['awk', 'awk', 'echo']
- expect_in_list = ['meminfo', 'nr_hugepages', '16384']
+ expect_in_list = ['meminfo', 'nr_hugepages', '8192']
call_args_iter = (args[0][0] for args in ssh_helper.execute.call_args_list)
self.assertIsNone(result)
self.assertEqual(ssh_helper.execute.call_count, 3)
diff --git a/yardstick/network_services/vnf_generic/vnf/sample_vnf.py b/yardstick/network_services/vnf_generic/vnf/sample_vnf.py
index d7874a1a4..f41994814 100644
--- a/yardstick/network_services/vnf_generic/vnf/sample_vnf.py
+++ b/yardstick/network_services/vnf_generic/vnf/sample_vnf.py
@@ -182,7 +182,7 @@ class DpdkVnfSetupEnvHelper(SetupEnvHelper):
self.ssh_helper.execute("awk -F: '{ print $1 }' < %s" % memory_path)
if hugepages == "2048kB":
- pages = 16384
+ pages = 8192
else:
pages = 16