aboutsummaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorJan Gelety <jgelety@cisco.com>2019-06-17 16:22:39 +0200
committerVratko Polak <vrpolak@cisco.com>2019-07-03 15:21:36 +0000
commit758d50dd77f6114b2d4fe0ca13d95ae111f7b110 (patch)
tree8bde97900e27d0ca660c79574952d0ef89174996 /resources
parent8d2d00733f4f690c318558739a1290d1893dbc6d (diff)
FIX: use len parameter name in prefix structure in ip_route_add_del
+ new vpp stabel build with fixed ipv6 address incrementation Change-Id: Id3f4104a48e45b6fd70ccbd47ad9e3c6925220fd Signed-off-by: Jan Gelety <jgelety@cisco.com>
Diffstat (limited to 'resources')
-rw-r--r--resources/libraries/python/IPUtil.py140
1 files changed, 93 insertions, 47 deletions
diff --git a/resources/libraries/python/IPUtil.py b/resources/libraries/python/IPUtil.py
index 7f2335330e..0c4356bb64 100644
--- a/resources/libraries/python/IPUtil.py
+++ b/resources/libraries/python/IPUtil.py
@@ -15,11 +15,8 @@
import re
-from socket import AF_INET, AF_INET6, inet_pton
-
from enum import IntEnum
-from ipaddress import ip_address
-from ipaddress import IPv4Network, IPv6Network
+from ipaddress import ip_address, IPv4Network, IPv6Network
from resources.libraries.python.Constants import Constants
from resources.libraries.python.InterfaceUtil import InterfaceUtil
@@ -145,6 +142,19 @@ class IPUtil(object):
return data
@staticmethod
+ def vpp_get_ip_tables(node):
+ """Get dump of all IP FIB tables on a VPP node.
+
+ :param node: VPP node.
+ :type node: dict
+ """
+
+ PapiExecutor.run_cli_cmd(node, 'show ip fib')
+ PapiExecutor.run_cli_cmd(node, 'show ip fib summary')
+ PapiExecutor.run_cli_cmd(node, 'show ip6 fib')
+ PapiExecutor.run_cli_cmd(node, 'show ip6 fib summary')
+
+ @staticmethod
def get_interface_vrf_table(node, interface, ip_version='ipv4'):
"""Get vrf ID for the given interface.
@@ -387,8 +397,7 @@ class IPUtil(object):
del_all=0,
address_length=int(prefix_length) if prefix_length else 128
if ip_addr.version == 6 else 32,
- address=inet_pton(
- AF_INET6 if ip_addr.version == 6 else AF_INET, str(ip_addr)))
+ address=ip_addr.packed)
err_msg = 'Failed to add IP address on interface {ifc}'.format(
ifc=interface)
with PapiExecutor(node) as papi_exec:
@@ -426,8 +435,20 @@ class IPUtil(object):
verify_reply(err_msg=err_msg)
@staticmethod
- def vpp_route_add(node, network, prefix_len, **kwargs):
- """Add route to the VPP node.
+ def union_addr(ip_addr):
+ """Creates union IP address.
+
+ :param ip_addr: IPv4 or IPv6 address.
+ :type ip_addr: IPv4Address or IPv6Address
+ :returns: Union IP address.
+ :rtype: dict
+ """
+ return dict(ip6=ip_addr.packed) if ip_addr.version == 6 \
+ else dict(ip4=ip_addr.packed)
+
+ @staticmethod
+ def compose_vpp_route_structure(node, network, prefix_len, **kwargs):
+ """Create route object for ip_route_add_del api call.
:param node: VPP node.
:param network: Route destination network address.
@@ -448,52 +469,27 @@ class IPUtil(object):
:type network: str
:type prefix_len: int
:type kwargs: dict
+ :returns: route parameter basic structure
+ :rtype: dict
"""
- count = kwargs.get("count", 1)
-
- if count > 100:
- gateway = kwargs.get("gateway", '')
-
- vrf = kwargs.get("vrf", None)
- multipath = kwargs.get("multipath", False)
-
- with VatTerminal(node, json_param=False) as vat:
- vat.vat_terminal_exec_cmd_from_template(
- 'vpp_route_add.vat',
- network=network,
- prefix_length=prefix_len,
- via='via {}'.format(gateway) if gateway else '',
- vrf='vrf {}'.format(vrf) if vrf else '',
- count='count {}'.format(count) if count else '',
- multipath='multipath' if multipath else '')
- return
-
interface = kwargs.get('interface', '')
gateway = kwargs.get('gateway', '')
net_addr = ip_address(unicode(network))
- def union_addr(ip_addr):
- """Creates union IP address.
-
- :param ip_addr: IPv4 or IPv6 address.
- :type ip_addr: IPv4Address or IPv6Address
- :returns: Union IP address.
- :rtype: dict
- """
- return dict(ip6=inet_pton(AF_INET6, str(ip_addr))) \
- if ip_addr.version == 6 \
- else dict(ip4=inet_pton(AF_INET, str(ip_addr)))
-
addr = dict(
af=getattr(
AddressFamily, 'ADDRESS_IP6' if net_addr.version == 6
- else 'ADDRESS_IP4').value)
- prefix = dict(address_length=int(prefix_len))
+ else 'ADDRESS_IP4').value,
+ un=None)
+ prefix = dict(
+ len=int(prefix_len),
+ address=addr)
paths = list()
n_hop = dict(
- address=union_addr(ip_address(unicode(gateway))) if gateway else 0,
+ address=IPUtil.union_addr(ip_address(unicode(gateway))) if gateway
+ else 0,
via_label=MPLS_LABEL_INVALID,
obj_id=Constants.BITWISE_NON_ZERO)
path = dict(
@@ -519,22 +515,72 @@ class IPUtil(object):
route = dict(
table_id=int(kwargs.get('vrf', 0)),
+ prefix=prefix,
n_paths=len(paths),
paths=paths)
+
+ return route
+
+ @staticmethod
+ def vpp_route_add(node, network, prefix_len, **kwargs):
+ """Add route to the VPP node.
+
+ :param node: VPP node.
+ :param network: Route destination network address.
+ :param prefix_len: Route destination network prefix length.
+ :param kwargs: Optional key-value arguments:
+
+ gateway: Route gateway address. (str)
+ interface: Route interface. (str)
+ vrf: VRF table ID. (int)
+ count: number of IP addresses to add starting from network IP (int)
+ local: The route is local with same prefix (increment is 1).
+ If None, then is not used. (bool)
+ lookup_vrf: VRF table ID for lookup. (int)
+ multipath: Enable multipath routing. (bool)
+ weight: Weight value for unequal cost multipath routing. (int)
+
+ :type node: dict
+ :type network: str
+ :type prefix_len: int
+ :type kwargs: dict
+ """
+ count = kwargs.get("count", 1)
+
+ if count > 100:
+ gateway = kwargs.get("gateway", '')
+
+ vrf = kwargs.get("vrf", None)
+ multipath = kwargs.get("multipath", False)
+
+ with VatTerminal(node, json_param=False) as vat:
+ vat.vat_terminal_exec_cmd_from_template(
+ 'vpp_route_add.vat',
+ network=network,
+ prefix_length=prefix_len,
+ via='via {}'.format(gateway) if gateway else '',
+ vrf='vrf {}'.format(vrf) if vrf else '',
+ count='count {}'.format(count) if count else '',
+ multipath='multipath' if multipath else '')
+ return
+
+ net_addr = ip_address(unicode(network))
cmd = 'ip_route_add_del'
+ route = IPUtil.compose_vpp_route_structure(
+ node, network, prefix_len, **kwargs)
args = dict(
is_add=1,
- is_multipath=int(kwargs.get('multipath', False)))
+ is_multipath=int(kwargs.get('multipath', False)),
+ route=route)
err_msg = 'Failed to add route(s) on host {host}'.format(
host=node['host'])
with PapiExecutor(node) as papi_exec:
for i in xrange(kwargs.get('count', 1)):
- addr['un'] = union_addr(net_addr + i)
- prefix['address'] = addr
- route['prefix'] = prefix
+ args['route']['prefix']['address']['un'] = \
+ IPUtil.union_addr(net_addr + i)
history = False if 1 < i < kwargs.get('count', 1) else True
- papi_exec.add(cmd, history=history, route=route, **args)
+ papi_exec.add(cmd, history=history, **args)
if i > 0 and i % Constants.PAPI_MAX_API_BULK == 0:
papi_exec.get_replies(err_msg).verify_replies(
err_msg=err_msg)