Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
CSIT-1009: SRv6 proxy tests
[csit.git]
/
resources
/
libraries
/
python
/
ContainerUtils.py
diff --git
a/resources/libraries/python/ContainerUtils.py
b/resources/libraries/python/ContainerUtils.py
index
da3d705
..
4b89104
100644
(file)
--- a/
resources/libraries/python/ContainerUtils.py
+++ b/
resources/libraries/python/ContainerUtils.py
@@
-156,6
+156,12
@@
class ContainerManager(object):
self.engine.install_vpp()
self.engine.restart_vpp()
self.engine.install_vpp()
self.engine.restart_vpp()
+ def restart_vpp_in_all_containers(self):
+ """Restart VPP on all containers."""
+ for container in self.containers:
+ self.engine.container = self.containers[container]
+ self.engine.restart_vpp()
+
def configure_vpp_in_all_containers(self, vat_template_file):
"""Configure VPP in all containers.
def configure_vpp_in_all_containers(self, vat_template_file):
"""Configure VPP in all containers.
@@
-305,6
+311,7
@@
class ContainerEngine(object):
def restart_vpp(self):
"""Restart VPP service inside a container."""
self.execute('supervisorctl restart vpp')
def restart_vpp(self):
"""Restart VPP service inside a container."""
self.execute('supervisorctl restart vpp')
+ self.execute('cat /tmp/supervisord.log')
def create_vpp_startup_config(self,
config_filename='/etc/vpp/startup.conf'):
def create_vpp_startup_config(self,
config_filename='/etc/vpp/startup.conf'):
@@
-327,8
+334,7
@@
class ContainerEngine(object):
if cpuset_cpus:
corelist_workers = ','.join(str(cpu) for cpu in cpuset_cpus)
vpp_config.add_cpu_corelist_workers(corelist_workers)
if cpuset_cpus:
corelist_workers = ','.join(str(cpu) for cpu in cpuset_cpus)
vpp_config.add_cpu_corelist_workers(corelist_workers)
- vpp_config.add_plugin('disable', 'default')
- vpp_config.add_plugin('enable', 'memif_plugin.so')
+ vpp_config.add_plugin('disable', 'dpdk_plugin.so')
self.execute('mkdir -p /etc/vpp/')
self.execute('echo "{c}" | tee {f}'
self.execute('mkdir -p /etc/vpp/')
self.execute('echo "{c}" | tee {f}'
@@
-628,6
+634,8
@@
class Docker(ContainerEngine):
cpuset_mems = '--cpuset-mems={0}'.format(self.container.cpuset_mems)\
if self.container.cpuset_mems is not None else ''
cpuset_mems = '--cpuset-mems={0}'.format(self.container.cpuset_mems)\
if self.container.cpuset_mems is not None else ''
+ # Temporary workaround - disabling due to bug in memif
+ cpuset_mems = ''
env = '{0}'.format(
' '.join('--env %s' % env for env in self.container.env))\
env = '{0}'.format(
' '.join('--env %s' % env for env in self.container.env))\