From 30c94055dd6ec2fe1cb83455cf6eb4bca8648d45 Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Wed, 18 Apr 2018 11:11:19 +0200 Subject: FIX: Memif tests failing - CSIT-1049 Change-Id: I073c1e6d8cdda835fbb955cbf79e982bc2cc6228 Signed-off-by: Peter Mikus --- resources/libraries/python/ContainerUtils.py | 3 +++ resources/libraries/python/Memif.py | 12 +++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) (limited to 'resources/libraries/python') diff --git a/resources/libraries/python/ContainerUtils.py b/resources/libraries/python/ContainerUtils.py index da9e93ae10..3bf3516e6d 100644 --- a/resources/libraries/python/ContainerUtils.py +++ b/resources/libraries/python/ContainerUtils.py @@ -305,6 +305,7 @@ class ContainerEngine(object): 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'): @@ -627,6 +628,8 @@ class Docker(ContainerEngine): 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))\ diff --git a/resources/libraries/python/Memif.py b/resources/libraries/python/Memif.py index e1f3d30d33..4a3186476f 100644 --- a/resources/libraries/python/Memif.py +++ b/resources/libraries/python/Memif.py @@ -72,6 +72,16 @@ class Memif(object): raise ValueError('Create Memif interface failed on node ' '{}'.format(node['host'])) + @staticmethod + def dump_memif(node): + """Dump Memif data for the given node. + + :param node: Given node to show Memif data on. + :type node: dict + """ + vat = VatExecutor() + vat.execute_script("memif_dump.vat", node, json_out=False) + @staticmethod def show_memif(node): """Show Memif data for the given node. @@ -80,7 +90,7 @@ class Memif(object): :type node: dict """ vat = VatExecutor() - vat.execute_script("memif_dump.vat", node, json_out=False) + vat.execute_script("show_memif.vat", node, json_out=False) @staticmethod def clear_memif_socks(node, *socks): -- cgit 1.2.3-korg