diff options
| author |   Ross Brattain <ross.b.brattain@intel.com> | 2018-03-22 13:40:46 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-03-22 13:40:46 +0000 |
| commit | a6adb45bb0ee22f2548004afe0d8a7b09e7c15c4 (patch) | |
| tree | b2a18743a3601dee1bf94e09d1637ccddac677b3 /yardstick | |
| parent | 0b21b6484cc383f2a78aa9d5db1d41189d84ca3d (diff) | |
| parent | ba811fc624003829bb972890d96aac4f5eaf97b5 (diff) | |
Merge "Make Sample VNF hugepages size configurable"
Diffstat (limited to 'yardstick')
| -rw-r--r-- | yardstick/network_services/vnf_generic/vnf/sample_vnf.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/yardstick/network_services/vnf_generic/vnf/sample_vnf.py b/yardstick/network_services/vnf_generic/vnf/sample_vnf.py index addbd9aa4..77488c479 100644 --- a/yardstick/network_services/vnf_generic/vnf/sample_vnf.py +++ b/yardstick/network_services/vnf_generic/vnf/sample_vnf.py @@ -79,7 +79,6 @@ class DpdkVnfSetupEnvHelper(SetupEnvHelper): APP_NAME = 'DpdkVnf' FIND_NET_CMD = "find /sys/class/net -lname '*{}*' -printf '%f'" NR_HUGEPAGES_PATH = '/proc/sys/vm/nr_hugepages' - HUGEPAGES_KB = 1024 * 1024 * 16 @staticmethod def _update_packet_type(ip_pipeline_cfg, traffic_options): @@ -118,7 +117,8 @@ class DpdkVnfSetupEnvHelper(SetupEnvHelper): def _setup_hugepages(self): meminfo = utils.read_meminfo(self.ssh_helper) hp_size_kb = int(meminfo['Hugepagesize']) - nr_hugepages = int(abs(self.HUGEPAGES_KB / hp_size_kb)) + hugepages_gb = self.scenario_helper.all_options.get('hugepages_gb', 16) + nr_hugepages = int(abs(hugepages_gb * 1024 * 1024 / hp_size_kb)) self.ssh_helper.execute('echo %s | sudo tee %s' % (nr_hugepages, self.NR_HUGEPAGES_PATH)) hp = six.BytesIO() |