X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_ip_route.py;h=2be0e7908c811710482ae11cd56ed6a1eca4b3ff;hb=9a475373ed9b1ff9952acc06353ddaa50c2c96bd;hp=9e5c53184e34618b489237da9ff0ab6bfd304ca1;hpb=947ea6222dad1ef04595c34273e9231395aef443;p=vpp.git diff --git a/test/vpp_ip_route.py b/test/vpp_ip_route.py index 9e5c53184e3..2be0e7908c8 100644 --- a/test/vpp_ip_route.py +++ b/test/vpp_ip_route.py @@ -4,8 +4,9 @@ object abstractions for representing IP routes in VPP """ -from vpp_object import * +from vpp_object import VppObject from socket import inet_pton, inet_ntop, AF_INET, AF_INET6 +from vpp_ip import DpoProto, VppIpPrefix # from vnet/vnet/mpls/mpls_types.h MPLS_IETF_MAX_LABEL = 0xfffff @@ -29,20 +30,18 @@ class MRouteEntryFlags: MFIB_ENTRY_FLAG_INHERIT_ACCEPT = 8 -class DpoProto: - DPO_PROTO_IP4 = 0 - DPO_PROTO_IP6 = 1 - DPO_PROTO_MPLS = 2 - DPO_PROTO_ETHERNET = 3 - DPO_PROTO_BIER = 4 - DPO_PROTO_NSH = 5 - - class MplsLspMode: PIPE = 0 UNIFORM = 1 +def ip_to_dpo_proto(addr): + if addr.version == 6: + return DpoProto.DPO_PROTO_IP6 + else: + return DpoProto.DPO_PROTO_IP4 + + def find_route(test, ip_addr, len, table_id=0, inet=AF_INET): if inet == AF_INET: s = 4 @@ -54,8 +53,8 @@ def find_route(test, ip_addr, len, table_id=0, inet=AF_INET): 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: + and len == e.address_length \ + and table_id == e.table_id: return True return False @@ -72,9 +71,44 @@ def find_mroute(test, grp_addr, src_addr, grp_addr_len, saddr = inet_pton(inet, src_addr) for e in routes: if gaddr == e.grp_address[:s] \ - and grp_addr_len == e.address_length \ - and saddr == e.src_address[:s] \ - and table_id == e.table_id: + and grp_addr_len == e.address_length \ + and saddr == e.src_address[:s] \ + and table_id == e.table_id: + return True + return False + + +def find_mpls_route(test, table_id, label, eos_bit, paths=None): + dump = test.vapi.mpls_fib_dump() + for e in dump: + if label == e.label \ + and eos_bit == e.eos_bit \ + and table_id == e.table_id: + if not paths: + return True + else: + if (len(paths) != len(e.path)): + return False + for i in range(len(paths)): + if (paths[i] != e.path[i]): + return False + return True + return False + + +def fib_interface_ip_prefix(test, address, length, sw_if_index): + vp = VppIpPrefix(address, length) + addrs = test.vapi.ip_address_dump(sw_if_index, is_ipv6=vp.is_ip6) + + if vp.is_ip6: + n = 16 + else: + n = 4 + + for a in addrs: + if a.prefix_length == length and \ + a.sw_if_index == sw_if_index and \ + a.ip[:n] == vp.bytes: return True return False @@ -90,19 +124,18 @@ class VppIpTable(VppObject): self.is_ip6 = is_ip6 def add_vpp_config(self): - self._test.vapi.ip_table_add_del( - self.table_id, - is_ipv6=self.is_ip6, - is_add=1) + self._test.vapi.ip_table_add_del(is_ipv6=self.is_ip6, is_add=1, + table_id=self.table_id) self._test.registry.register(self, self._test.logger) def remove_vpp_config(self): - self._test.vapi.ip_table_add_del( - self.table_id, - is_ipv6=self.is_ip6, - is_add=0) + self._test.vapi.ip_table_add_del(is_ipv6=self.is_ip6, is_add=0, + table_id=self.table_id) def query_vpp_config(self): + if self.table_id == 0: + # the default table always exists + return False # find the default route return find_route(self._test, "::" if self.is_ip6 else "0.0.0.0", @@ -119,6 +152,75 @@ class VppIpTable(VppObject): self.table_id)) +class VppIpInterfaceAddress(VppObject): + + def __init__(self, test, intf, addr, len): + self._test = test + self.intf = intf + self.prefix = VppIpPrefix(addr, len) + + def add_vpp_config(self): + self._test.vapi.sw_interface_add_del_address( + sw_if_index=self.intf.sw_if_index, address=self.prefix.bytes, + address_length=self.prefix.length, is_ipv6=self.prefix.is_ip6, + is_add=1) + self._test.registry.register(self, self._test.logger) + + def remove_vpp_config(self): + self._test.vapi.sw_interface_add_del_address( + sw_if_index=self.intf.sw_if_index, address=self.prefix.bytes, + address_length=self.prefix.length, is_ipv6=self.prefix.is_ip6, + is_add=0) + + def query_vpp_config(self): + return fib_interface_ip_prefix(self._test, + self.prefix.address, + self.prefix.length, + self.intf.sw_if_index) + + def __str__(self): + return self.object_id() + + def object_id(self): + return "interface-ip-%s-%s" % (self.intf, self.prefix) + + +class VppIpInterfaceBind(VppObject): + + def __init__(self, test, intf, table): + self._test = test + self.intf = intf + self.table = table + + def add_vpp_config(self): + if self.table.is_ip6: + self.intf.set_table_ip6(self.table.table_id) + else: + self.intf.set_table_ip4(self.table.table_id) + self._test.registry.register(self, self._test.logger) + + def remove_vpp_config(self): + if 0 == self.table.table_id: + return + if self.table.is_ip6: + self.intf.set_table_ip6(0) + else: + self.intf.set_table_ip4(0) + + def query_vpp_config(self): + if 0 == self.table.table_id: + return False + return self._test.vapi.sw_interface_get_table( + self.intf.sw_if_index, + self.table.is_ip6).vrf_id == self.table.table_id + + def __str__(self): + return self.object_id() + + def object_id(self): + return "interface-bind-%s-%s" % (self.intf, self.table) + + class VppMplsLabel(object): def __init__(self, value, mode=MplsLspMode.PIPE, ttl=64, exp=0): self.value = value @@ -133,6 +235,23 @@ class VppMplsLabel(object): 'exp': self.exp, 'is_uniform': is_uniform} + def __eq__(self, other): + if isinstance(other, self.__class__): + return (self.value == other.value and + self.ttl == other.ttl and + self.exp == other.exp and + self.mode == other.mode) + elif hasattr(other, 'label'): + return (self.value == other.label and + self.ttl == other.ttl and + self.exp == other.exp and + (self.mode == MplsLspMode.UNIFORM) == other.is_uniform) + else: + return False + + def __ne__(self, other): + return not (self == other) + class VppRoutePath(object): @@ -152,13 +271,13 @@ class VppRoutePath(object): is_dvr=0, next_hop_id=0xffffffff, proto=DpoProto.DPO_PROTO_IP4): + self.proto = proto 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 - self.proto = proto if self.proto is DpoProto.DPO_PROTO_IP6: self.nh_addr = inet_pton(AF_INET6, nh_addr) elif self.proto is DpoProto.DPO_PROTO_IP4: @@ -190,7 +309,6 @@ class VppRoutePath(object): def encode(self): return {'next_hop': self.nh_addr, 'weight': 1, - 'afi': 0, 'preference': 0, 'table_id': self.nh_table_id, 'next_hop_id': self.next_hop_id, @@ -200,6 +318,23 @@ class VppRoutePath(object): 'n_labels': len(self.nh_labels), 'label_stack': self.encode_labels()} + def __eq__(self, other): + if isinstance(other, self.__class__): + return self.nh_addr == other.nh_addr + elif hasattr(other, 'sw_if_index'): + # vl_api_fib_path_t + if (len(self.nh_labels) != other.n_labels): + return False + for i in range(len(self.nh_labels)): + if (self.nh_labels[i] != other.label_stack[i]): + return False + return self.nh_itf == other.sw_if_index + else: + return False + + def __ne__(self, other): + return not (self == other) + class VppMRoutePath(VppRoutePath): @@ -223,7 +358,7 @@ class VppIpRoute(VppObject): def __init__(self, test, dest_addr, dest_addr_len, paths, table_id=0, is_ip6=0, is_local=0, - is_unreach=0, is_prohibit=0): + is_unreach=0, is_prohibit=0, is_drop=0): self._test = test self.paths = paths self.dest_addr_len = dest_addr_len @@ -232,6 +367,7 @@ class VppIpRoute(VppObject): self.is_local = is_local self.is_unreach = is_unreach self.is_prohibit = is_prohibit + self.is_drop = is_drop self.dest_addr_p = dest_addr if is_ip6: self.dest_addr = inet_pton(AF_INET6, dest_addr) @@ -246,8 +382,8 @@ class VppIpRoute(VppObject): self.is_prohibit = is_prohibit def add_vpp_config(self): - if self.is_local or self.is_unreach or self.is_prohibit: - self._test.vapi.ip_add_del_route( + if self.is_unreach or self.is_prohibit or self.is_drop: + r = self._test.vapi.ip_add_del_route( self.dest_addr, self.dest_addr_len, inet_pton(AF_INET6, "::"), @@ -255,13 +391,14 @@ class VppIpRoute(VppObject): is_local=self.is_local, is_unreach=self.is_unreach, is_prohibit=self.is_prohibit, + is_drop=self.is_drop, table_id=self.table_id, is_ipv6=self.is_ip6) else: for path in self.paths: lstack = path.encode_labels() - self._test.vapi.ip_add_del_route( + r = self._test.vapi.ip_add_del_route( self.dest_addr, self.dest_addr_len, path.nh_addr, @@ -274,15 +411,17 @@ class VppIpRoute(VppObject): next_hop_id=path.next_hop_id, is_ipv6=self.is_ip6, is_dvr=path.is_dvr, + is_local=self.is_local, is_resolve_host=path.is_resolve_host, is_resolve_attached=path.is_resolve_attached, is_source_lookup=path.is_source_lookup, is_udp_encap=path.is_udp_encap, is_multipath=1 if len(self.paths) > 1 else 0) + self.stats_index = r.stats_index self._test.registry.register(self, self._test.logger) def remove_vpp_config(self): - if self.is_local or self.is_unreach or self.is_prohibit: + if self.is_unreach or self.is_prohibit or self.is_drop: self._test.vapi.ip_add_del_route( self.dest_addr, self.dest_addr_len, @@ -326,6 +465,14 @@ class VppIpRoute(VppObject): self.dest_addr_p, self.dest_addr_len)) + def get_stats_to(self): + c = self._test.statistics.get_counter("/net/route/to") + return c[0][self.stats_index] + + def get_stats_via(self): + c = self._test.statistics.get_counter("/net/route/via") + return c[0][self.stats_index] + class VppIpMRoute(VppObject): """ @@ -354,18 +501,19 @@ class VppIpMRoute(VppObject): def add_vpp_config(self): for path in self.paths: - self._test.vapi.ip_mroute_add_del(self.src_addr, - self.grp_addr, - self.grp_addr_len, - self.e_flags, - path.proto, - path.nh_itf, - path.nh_addr, - path.nh_i_flags, - bier_imp=path.bier_imp, - rpf_id=self.rpf_id, - table_id=self.table_id, - is_ipv6=self.is_ip6) + r = self._test.vapi.ip_mroute_add_del(self.src_addr, + self.grp_addr, + self.grp_addr_len, + self.e_flags, + path.proto, + path.nh_itf, + path.nh_addr, + path.nh_i_flags, + bier_imp=path.bier_imp, + rpf_id=self.rpf_id, + table_id=self.table_id, + is_ipv6=self.is_ip6) + self.stats_index = r.stats_index self._test.registry.register(self, self._test.logger) def remove_vpp_config(self): @@ -451,6 +599,10 @@ class VppIpMRoute(VppObject): inet_ntop(AF_INET, self.grp_addr), self.grp_addr_len)) + def get_stats(self): + c = self._test.statistics.get_counter("/net/mroute") + return c[0][self.stats_index] + class VppMFibSignal(object): def __init__(self, test, route, interface, packet): @@ -514,7 +666,7 @@ class VppMplsIpBind(VppObject): dump = self._test.vapi.mpls_fib_dump() for e in dump: if self.local_label == e.label \ - and self.table_id == e.table_id: + and self.table_id == e.table_id: return True return False @@ -582,7 +734,7 @@ class VppMplsRoute(VppObject): for path in self.paths: lstack = path.encode_labels() - self._test.vapi.mpls_route_add_del( + r = self._test.vapi.mpls_route_add_del( self.local_label, self.eos_bit, path.proto, @@ -597,6 +749,7 @@ class VppMplsRoute(VppObject): next_hop_n_out_labels=len(lstack), next_hop_via_label=path.nh_via_label, next_hop_table_id=path.nh_table_id) + self.stats_index = r.stats_index self._test.registry.register(self, self._test.logger) def remove_vpp_config(self): @@ -611,13 +764,8 @@ class VppMplsRoute(VppObject): is_add=0) def query_vpp_config(self): - dump = self._test.vapi.mpls_fib_dump() - for e in dump: - if self.local_label == e.label \ - and self.eos_bit == e.eos_bit \ - and self.table_id == e.table_id: - return True - return False + return find_mpls_route(self._test, self.table_id, + self.local_label, self.eos_bit) def __str__(self): return self.object_id() @@ -626,4 +774,12 @@ class VppMplsRoute(VppObject): return ("%d:%s/%d" % (self.table_id, self.local_label, - 20+self.eos_bit)) + 20 + self.eos_bit)) + + def get_stats_to(self): + c = self._test.statistics.get_counter("/net/route/to") + return c[0][self.stats_index] + + def get_stats_via(self): + c = self._test.statistics.get_counter("/net/route/via") + return c[0][self.stats_index]