From 3bfed58fb8986d7c3bb01443c3db51b6b087a8cb Mon Sep 17 00:00:00 2001 From: Ross Brattain Date: Fri, 1 Sep 2017 10:55:29 -0700 Subject: sample_vnf: default to 16GB of 2048Kb hugepages 8192 * 2048kB = 16GB Change-Id: I82bf420794e5174e88cfaea08b9fab0d77c2be7f Signed-off-by: Ross Brattain --- tests/unit/network_services/vnf_generic/vnf/test_sample_vnf.py | 2 +- yardstick/network_services/vnf_generic/vnf/sample_vnf.py | 2 +- 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 -- cgit 1.2.3-korg