Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
NAT: VPP-1531 api cleanup & update
[vpp.git]
/
test
/
vpp_memif.py
diff --git
a/test/vpp_memif.py
b/test/vpp_memif.py
index
c6e8142
..
7836dc1
100644
(file)
--- a/
test/vpp_memif.py
+++ b/
test/vpp_memif.py
@@
-1,5
+1,7
@@
import socket
import socket
+import six
+
from vpp_object import VppObject
from vpp_object import VppObject
@@
-50,8
+52,9
@@
class VppSocketFilename(VppObject):
rv = self._test.vapi.memif_socket_filename_add_del(
1, self.socket_id, self.socket_filename)
if self.add_default_folder:
rv = self._test.vapi.memif_socket_filename_add_del(
1, self.socket_id, self.socket_filename)
if self.add_default_folder:
- self.socket_filename = self._test.tempdir + "/" \
- + self.socket_filename
+ self.socket_filename = b"%s/%s" % (
+ six.ensure_binary(self._test.tempdir, encoding='utf-8'),
+ self.socket_filename)
return rv
def remove_vpp_config(self):
return rv
def remove_vpp_config(self):
@@
-61,9
+64,6
@@
class VppSocketFilename(VppObject):
def query_vpp_config(self):
return self._test.vapi.memif_socket_filename_dump()
def query_vpp_config(self):
return self._test.vapi.memif_socket_filename_dump()
- def __str__(self):
- return self.object_id()
-
def object_id(self):
return "%d" % (self.socket_id)
def object_id(self):
return "%d" % (self.socket_id)
@@
-132,9
+132,6
@@
class VppMemif(VppObject):
dump = self._test.vapi.memif_dump()
return get_if_dump(dump, self.sw_if_index)
dump = self._test.vapi.memif_dump()
return get_if_dump(dump, self.sw_if_index)
- def __str__(self):
- return self.object_id()
-
def object_id(self):
if self.sw_if_index:
return "%d:%d:%d" % (self.role, self.if_id, self.sw_if_index)
def object_id(self):
if self.sw_if_index:
return "%d:%d:%d" % (self.role, self.if_id, self.sw_if_index)