Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
PAL: Add processing of PPS and CPS tests
[csit.git]
/
resources
/
libraries
/
python
/
QemuUtils.py
diff --git
a/resources/libraries/python/QemuUtils.py
b/resources/libraries/python/QemuUtils.py
index
a814763
..
7491c71
100644
(file)
--- a/
resources/libraries/python/QemuUtils.py
+++ b/
resources/libraries/python/QemuUtils.py
@@
-213,7
+213,7
@@
class QemuUtils:
self._params.add_with_value(
u"append", f"'ro rootfstype=9p rootflags=trans=virtio "
f"root=virtioroot console={self._opt.get(u'console')} "
self._params.add_with_value(
u"append", f"'ro rootfstype=9p rootflags=trans=virtio "
f"root=virtioroot console={self._opt.get(u'console')} "
- f"tsc=reliable hugepages=
256
"
+ f"tsc=reliable hugepages=
512
"
f"init={self._temp.get(u'ini')} fastboot'"
)
f"init={self._temp.get(u'ini')} fastboot'"
)
@@
-297,11
+297,12
@@
class QemuUtils:
vpp_config.add_unix_cli_listen()
vpp_config.add_unix_exec(running)
vpp_config.add_socksvr()
vpp_config.add_unix_cli_listen()
vpp_config.add_unix_exec(running)
vpp_config.add_socksvr()
- vpp_config.add_statseg_per_node_counters(value=u"on")
+ vpp_config.add_main_heap_size(u"512M")
+ vpp_config.add_main_heap_page_size(u"2M")
+ vpp_config.add_statseg_size(u"512M")
+ vpp_config.add_statseg_page_size(u"2M")
+ vpp_config.add_statseg_per_node_counters(u"on")
vpp_config.add_buffers_per_numa(107520)
vpp_config.add_buffers_per_numa(107520)
- vpp_config.add_heapsize(u"1G")
- vpp_config.add_ip_heap_size(u"1G")
- vpp_config.add_statseg_size(u"1G")
vpp_config.add_cpu_main_core(u"0")
if self._opt.get(u"smp") > 1:
vpp_config.add_cpu_corelist_workers(f"1-{self._opt.get(u'smp')-1}")
vpp_config.add_cpu_main_core(u"0")
if self._opt.get(u"smp") > 1:
vpp_config.add_cpu_corelist_workers(f"1-{self._opt.get(u'smp')-1}")
@@
-323,12
+324,11
@@
class QemuUtils:
vpp_config.add_plugin(u"enable", u"crypto_openssl_plugin.so")
if "nat" in self._opt.get(u'vnf'):
vpp_config.add_nat(value=u"endpoint-dependent")
vpp_config.add_plugin(u"enable", u"crypto_openssl_plugin.so")
if "nat" in self._opt.get(u'vnf'):
vpp_config.add_nat(value=u"endpoint-dependent")
- vpp_config.add_nat_max_translations_per_thread(value=655360)
vpp_config.add_plugin(u"enable", u"nat_plugin.so")
vpp_config.write_config(startup)
# Create VPP running configuration.
vpp_config.add_plugin(u"enable", u"nat_plugin.so")
vpp_config.write_config(startup)
# Create VPP running configuration.
- template = f"{Constants.RESOURCES_TPL
_VM}
/{self._opt.get(u'vnf')}.exec"
+ template = f"{Constants.RESOURCES_TPL
}/vm
/{self._opt.get(u'vnf')}.exec"
exec_cmd_no_error(self._node, f"rm -f {running}", sudo=True)
with open(template, u"rt") as src_file:
exec_cmd_no_error(self._node, f"rm -f {running}", sudo=True)
with open(template, u"rt") as src_file:
@@
-400,7
+400,7
@@
class QemuUtils:
:param kwargs: Key-value pairs to replace content of init startup file.
:type kwargs: dict
"""
:param kwargs: Key-value pairs to replace content of init startup file.
:type kwargs: dict
"""
- template = f"{Constants.RESOURCES_TPL
_VM}
/init.sh"
+ template = f"{Constants.RESOURCES_TPL
}/vm
/init.sh"
init = self._temp.get(u"ini")
exec_cmd_no_error(self._node, f"rm -f {init}", sudo=True)
init = self._temp.get(u"ini")
exec_cmd_no_error(self._node, f"rm -f {init}", sudo=True)