aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Mikus <pmikus@cisco.com>2018-04-18 11:11:19 +0200
committerPeter Mikus <pmikus@cisco.com>2018-04-19 06:12:05 +0000
commit4b13f0271a3fa5194ad5161795d83d1ac776aec1 (patch)
tree94cbab1bab3f1cf656ee5aefbfac344e6e1ef462
parentbb8cb34ad012c2ea67f10b9d8f06c5620e20cafc (diff)
FIX: Memif tests failing
- CSIT-1049 Change-Id: I073c1e6d8cdda835fbb955cbf79e982bc2cc6228 Signed-off-by: Peter Mikus <pmikus@cisco.com> (cherry picked from commit 30c94055dd6ec2fe1cb83455cf6eb4bca8648d45) (cherry picked from commit 04cf5c92a82b11f8eb2cafc3a07793474e84a322)
-rw-r--r--resources/libraries/python/ContainerUtils.py3
-rw-r--r--resources/libraries/python/Memif.py12
-rw-r--r--resources/libraries/robot/performance/performance_configuration.robot7
-rw-r--r--resources/templates/vat/show_memif.vat1
4 files changed, 21 insertions, 2 deletions
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
@@ -73,6 +73,16 @@ class Memif(object):
'{}'.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):
diff --git a/resources/libraries/robot/performance/performance_configuration.robot b/resources/libraries/robot/performance/performance_configuration.robot
index 47d6109cf1..35999d5304 100644
--- a/resources/libraries/robot/performance/performance_configuration.robot
+++ b/resources/libraries/robot/performance/performance_configuration.robot
@@ -2169,6 +2169,9 @@
| | | ... | ${dut1} | ${dut1-memif-${number}-if2} | ${dut1_if2}
| | | Run Keyword If | ${number}==${nr} | Configure L2XC
| | | ... | ${dut2} | ${dut2-memif-${number}-if2} | ${dut2_if2}
+| | ${duts}= | Get Matches | ${nodes} | DUT*
+| | :FOR | ${dut} | IN | @{duts}
+| | | Show Memif | ${nodes['${dut}']}
| Initialize L2 Bridge Domain for '${nr}' memif pairs in 3-node circular topology
| | [Documentation]
@@ -2213,4 +2216,6 @@
| | | ... | ${dut2-memif-${number}-if1} | ${number}
| | | Add interface to bridge domain | ${dut2}
| | | ... | ${dut2-memif-${number}-if2} | ${bd_id2}
-
+| | ${duts}= | Get Matches | ${nodes} | DUT*
+| | :FOR | ${dut} | IN | @{duts}
+| | | Show Memif | ${nodes['${dut}']}
diff --git a/resources/templates/vat/show_memif.vat b/resources/templates/vat/show_memif.vat
new file mode 100644
index 0000000000..9c64260b11
--- /dev/null
+++ b/resources/templates/vat/show_memif.vat
@@ -0,0 +1 @@
+exec show memif