CSIT-366 IPv4dp - baseline vhost-user

- Add test cases for vhost-user testing with
  NIC(X520)-to-VM(testpmd,virtio)

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

2 files changed, 30 insertions, 1 deletions

diff --git a/resources/libraries/python/DpdkUtil.py b/resources/libraries/python/DpdkUtil.py
index 5eea0d6c26..e7727c1101 100644
--- a/resources/libraries/python/DpdkUtil.py
+++ b/resources/libraries/python/DpdkUtil.py
@@ -62,6 +62,11 @@ class DpdkUtil(object):
         # Disable RSS (Receive Side Scaling).
         pmd_disable_rss = '--disable-rss '\
             if args.get('pmd_disable_rss', '') else ''
+        # Set the MAC address XX:XX:XX:XX:XX:XX of the peer port N
+        pmd_eth_peer_0 = '--eth-peer={} '.format(args['pmd_eth_peer_0'])\
+            if args.get('pmd_eth_peer_0', '') else ''
+        pmd_eth_peer_1 = '--eth-peer={} '.format(args['pmd_eth_peer_1'])\
+            if args.get('pmd_eth_peer_1', '') else ''
         # Set the hexadecimal bitmask of the cores running forwarding. Master
         # lcore=0 is reserved, so highest bit is set to 0.
         pmd_coremask = '--coremask={} '.format(\
@@ -86,6 +91,8 @@ class DpdkUtil(object):
             + pmd_portmask\
             + pmd_disable_hw_vlan\
             + pmd_disable_rss\
+            + pmd_eth_peer_0\
+            + pmd_eth_peer_1\
             + pmd_coremask\
             + pmd_nb_cores
         ssh = SSH()
diff --git a/resources/libraries/python/VhostUser.py b/resources/libraries/python/VhostUser.py
index 1a311e03fc..020df6100e 100644
--- a/resources/libraries/python/VhostUser.py
+++ b/resources/libraries/python/VhostUser.py
@@ -13,7 +13,7 @@
 
 """Vhost-user interfaces library."""
 
-from resources.libraries.python.VatExecutor import VatExecutor
+from resources.libraries.python.VatExecutor import VatExecutor, VatTerminal
 
 
 class VhostUser(object):
@@ -53,3 +53,25 @@ class VhostUser(object):
             if interface.get('socket') == socket:
                 return interface.get('name')
         return None
+
+    @staticmethod
+    def get_vhost_user_mac_by_sw_index(node, sw_if_index):
+        """Get Vhost-user l2_address for the given interface from actual
+        interface dump.
+
+        :param node: VPP node to get interface data from.
+        :param sw_if_index: Idx of the specific interface.
+        :type node: dict
+        :type sw_if_index: str
+        :return: l2_address of the given interface.
+        :rtype: str
+        """
+
+        with VatTerminal(node) as vat:
+            if_data = vat.vat_terminal_exec_cmd_from_template(
+                "interface_dump.vat")
+        for iface in if_data[0]:
+            if iface["sw_if_index"] == sw_if_index:
+                return ':'.join("%02x" % (b) for b in iface["l2_address"][:6])
+
+        return None