Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
tests: Remove the unrequired VPP IP address/prefix class wrappers
[vpp.git]
/
src
/
plugins
/
memif
/
test
/
vpp_memif.py
diff --git
a/src/plugins/memif/test/vpp_memif.py
b/src/plugins/memif/test/vpp_memif.py
index
9bcac1f
..
3ccbb68
100644
(file)
--- a/
src/plugins/memif/test/vpp_memif.py
+++ b/
src/plugins/memif/test/vpp_memif.py
@@
-1,9
+1,9
@@
import socket
import socket
+from ipaddress import IPv4Network
import six
from vpp_object import VppObject
import six
from vpp_object import VppObject
-from vpp_ip import VppIpPrefix
from vpp_papi import VppEnum
from vpp_papi import VppEnum
@@
-74,8
+74,9
@@
class VppMemif(VppObject):
self.buffer_size = buffer_size
self.hw_addr = hw_addr
self.sw_if_index = None
self.buffer_size = buffer_size
self.hw_addr = hw_addr
self.sw_if_index = None
- self.ip_prefix = VppIpPrefix("192.168.%d.%d" %
- (self.if_id + 1, self.role + 1), 24)
+ self.ip_prefix = IPv4Network("192.168.%d.%d/24" %
+ (self.if_id + 1, self.role + 1),
+ strict=False)
def add_vpp_config(self):
rv = self._test.vapi.memif_create(
def add_vpp_config(self):
rv = self._test.vapi.memif_create(
@@
-125,7
+126,7
@@
class VppMemif(VppObject):
def config_ip4(self):
return self._test.vapi.sw_interface_add_del_address(
def config_ip4(self):
return self._test.vapi.sw_interface_add_del_address(
- sw_if_index=self.sw_if_index, prefix=self.ip_prefix
.encode()
)
+ sw_if_index=self.sw_if_index, prefix=self.ip_prefix)
def remove_vpp_config(self):
self._test.vapi.memif_delete(self.sw_if_index)
def remove_vpp_config(self):
self._test.vapi.memif_delete(self.sw_if_index)