Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
virtio: Fix virtio buffer allocation
[vpp.git]
/
test
/
vpp_ip_route.py
diff --git
a/test/vpp_ip_route.py
b/test/vpp_ip_route.py
index
fbc00d3
..
0bd6dd3
100644
(file)
--- a/
test/vpp_ip_route.py
+++ b/
test/vpp_ip_route.py
@@
-143,9
+143,6
@@
class VppIpTable(VppObject):
self.table_id,
inet=AF_INET6 if self.is_ip6 == 1 else AF_INET)
self.table_id,
inet=AF_INET6 if self.is_ip6 == 1 else AF_INET)
- def __str__(self):
- return self.object_id()
-
def object_id(self):
return ("table-%s-%d" %
("v6" if self.is_ip6 == 1 else "v4",
def object_id(self):
return ("table-%s-%d" %
("v6" if self.is_ip6 == 1 else "v4",
@@
-161,13
+158,15
@@
class VppIpInterfaceAddress(VppObject):
def add_vpp_config(self):
self._test.vapi.sw_interface_add_del_address(
def add_vpp_config(self):
self._test.vapi.sw_interface_add_del_address(
- sw_if_index=self.intf.sw_if_index, prefix=self.prefix.encode(),
+ 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(
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, prefix=self.prefix.encode(),
+ 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):
is_add=0)
def query_vpp_config(self):
@@
-176,9
+175,6
@@
class VppIpInterfaceAddress(VppObject):
self.prefix.length,
self.intf.sw_if_index)
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)
def object_id(self):
return "interface-ip-%s-%s" % (self.intf, self.prefix)
@@
-212,9
+208,6
@@
class VppIpInterfaceBind(VppObject):
self.intf.sw_if_index,
self.table.is_ip6).vrf_id == self.table.table_id
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)
def object_id(self):
return "interface-bind-%s-%s" % (self.intf, self.table)
@@
-451,9
+444,6
@@
class VppIpRoute(VppObject):
self.table_id,
inet=AF_INET6 if self.is_ip6 == 1 else AF_INET)
self.table_id,
inet=AF_INET6 if self.is_ip6 == 1 else AF_INET)
- def __str__(self):
- return self.object_id()
-
def object_id(self):
return ("%d:%s/%d"
% (self.table_id,
def object_id(self):
return ("%d:%s/%d"
% (self.table_id,
@@
-577,9
+567,6
@@
class VppIpMRoute(VppObject):
self.table_id,
inet=AF_INET6 if self.is_ip6 == 1 else AF_INET)
self.table_id,
inet=AF_INET6 if self.is_ip6 == 1 else AF_INET)
- def __str__(self):
- return self.object_id()
-
def object_id(self):
if self.is_ip6:
return ("%d:(%s,%s/%d)"
def object_id(self):
if self.is_ip6:
return ("%d:(%s,%s/%d)"
@@
-665,9
+652,6
@@
class VppMplsIpBind(VppObject):
return True
return False
return True
return False
- def __str__(self):
- return self.object_id()
-
def object_id(self):
return ("%d:%s binds %d:%s/%d"
% (self.table_id,
def object_id(self):
return ("%d:%s binds %d:%s/%d"
% (self.table_id,
@@
-703,9
+687,6
@@
class VppMplsTable(VppObject):
return True
return False
return True
return False
- def __str__(self):
- return self.object_id()
-
def object_id(self):
return ("table-mpls-%d" % (self.table_id))
def object_id(self):
return ("table-mpls-%d" % (self.table_id))
@@
-764,9
+745,6
@@
class VppMplsRoute(VppObject):
return find_mpls_route(self._test, self.table_id,
self.local_label, self.eos_bit)
return find_mpls_route(self._test, self.table_id,
self.local_label, self.eos_bit)
- def __str__(self):
- return self.object_id()
-
def object_id(self):
return ("%d:%s/%d"
% (self.table_id,
def object_id(self):
return ("%d:%s/%d"
% (self.table_id,