CSIT-163: Add show vpp version verbose

- Add output of vpp version verbose

Change-Id: Ia74b97be4636d55b115246d495a5d6eea0a94bb7
Signed-off-by: pmikus <pmikus@cisco.com>

diff --git a/resources/libraries/python/DUTSetup.py b/resources/libraries/python/DUTSetup.py
index a0a4870..4731063 100644 (file)
--- 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.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):
 
 
 class DUTSetup(object):


@@ -34,6 +35,16 @@ class DUTSetup(object):
                     raise Exception('DUT {0} failed to start VPP service'.
                                     format(node['host']))
 
                     raise Exception('DUT {0} failed to start VPP service'.
                                     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."""
     @staticmethod
     def setup_all_duts(nodes):
         """Prepare all DUTs in given topology for test execution."""

diff --git a/resources/libraries/robot/default.robot b/resources/libraries/robot/default.robot
index fb9a70d..2b116f5 100644 (file)
--- 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}
 
 | | [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
 | 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 6c99e1d..347e1f0 100644 (file)
--- 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}
 | | [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
 | | 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}
 | | [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
 | | 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 (file)
index 0000000..0e3b1cb
--- /dev/null
+++ b/resources/templates/vat/show_version_verbose.vat
@@ -0,0 +1 @@
+exec show version verbose