X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_ip_route.py;h=d6146f28fab665ed4d7c9c28000cfd85238b1196;hb=0f26c5a0138ac86d7ebd197c31a09d8d624c35fe;hp=f758c067f31011c0d79434874f7bf50c5bdd1308;hpb=5a8123bda0261158457e38bfb4922aa5961389ff;p=vpp.git diff --git a/test/vpp_ip_route.py b/test/vpp_ip_route.py index f758c067f31..d6146f28fab 100644 --- a/test/vpp_ip_route.py +++ b/test/vpp_ip_route.py @@ -4,14 +4,48 @@ object abstractions for representing IP routes in VPP """ -import socket from vpp_object import * +from socket import inet_pton, inet_ntop, AF_INET, AF_INET6 # from vnet/vnet/mpls/mpls_types.h MPLS_IETF_MAX_LABEL = 0xfffff MPLS_LABEL_INVALID = MPLS_IETF_MAX_LABEL + 1 +class MRouteItfFlags: + MFIB_ITF_FLAG_NONE = 0 + MFIB_ITF_FLAG_NEGATE_SIGNAL = 1 + MFIB_ITF_FLAG_ACCEPT = 2 + MFIB_ITF_FLAG_FORWARD = 4 + MFIB_ITF_FLAG_SIGNAL_PRESENT = 8 + MFIB_ITF_FLAG_INTERNAL_COPY = 16 + + +class MRouteEntryFlags: + MFIB_ENTRY_FLAG_NONE = 0 + MFIB_ENTRY_FLAG_SIGNAL = 1 + MFIB_ENTRY_FLAG_DROP = 2 + MFIB_ENTRY_FLAG_CONNECTED = 4 + MFIB_ENTRY_FLAG_INHERIT_ACCEPT = 8 + + +def find_route(test, ip_addr, len, table_id=0, inet=AF_INET): + if inet == AF_INET: + s = 4 + routes = test.vapi.ip_fib_dump() + else: + s = 16 + routes = test.vapi.ip6_fib_dump() + + route_addr = inet_pton(inet, ip_addr) + for e in routes: + if route_addr == e.address[:s] \ + and len == e.address_length \ + and table_id == e.table_id: + return True + return False + + class VppRoutePath(object): def __init__( @@ -21,15 +55,24 @@ class VppRoutePath(object): nh_table_id=0, labels=[], nh_via_label=MPLS_LABEL_INVALID, - is_ip6=0): + is_ip6=0, + rpf_id=0, + is_interface_rx=0): self.nh_itf = nh_sw_if_index self.nh_table_id = nh_table_id self.nh_via_label = nh_via_label self.nh_labels = labels + self.weight = 1 + self.rpf_id = rpf_id if is_ip6: - self.nh_addr = socket.inet_pton(socket.AF_INET6, nh_addr) + self.nh_addr = inet_pton(AF_INET6, nh_addr) else: - self.nh_addr = socket.inet_pton(socket.AF_INET, nh_addr) + self.nh_addr = inet_pton(AF_INET, nh_addr) + self.is_interface_rx = is_interface_rx + self.is_rpf_id = 0 + if rpf_id != 0: + self.is_rpf_id = 1 + self.nh_itf = rpf_id class VppMRoutePath(VppRoutePath): @@ -46,26 +89,39 @@ class VppIpRoute(VppObject): """ def __init__(self, test, dest_addr, - dest_addr_len, paths, table_id=0, is_ip6=0, is_local=0): + dest_addr_len, paths, table_id=0, is_ip6=0, is_local=0, + is_unreach=0, is_prohibit=0): self._test = test self.paths = paths self.dest_addr_len = dest_addr_len self.table_id = table_id self.is_ip6 = is_ip6 self.is_local = is_local + self.is_unreach = is_unreach + self.is_prohibit = is_prohibit + self.dest_addr_p = dest_addr if is_ip6: - self.dest_addr = socket.inet_pton(socket.AF_INET6, dest_addr) + self.dest_addr = inet_pton(AF_INET6, dest_addr) else: - self.dest_addr = socket.inet_pton(socket.AF_INET, dest_addr) + self.dest_addr = inet_pton(AF_INET, dest_addr) + + def modify(self, paths, is_local=0, + is_unreach=0, is_prohibit=0): + self.paths = paths + self.is_local = is_local + self.is_unreach = is_unreach + self.is_prohibit = is_prohibit def add_vpp_config(self): - if self.is_local: + if self.is_local or self.is_unreach or self.is_prohibit: self._test.vapi.ip_add_del_route( self.dest_addr, self.dest_addr_len, - socket.inet_pton(socket.AF_INET6, "::"), + inet_pton(AF_INET6, "::"), 0xffffffff, - is_local=1, + is_local=self.is_local, + is_unreach=self.is_unreach, + is_prohibit=self.is_prohibit, table_id=self.table_id, is_ipv6=self.is_ip6) else: @@ -84,13 +140,15 @@ class VppIpRoute(VppObject): self._test.registry.register(self, self._test.logger) def remove_vpp_config(self): - if self.is_local: + if self.is_local or self.is_unreach or self.is_prohibit: self._test.vapi.ip_add_del_route( self.dest_addr, self.dest_addr_len, - socket.inet_pton(socket.AF_INET6, "::"), + inet_pton(AF_INET6, "::"), 0xffffffff, - is_local=1, + is_local=self.is_local, + is_unreach=self.is_unreach, + is_prohibit=self.is_prohibit, is_add=0, table_id=self.table_id, is_ipv6=self.is_ip6) @@ -101,16 +159,15 @@ class VppIpRoute(VppObject): path.nh_addr, path.nh_itf, table_id=self.table_id, - is_add=0) + is_add=0, + is_ipv6=self.is_ip6) def query_vpp_config(self): - dump = self._test.vapi.ip_fib_dump() - for e in dump: - if self.dest_addr == e.address \ - and self.dest_addr_len == e.address_length \ - and self.table_id == e.table_id: - return True - return False + return find_route(self._test, + self.dest_addr_p, + self.dest_addr_len, + self.table_id, + inet=AF_INET6 if self.is_ip6 == 1 else AF_INET) def __str__(self): return self.object_id() @@ -118,7 +175,7 @@ class VppIpRoute(VppObject): def object_id(self): return ("%d:%s/%d" % (self.table_id, - socket.inet_ntop(socket.AF_INET, self.dest_addr), + self.dest_addr_p, self.dest_addr_len)) @@ -128,20 +185,22 @@ class VppIpMRoute(VppObject): """ def __init__(self, test, src_addr, grp_addr, - grp_addr_len, e_flags, paths, table_id=0, is_ip6=0): + grp_addr_len, e_flags, paths, table_id=0, + rpf_id=0, is_ip6=0): self._test = test self.paths = paths self.grp_addr_len = grp_addr_len self.table_id = table_id self.e_flags = e_flags self.is_ip6 = is_ip6 + self.rpf_id = rpf_id if is_ip6: - self.grp_addr = socket.inet_pton(socket.AF_INET6, grp_addr) - self.src_addr = socket.inet_pton(socket.AF_INET6, src_addr) + self.grp_addr = inet_pton(AF_INET6, grp_addr) + self.src_addr = inet_pton(AF_INET6, src_addr) else: - self.grp_addr = socket.inet_pton(socket.AF_INET, grp_addr) - self.src_addr = socket.inet_pton(socket.AF_INET, src_addr) + self.grp_addr = inet_pton(AF_INET, grp_addr) + self.src_addr = inet_pton(AF_INET, src_addr) def add_vpp_config(self): for path in self.paths: @@ -151,6 +210,7 @@ class VppIpMRoute(VppObject): self.e_flags, path.nh_itf, path.nh_i_flags, + rpf_id=self.rpf_id, table_id=self.table_id, is_ipv6=self.is_ip6) self._test.registry.register(self, self._test.logger) @@ -178,6 +238,18 @@ class VppIpMRoute(VppObject): table_id=self.table_id, is_ipv6=self.is_ip6) + def update_rpf_id(self, rpf_id): + self.rpf_id = rpf_id + self._test.vapi.ip_mroute_add_del(self.src_addr, + self.grp_addr, + self.grp_addr_len, + self.e_flags, + 0xffffffff, + 0, + rpf_id=self.rpf_id, + table_id=self.table_id, + is_ipv6=self.is_ip6) + def update_path_flags(self, itf, flags): for path in self.paths: if path.nh_itf == itf: @@ -208,14 +280,14 @@ class VppIpMRoute(VppObject): if self.is_ip6: return ("%d:(%s,%s/%d)" % (self.table_id, - socket.inet_ntop(socket.AF_INET6, self.src_addr), - socket.inet_ntop(socket.AF_INET6, self.grp_addr), + inet_ntop(AF_INET6, self.src_addr), + inet_ntop(AF_INET6, self.grp_addr), self.grp_addr_len)) else: return ("%d:(%s,%s/%d)" % (self.table_id, - socket.inet_ntop(socket.AF_INET, self.src_addr), - socket.inet_ntop(socket.AF_INET, self.grp_addr), + inet_ntop(AF_INET, self.src_addr), + inet_ntop(AF_INET, self.grp_addr), self.grp_addr_len)) @@ -248,7 +320,7 @@ class VppMplsIpBind(VppObject): def __init__(self, test, local_label, dest_addr, dest_addr_len, table_id=0, ip_table_id=0): self._test = test - self.dest_addr = socket.inet_pton(socket.AF_INET, dest_addr) + self.dest_addr = inet_pton(AF_INET, dest_addr) self.dest_addr_len = dest_addr_len self.local_label = local_label self.table_id = table_id @@ -285,7 +357,7 @@ class VppMplsIpBind(VppObject): % (self.table_id, self.local_label, self.ip_table_id, - socket.inet_ntop(socket.AF_INET, self.dest_addr), + inet_ntop(AF_INET, self.dest_addr), self.dest_addr_len)) @@ -294,14 +366,17 @@ class VppMplsRoute(VppObject): MPLS Route/LSP """ - def __init__(self, test, local_label, eos_bit, paths, table_id=0): + def __init__(self, test, local_label, eos_bit, paths, table_id=0, + is_multicast=0): self._test = test self.paths = paths self.local_label = local_label self.eos_bit = eos_bit self.table_id = table_id + self.is_multicast = is_multicast def add_vpp_config(self): + is_multipath = len(self.paths) > 1 for path in self.paths: self._test.vapi.mpls_route_add_del( self.local_label, @@ -309,7 +384,11 @@ class VppMplsRoute(VppObject): 1, path.nh_addr, path.nh_itf, + is_multicast=self.is_multicast, + is_multipath=is_multipath, table_id=self.table_id, + is_interface_rx=path.is_interface_rx, + is_rpf_id=path.is_rpf_id, next_hop_out_label_stack=path.nh_labels, next_hop_n_out_labels=len( path.nh_labels), @@ -324,6 +403,7 @@ class VppMplsRoute(VppObject): 1, path.nh_addr, path.nh_itf, + is_rpf_id=path.is_rpf_id, table_id=self.table_id, is_add=0)