aboutsummaryrefslogtreecommitdiffstats
path: root/resources/libraries/python/Tap.py
diff options
context:
space:
mode:
authorJan Gelety <jgelety@cisco.com>2017-10-17 15:31:05 +0200
committerJan Gelety <jgelety@cisco.com>2017-11-10 11:37:38 +0000
commit7bfb36dfd9284bbca10881e31e14108c7d468b7c (patch)
tree2f02f2969bbd945863b741033e12c098107f1a17 /resources/libraries/python/Tap.py
parent3e231e67a7a88f14d147e74c7612f45670c999d6 (diff)
CSIT-843: Update actual topology in case of new/updated/deleted interface
Change-Id: I6adfe86bd0b9cdf3d194a1b871e52481c333d8e7 Signed-off-by: Jan Gelety <jgelety@cisco.com>
Diffstat (limited to 'resources/libraries/python/Tap.py')
-rw-r--r--resources/libraries/python/Tap.py72
1 files changed, 70 insertions, 2 deletions
diff --git a/resources/libraries/python/Tap.py b/resources/libraries/python/Tap.py
index 6c346860de..cf0ae215ed 100644
--- a/resources/libraries/python/Tap.py
+++ b/resources/libraries/python/Tap.py
@@ -15,6 +15,7 @@
from resources.libraries.python.VatExecutor import VatTerminal
from resources.libraries.python.InterfaceUtil import InterfaceUtil
+from resources.libraries.python.topology import Topology
class Tap(object):
@@ -30,7 +31,7 @@ class Tap(object):
:type node: dict
:type tap_name: str
:type mac: str
- :return: Returns a interface index.
+ :returns: Returns a interface index.
:rtype: int
"""
command = 'connect'
@@ -42,7 +43,17 @@ class Tap(object):
resp = vat.vat_terminal_exec_cmd_from_template('tap.vat',
tap_command=command,
tap_arguments=args)
- return resp[0]['sw_if_index']
+ sw_if_idx = resp[0]['sw_if_index']
+ if_key = Topology.add_new_port(node, 'tap')
+ Topology.update_interface_sw_if_index(node, if_key, sw_if_idx)
+ ifc_name = Tap.vpp_get_tap_interface_name(node, sw_if_idx)
+ Topology.update_interface_name(node, if_key, ifc_name)
+ if mac is None:
+ mac = Tap.vpp_get_tap_interface_mac(node, sw_if_idx)
+ Topology.update_interface_mac_address(node, if_key, mac)
+ Topology.update_interface_tap_dev_name(node, if_key, tap_name)
+
+ return sw_if_idx
@staticmethod
def modify_tap_interface(node, if_index, tap_name, mac=None):
@@ -69,6 +80,11 @@ class Tap(object):
resp = vat.vat_terminal_exec_cmd_from_template('tap.vat',
tap_command=command,
tap_arguments=args)
+ if_key = Topology.get_interface_by_sw_index(node, if_index)
+ Topology.update_interface_tap_dev_name(node, if_key, tap_name)
+ if mac:
+ Topology.update_interface_mac_address(node, if_key, mac)
+
return resp[0]['sw_if_index']
@staticmethod
@@ -90,6 +106,8 @@ class Tap(object):
if int(resp[0]['retval']) != 0:
raise RuntimeError(
'Could not remove tap interface: {}'.format(resp))
+ if_key = Topology.get_interface_sw_index(node, if_index)
+ Topology.remove_port(node, if_key)
@staticmethod
def check_tap_present(node, tap_name):
@@ -105,3 +123,53 @@ class Tap(object):
if len(tap_if) == 0:
raise RuntimeError(
'Tap interface :{} does not exist'.format(tap_name))
+
+ @staticmethod
+ def vpp_get_tap_interface_name(node, sw_if_idx):
+ """Get VPP tap interface name from hardware interfaces dump.
+
+ :param node: DUT node.
+ :param sw_if_idx: DUT node.
+ :type node: dict
+ :type sw_if_idx: int
+ :returns: VPP tap interface name.
+ :rtype: str
+ """
+ with VatTerminal(node, json_param=False) as vat:
+ response = vat.vat_terminal_exec_cmd_from_template(
+ 'show_hardware_detail.vat')
+
+ for line in str(response[0]).splitlines():
+ if line.startswith('tap-'):
+ line_split = line.split()
+ if line_split[1] == sw_if_idx:
+ return line_split[0]
+
+ return None
+
+ @staticmethod
+ def vpp_get_tap_interface_mac(node, sw_if_idx):
+ """Get tap interface MAC address from hardware interfaces dump.
+
+ :param node: DUT node.
+ :param sw_if_idx: DUT node.
+ :type node: dict
+ :type sw_if_idx: int
+ :returns: Tap interface MAC address.
+ :rtype: str
+ """
+ with VatTerminal(node, json_param=False) as vat:
+ response = vat.vat_terminal_exec_cmd_from_template(
+ 'show_hardware_detail.vat')
+
+ tap_if_match = False
+ for line in str(response[0]).splitlines():
+ if tap_if_match:
+ line_split = line.split()
+ return line_split[-1]
+ if line.startswith('tap-'):
+ line_split = line.split()
+ if line_split[1] == sw_if_idx:
+ tap_if_match = True
+
+ return None