097fa66b98
Enhance the route add/del APIs to take a set of paths rather than just one.
Most unicast routing protocols calcualte all the available paths in one
run of the algorithm so updating all the paths at once is beneficial for the client.
two knobs control the behaviour:
is_multipath - if set the the set of paths passed will be added to those
that already exist, otherwise the set will replace them.
is_add - add or remove the set
is_add=0, is_multipath=1 and an empty set, results in deleting the route.
It is also considerably faster to add multiple paths at once, than one at a time:
vat# ip_add_del_route 1.1.1.1/32 count 100000 multipath via 10.10.10.11
100000 routes in .572240 secs, 174751.80 routes/sec
vat# ip_add_del_route 1.1.1.1/32 count 100000 multipath via 10.10.10.12
100000 routes in .528383 secs, 189256.54 routes/sec
vat# ip_add_del_route 1.1.1.1/32 count 100000 multipath via 10.10.10.13
100000 routes in .757131 secs, 132077.52 routes/sec
vat# ip_add_del_route 1.1.1.1/32 count 100000 multipath via 10.10.10.14
100000 routes in .878317 secs, 113854.12 routes/sec
vat# ip_route_add_del 1.1.1.1/32 count 100000 multipath via 10.10.10.11 via 10.10.10.12 via 10.10.10.13 via 10.10.10.14
100000 routes in .900212 secs, 111084.93 routes/sec
Change-Id: I416b93f7684745099c1adb0b33edac58c9339c1a
Signed-off-by: Neale Ranns <neale.ranns@cisco.com>
Signed-off-by: Ole Troan <ot@cisco.com>
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
154 lines
4.5 KiB
Python
154 lines
4.5 KiB
Python
import socket
|
|
|
|
import six
|
|
|
|
from vpp_object import VppObject
|
|
|
|
|
|
class MEMIF_ROLE:
|
|
MASTER = 0
|
|
SLAVE = 1
|
|
|
|
|
|
class MEMIF_MODE:
|
|
ETHERNET = 0
|
|
IP = 1
|
|
PUNT_INJECT = 2
|
|
|
|
|
|
def get_if_dump(dump, sw_if_index):
|
|
for d in dump:
|
|
if (d.sw_if_index == sw_if_index):
|
|
return d
|
|
|
|
|
|
def query_all_memif_vpp_config(_test):
|
|
return _test.vapi.memif_dump()
|
|
|
|
|
|
def remove_all_memif_vpp_config(_test):
|
|
dump = _test.vapi.memif_dump()
|
|
for d in dump:
|
|
_test.vapi.memif_delete(d.sw_if_index)
|
|
dump = _test.vapi.memif_socket_filename_dump()
|
|
for d in dump:
|
|
if d.socket_id != 0:
|
|
_test.vapi.memif_socket_filename_add_del(
|
|
0, d.socket_id, d.socket_filename)
|
|
|
|
|
|
class VppSocketFilename(VppObject):
|
|
def __init__(self, test, socket_id, socket_filename,
|
|
add_default_folder=False):
|
|
self._test = test
|
|
self.socket_id = socket_id
|
|
self.socket_filename = socket_filename
|
|
|
|
# if True insert default socket folder before socket filename,
|
|
# after adding vpp config
|
|
self.add_default_folder = add_default_folder
|
|
|
|
def add_vpp_config(self):
|
|
rv = self._test.vapi.memif_socket_filename_add_del(
|
|
1, self.socket_id, self.socket_filename)
|
|
if self.add_default_folder:
|
|
self.socket_filename = b"%s/%s" % (
|
|
six.ensure_binary(self._test.tempdir, encoding='utf-8'),
|
|
self.socket_filename)
|
|
return rv
|
|
|
|
def remove_vpp_config(self):
|
|
return self._test.vapi.memif_socket_filename_add_del(
|
|
0, self.socket_id, self.socket_filename)
|
|
|
|
def query_vpp_config(self):
|
|
return self._test.vapi.memif_socket_filename_dump()
|
|
|
|
def object_id(self):
|
|
return "socket-filename-%d-%s" % (self.socket_id, self.socket_filename)
|
|
|
|
|
|
class VppMemif(VppObject):
|
|
def __init__(self, test, role, mode, rx_queues=0, tx_queues=0, if_id=0,
|
|
socket_id=0, secret="", ring_size=0, buffer_size=0,
|
|
hw_addr=""):
|
|
self._test = test
|
|
self.role = role
|
|
self.mode = mode
|
|
self.rx_queues = rx_queues
|
|
self.tx_queues = tx_queues
|
|
self.if_id = if_id
|
|
self.socket_id = socket_id
|
|
self.secret = secret
|
|
self.ring_size = ring_size
|
|
self.buffer_size = buffer_size
|
|
self.hw_addr = hw_addr
|
|
self.sw_if_index = None
|
|
self.ip4_addr = "192.168.%d.%d" % (self.if_id + 1, self.role + 1)
|
|
self.ip4_addr_len = 24
|
|
|
|
def add_vpp_config(self):
|
|
rv = self._test.vapi.memif_create(
|
|
role=self.role,
|
|
mode=self.mode,
|
|
rx_queues=self.rx_queues,
|
|
tx_queues=self.tx_queues,
|
|
id=self.if_id,
|
|
socket_id=self.socket_id,
|
|
secret=self.secret,
|
|
ring_size=self.ring_size,
|
|
buffer_size=self.buffer_size,
|
|
hw_addr=self.hw_addr)
|
|
try:
|
|
self.sw_if_index = 0
|
|
except AttributeError:
|
|
raise AttributeError('self: %s' % self.__dict__)
|
|
try:
|
|
self.sw_if_index = rv.sw_if_index
|
|
except AttributeError:
|
|
raise AttributeError("%s %s", self, rv)
|
|
|
|
return self.sw_if_index
|
|
|
|
def admin_up(self):
|
|
if self.sw_if_index:
|
|
return self._test.vapi.sw_interface_set_flags(self.sw_if_index, 1)
|
|
|
|
def admin_down(self):
|
|
if self.sw_if_index:
|
|
return self._test.vapi.sw_interface_set_flags(self.sw_if_index, 0)
|
|
|
|
def wait_for_link_up(self, timeout, step=1):
|
|
if not self.sw_if_index:
|
|
return False
|
|
while True:
|
|
dump = self.query_vpp_config()
|
|
if dump.link_up_down == 1:
|
|
return True
|
|
self._test.sleep(step)
|
|
timeout -= step
|
|
if timeout <= 0:
|
|
return False
|
|
|
|
def config_ip4(self):
|
|
return self._test.vapi.sw_interface_add_del_address(
|
|
sw_if_index=self.sw_if_index, address=socket.inet_pton(
|
|
socket.AF_INET, self.ip4_addr),
|
|
address_length=self.ip4_addr_len)
|
|
|
|
def remove_vpp_config(self):
|
|
self._test.vapi.memif_delete(self.sw_if_index)
|
|
self.sw_if_index = None
|
|
|
|
def query_vpp_config(self):
|
|
if not self.sw_if_index:
|
|
return None
|
|
dump = self._test.vapi.memif_dump()
|
|
return get_if_dump(dump, self.sw_if_index)
|
|
|
|
def object_id(self):
|
|
if self.sw_if_index:
|
|
return "%d:%d:%d" % (self.role, self.if_id, self.sw_if_index)
|
|
else:
|
|
return "%d:%d:None" % (self.role, self.if_id)
|