Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
api: Cleanup APIs interface.api
[vpp.git]
/
test
/
vpp_interface.py
diff --git
a/test/vpp_interface.py
b/test/vpp_interface.py
index
4c4e413
..
1e047f5
100644
(file)
--- a/
test/vpp_interface.py
+++ b/
test/vpp_interface.py
@@
-8,6
+8,12
@@
from six import moves
from util import Host, mk_ll_addr
from vpp_papi import mac_ntop, VppEnum
from vpp_ip import VppIpAddress, VppIpPrefix
from util import Host, mk_ll_addr
from vpp_papi import mac_ntop, VppEnum
from vpp_ip import VppIpAddress, VppIpPrefix
+from ipaddress import IPv4Network
+
+try:
+ text_type = unicode
+except NameError:
+ text_type = str
@six.add_metaclass(abc.ABCMeta)
@six.add_metaclass(abc.ABCMeta)
@@
-42,11
+48,19
@@
class VppInterface(object):
"""Local IPv4 address on VPP interface (string)."""
return self._local_ip4.address
"""Local IPv4 address on VPP interface (string)."""
return self._local_ip4.address
+ @local_ip4.setter
+ def local_ip4(self, value):
+ self._local_ip4.address = value
+
@property
def local_ip4_prefix_len(self):
"""Local IPv4 prefix length """
return self._local_ip4.len
@property
def local_ip4_prefix_len(self):
"""Local IPv4 prefix length """
return self._local_ip4.len
+ @local_ip4_prefix_len.setter
+ def local_ip4_prefix_len(self, value):
+ self._local_ip4.len = value
+
@property
def local_ip4_prefix(self):
"""Local IPv4 prefix """
@property
def local_ip4_prefix(self):
"""Local IPv4 prefix """
@@
-74,11
+88,19
@@
class VppInterface(object):
"""Local IPv6 address on VPP interface (string)."""
return self._local_ip6.address
"""Local IPv6 address on VPP interface (string)."""
return self._local_ip6.address
+ @local_ip6.setter
+ def local_ip6(self, value):
+ self._local_ip6.address = value
+
@property
def local_ip6_prefix_len(self):
"""Local IPv6 prefix length """
return self._local_ip6.len
@property
def local_ip6_prefix_len(self):
"""Local IPv6 prefix length """
return self._local_ip6.len
+ @local_ip6_prefix_len.setter
+ def local_ip6_prefix_len(self, value):
+ self._local_ip6.len = value
+
@property
def local_ip6_prefix(self):
"""Local IPv6 prefix """
@property
def local_ip6_prefix(self):
"""Local IPv6 prefix """
@@
-235,7
+257,7
@@
class VppInterface(object):
self._remote_addr = {socket.AF_INET: self.remote_ip4,
socket.AF_INET6: self.remote_ip6}
self._remote_addr = {socket.AF_INET: self.remote_ip4,
socket.AF_INET6: self.remote_ip6}
- r = self.test.vapi.sw_interface_dump()
+ r = self.test.vapi.sw_interface_dump(
sw_if_index=self.sw_if_index
)
for intf in r:
if intf.sw_if_index == self.sw_if_index:
self._name = intf.interface_name.split(b'\0',
for intf in r:
if intf.sw_if_index == self.sw_if_index:
self._name = intf.interface_name.split(b'\0',
@@
-342,14
+364,16
@@
class VppInterface(object):
suppress=suppress,
send_unicast=send_unicast)
suppress=suppress,
send_unicast=send_unicast)
- # TODO: This should accept ipaddress object.
- def ip6_ra_prefix(self, address, address_length, is_no=0,
+ def ip6_ra_prefix(self, prefix, is_no=0,
off_link=0, no_autoconfig=0, use_default=0):
off_link=0, no_autoconfig=0, use_default=0):
- """Configure IPv6 RA suppress on the VPP interface."""
+ """Configure IPv6 RA suppress on the VPP interface.
+
+ prefix can be a string in the format of '<address>/<length_in_bits>'
+ or ipaddress.ipnetwork object (if strict.)"""
+
self.test.vapi.sw_interface_ip6nd_ra_prefix(
sw_if_index=self.sw_if_index,
self.test.vapi.sw_interface_ip6nd_ra_prefix(
sw_if_index=self.sw_if_index,
- prefix={'address': address,
- 'address_length': address_length},
+ prefix=prefix,
use_default=use_default,
off_link=off_link, no_autoconfig=no_autoconfig,
is_no=is_no)
use_default=use_default,
off_link=off_link, no_autoconfig=no_autoconfig,
is_no=is_no)
@@
-406,9
+430,10
@@
class VppInterface(object):
def is_ip4_entry_in_fib_dump(self, dump):
for i in dump:
def is_ip4_entry_in_fib_dump(self, dump):
for i in dump:
- if i.address == self.local_ip4n and \
- i.address_length == self.local_ip4_prefix_len and \
- i.table_id == self.ip4_table_id:
+ n = IPv4Network(text_type("%s/%d" % (self.local_ip4,
+ self.local_ip4_prefix_len)))
+ if i.route.prefix == n and \
+ i.route.table_id == self.ip4_table_id:
return True
return False
return True
return False
@@
-429,7
+454,7
@@
class VppInterface(object):
enable)
def query_vpp_config(self):
enable)
def query_vpp_config(self):
- dump = self.test.vapi.sw_interface_dump()
+ dump = self.test.vapi.sw_interface_dump(
sw_if_index=self.sw_if_index
)
return self.is_interface_config_in_dump(dump)
def get_interface_config_from_dump(self, dump):
return self.is_interface_config_in_dump(dump)
def get_interface_config_from_dump(self, dump):
@@
-463,3
+488,11
@@
class VppInterface(object):
def __str__(self):
return self.name
def __str__(self):
return self.name
+
+ def get_rx_stats(self):
+ c = self.test.statistics.get_counter("^/if/rx$")
+ return c[0][self.sw_if_index]
+
+ def get_tx_stats(self):
+ c = self.test.statistics.get_counter("^/if/tx$")
+ return c[0][self.sw_if_index]