X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fmemif%2Ftest%2Fvpp_memif.py;h=3ccbb68970b707bc24fcb5675e2c999bdfe39bf5;hb=efd7bc2b1c8db160933ed3e9ab3cde0d07aaf863;hp=9bcac1fd5b67f9e0111b64095668c0df724038b9;hpb=5ae7f0db43928a9a043e1e4a53871219060d259d;p=vpp.git diff --git a/src/plugins/memif/test/vpp_memif.py b/src/plugins/memif/test/vpp_memif.py index 9bcac1fd5b6..3ccbb68970b 100644 --- a/src/plugins/memif/test/vpp_memif.py +++ b/src/plugins/memif/test/vpp_memif.py @@ -1,9 +1,9 @@ import socket +from ipaddress import IPv4Network import six from vpp_object import VppObject -from vpp_ip import VppIpPrefix 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.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( @@ -125,7 +126,7 @@ class VppMemif(VppObject): 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)