Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Use interface key instead of interface name.
[csit.git]
/
resources
/
libraries
/
python
/
IPUtil.py
diff --git
a/resources/libraries/python/IPUtil.py
b/resources/libraries/python/IPUtil.py
index
e364e60
..
323c75b
100644
(file)
--- a/
resources/libraries/python/IPUtil.py
+++ b/
resources/libraries/python/IPUtil.py
@@
-17,30
+17,42
@@
from ipaddress import IPv4Network
from resources.libraries.python.ssh import SSH
from resources.libraries.python.constants import Constants
from resources.libraries.python.ssh import SSH
from resources.libraries.python.constants import Constants
+from resources.libraries.python.topology import Topology
class IPUtil(object):
"""Common IP utilities"""
@staticmethod
class IPUtil(object):
"""Common IP utilities"""
@staticmethod
- def vpp_ip_probe(node, interface, addr):
+ def vpp_ip_probe(node, interface, addr
, if_type="key"
):
"""Run ip probe on VPP node.
:param node: VPP node.
"""Run ip probe on VPP node.
:param node: VPP node.
- :param interface: Interface name.
+ :param interface: Interface
key or
name.
:param addr: IPv4/IPv6 address.
:param addr: IPv4/IPv6 address.
+ :param if_type: Interface type
:type node: dict
:type interface: str
:type addr: str
:type node: dict
:type interface: str
:type addr: str
+ :type if_type: str
+ :raises ValueError: If the if_type is unknown.
+ :raises Exception: If vpp probe fails.
"""
ssh = SSH()
ssh.connect(node)
"""
ssh = SSH()
ssh.connect(node)
+ if if_type == "key":
+ iface_name = Topology.get_interface_name(node, interface)
+ elif if_type == "name":
+ iface_name = interface
+ else:
+ raise ValueError("if_type unknown: {}".format(if_type))
+
cmd = "{c}".format(c=Constants.VAT_BIN_NAME)
cmd = "{c}".format(c=Constants.VAT_BIN_NAME)
- cmd_input = 'exec ip probe {dev} {ip}'.format(dev=i
nterfac
e, ip=addr)
+ cmd_input = 'exec ip probe {dev} {ip}'.format(dev=i
face_nam
e, ip=addr)
(ret_code, _, _) = ssh.exec_command_sudo(cmd, cmd_input)
if int(ret_code) != 0:
raise Exception('VPP ip probe {dev} {ip} failed on {h}'.format(
(ret_code, _, _) = ssh.exec_command_sudo(cmd, cmd_input)
if int(ret_code) != 0:
raise Exception('VPP ip probe {dev} {ip} failed on {h}'.format(
- dev=i
nterfac
e, ip=addr, h=node['host']))
+ dev=i
face_nam
e, ip=addr, h=node['host']))
def convert_ipv4_netmask_prefix(network):
def convert_ipv4_netmask_prefix(network):