aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpmikus <pmikus@cisco.com>2016-06-13 12:36:54 +0100
committerMiroslav Miklus <mmiklus@cisco.com>2016-06-14 14:21:03 +0000
commit244693d43a5d4a2b8ac3fa7dfcb659b2135743d9 (patch)
treef221e967112fd1c234071a32fe9c95d760fa0ea7
parent23d5e7c58dff725043bf15d2099e2e168050f256 (diff)
CSIT-163: Add show vpp version verbose
- Add output of vpp version verbose Change-Id: Ia74b97be4636d55b115246d495a5d6eea0a94bb7 Signed-off-by: pmikus <pmikus@cisco.com>
-rw-r--r--resources/libraries/python/DUTSetup.py11
-rw-r--r--resources/libraries/robot/default.robot6
-rw-r--r--resources/libraries/robot/performance.robot2
-rw-r--r--resources/templates/vat/show_version_verbose.vat1
4 files changed, 20 insertions, 0 deletions
diff --git a/resources/libraries/python/DUTSetup.py b/resources/libraries/python/DUTSetup.py
index a0a48708b7..4731063fba 100644
--- a/resources/libraries/python/DUTSetup.py
+++ b/resources/libraries/python/DUTSetup.py
@@ -16,6 +16,7 @@ from robot.api import logger
from resources.libraries.python.topology import NodeType
from resources.libraries.python.ssh import SSH
from resources.libraries.python.constants import Constants
+from resources.libraries.python.VatExecutor import VatExecutor
class DUTSetup(object):
@@ -35,6 +36,16 @@ class DUTSetup(object):
format(node['host']))
@staticmethod
+ def vpp_show_version_verbose(node):
+ """Run "show version verbose" CLI command.
+
+ :param node: Node to run command on.
+ :type node: dict
+ """
+ vat = VatExecutor()
+ vat.execute_script("show_version_verbose.vat", node, json_out=False)
+
+ @staticmethod
def setup_all_duts(nodes):
"""Prepare all DUTs in given topology for test execution."""
for node in nodes.values():
diff --git a/resources/libraries/robot/default.robot b/resources/libraries/robot/default.robot
index fb9a70dfe0..2b116f5a7a 100644
--- a/resources/libraries/robot/default.robot
+++ b/resources/libraries/robot/default.robot
@@ -28,6 +28,12 @@
| | [Documentation] | Prepare all TGs before traffic scripts execution
| | All TGs Set Interface Default Driver | ${nodes}
+| Show vpp version on all DUTs
+| | [Documentation] | Show VPP version verbose on all DUTs
+| | ${duts}= | Get Matches | ${nodes} | DUT*
+| | :FOR | ${dut} | IN | @{duts}
+| | | Vpp show version verbose | ${nodes['${dut}']}
+
| Add '${m}' worker threads and rxqueues '${n}' without HTT to all DUTs
| | [Documentation] | Setup M worker threads without HTT and rxqueues N in
| | ... | startup configuration of VPP to all DUTs
diff --git a/resources/libraries/robot/performance.robot b/resources/libraries/robot/performance.robot
index 6c99e1d5aa..347e1f0320 100644
--- a/resources/libraries/robot/performance.robot
+++ b/resources/libraries/robot/performance.robot
@@ -194,6 +194,7 @@
| | [Arguments] | ${topology_type}
| | Setup default startup configuration of VPP on all DUTs
| | Update All Interface Data On All Nodes | ${nodes}
+| | Show vpp version on all DUTs
| | Setup performance rate Variables
| | Setup performance global Variables
| | 3-node circular Topology Variables Setup
@@ -206,6 +207,7 @@
| | [Arguments] | ${topology_type} | ${nic_model}
| | Setup default startup configuration of VPP on all DUTs
| | Update All Interface Data On All Nodes | ${nodes}
+| | Show vpp version on all DUTs
| | Setup performance rate Variables
| | Setup performance global Variables
| | 3-node circular Topology Variables Setup with DUT interface model
diff --git a/resources/templates/vat/show_version_verbose.vat b/resources/templates/vat/show_version_verbose.vat
new file mode 100644
index 0000000000..0e3b1cb8be
--- /dev/null
+++ b/resources/templates/vat/show_version_verbose.vat
@@ -0,0 +1 @@
+exec show version verbose