aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpmikus <pmikus@cisco.com>2016-09-19 15:02:32 +0100
committerPeter Mikus <pmikus@cisco.com>2016-09-22 04:20:05 +0000
commit356fc1c76a96f50ca9caebd0ec7a023bf6d5f99b (patch)
tree866c255f160c2699bacd66f71bf52d3daf7327be
parent27995a1fceb0b894c1647f559608d6bf04bd68af (diff)
CSIT-411 Show Vhost User
- Add keyword to show vhost user Change-Id: Ia844bbcb8507b8c7cbf6b7bb1a7dc8d10148d6f4 Signed-off-by: pmikus <pmikus@cisco.com>
-rw-r--r--resources/libraries/python/VhostUser.py11
-rw-r--r--resources/libraries/robot/default.robot6
-rw-r--r--resources/templates/vat/show_vhost.vat1
-rw-r--r--tests/perf/Long_Bridge_Domain_Vhost_Intel-X520-DA2.robot1
-rw-r--r--tests/perf/Long_IPv4_Vhost_Intel-X520-DA2.robot1
-rw-r--r--tests/perf/Long_Xconnect_Vhost_Intel-X520-DA2.robot1
6 files changed, 21 insertions, 0 deletions
diff --git a/resources/libraries/python/VhostUser.py b/resources/libraries/python/VhostUser.py
index 020df6100e..385d0f24cc 100644
--- a/resources/libraries/python/VhostUser.py
+++ b/resources/libraries/python/VhostUser.py
@@ -75,3 +75,14 @@ class VhostUser(object):
return ':'.join("%02x" % (b) for b in iface["l2_address"][:6])
return None
+
+ @staticmethod
+ def vpp_show_vhost(node):
+ """Get vhost-user data for the given node.
+
+ :param node: VPP node to get interface data from.
+ :type node: dict
+ :return: nothing
+ """
+ vat = VatExecutor()
+ vat.execute_script("show_vhost.vat", node, json_out=False)
diff --git a/resources/libraries/robot/default.robot b/resources/libraries/robot/default.robot
index 714bf3a251..4764bf629e 100644
--- a/resources/libraries/robot/default.robot
+++ b/resources/libraries/robot/default.robot
@@ -49,6 +49,12 @@
| | | Vpp api trace save | ${nodes['${dut}']}
| | | Vpp api trace dump | ${nodes['${dut}']}
+| Show Vpp Vhost On All DUTs
+| | [Documentation] | Show Vhost User on all DUTs
+| | ${duts}= | Get Matches | ${nodes} | DUT*
+| | :FOR | ${dut} | IN | @{duts}
+| | | Vpp Show Vhost | ${nodes['${dut}']}
+
| Add '${m}' worker threads and rxqueues '${n}' in 3-node single-link topo
| | [Documentation] | Setup M worker threads and N rxqueues in vpp startup
| | ... | configuration on all DUTs in 3-node single-link topology.
diff --git a/resources/templates/vat/show_vhost.vat b/resources/templates/vat/show_vhost.vat
new file mode 100644
index 0000000000..95b4be0356
--- /dev/null
+++ b/resources/templates/vat/show_vhost.vat
@@ -0,0 +1 @@
+exec show vhost
diff --git a/tests/perf/Long_Bridge_Domain_Vhost_Intel-X520-DA2.robot b/tests/perf/Long_Bridge_Domain_Vhost_Intel-X520-DA2.robot
index 6da998c976..45a66ef138 100644
--- a/tests/perf/Long_Bridge_Domain_Vhost_Intel-X520-DA2.robot
+++ b/tests/perf/Long_Bridge_Domain_Vhost_Intel-X520-DA2.robot
@@ -27,6 +27,7 @@
| ... | Traffic should pass with no loss | 10
| ... | ${min_rate}pps | ${framesize} | 3-node-bridge
| ... | fail_on_loss=${False}
+| ... | AND | Show Vpp Vhost On All DUTs
| ... | AND | Remove startup configuration of VPP from all DUTs
| ... | AND | Guest VM with dpdk-testpmd Teardown | ${dut1}
| ... | ${dut1_vm_refs}
diff --git a/tests/perf/Long_IPv4_Vhost_Intel-X520-DA2.robot b/tests/perf/Long_IPv4_Vhost_Intel-X520-DA2.robot
index 74072f9896..dc8361324e 100644
--- a/tests/perf/Long_IPv4_Vhost_Intel-X520-DA2.robot
+++ b/tests/perf/Long_IPv4_Vhost_Intel-X520-DA2.robot
@@ -27,6 +27,7 @@
| ... | Traffic should pass with no loss | 10
| ... | ${min_rate}pps | ${framesize} | 3-node-IPv4
| ... | fail_on_loss=${False}
+| ... | AND | Show Vpp Vhost On All DUTs
| ... | AND | Remove startup configuration of VPP from all DUTs
| ... | AND | Guest VM with dpdk-testpmd Teardown | ${dut1}
| ... | ${dut1_vm_refs}
diff --git a/tests/perf/Long_Xconnect_Vhost_Intel-X520-DA2.robot b/tests/perf/Long_Xconnect_Vhost_Intel-X520-DA2.robot
index a408852f08..49df14e471 100644
--- a/tests/perf/Long_Xconnect_Vhost_Intel-X520-DA2.robot
+++ b/tests/perf/Long_Xconnect_Vhost_Intel-X520-DA2.robot
@@ -27,6 +27,7 @@
| ... | Traffic should pass with no loss | 10
| ... | ${min_rate}pps | ${framesize} | 3-node-bridge
| ... | fail_on_loss=${False}
+| ... | AND | Show Vpp Vhost On All DUTs
| ... | AND | Remove startup configuration of VPP from all DUTs
| ... | AND | Guest VM with dpdk-testpmd Teardown | ${dut1}
| ... | ${dut1_vm_refs}