Committed from SK936 seat 1A.
Type: fix
Signed-off-by: Ole Troan <ot@cisco.com>
Change-Id: I717fafbdb9b8576508d6dd72a7e5653cecebfae0
Signed-off-by: Ole Troan <ot@cisco.com>
def _check_socket_filename(self, dump, socket_id, filename):
for d in dump:
if (d.socket_id == socket_id) and (
def _check_socket_filename(self, dump, socket_id, filename):
for d in dump:
if (d.socket_id == socket_id) and (
- d.socket_filename.rstrip(b"\0") == filename):
+ d.socket_filename == filename):
dump = self.vapi.memif_socket_filename_dump()
self.assertTrue(
self._check_socket_filename(
dump = self.vapi.memif_socket_filename_dump()
self.assertTrue(
self._check_socket_filename(
- dump, 0, b"%s/memif.sock" % six.ensure_binary(
- self.tempdir, encoding='utf-8')))
+ dump, 0, "%s/memif.sock" % self.tempdir))
memif_sockets = []
# existing path
memif_sockets.append(
VppSocketFilename(
memif_sockets = []
# existing path
memif_sockets.append(
VppSocketFilename(
- self, 1, b"%s/memif1.sock" % six.ensure_binary(
- self.tempdir, encoding='utf-8')))
+ self, 1, "%s/memif1.sock" % self.tempdir))
# default path (test tempdir)
memif_sockets.append(
VppSocketFilename(
self,
2,
# default path (test tempdir)
memif_sockets.append(
VppSocketFilename(
self,
2,
add_default_folder=True))
# create new folder in default folder
memif_sockets.append(
VppSocketFilename(
self,
3,
add_default_folder=True))
# create new folder in default folder
memif_sockets.append(
VppSocketFilename(
self,
3,
add_default_folder=True))
for sock in memif_sockets:
add_default_folder=True))
for sock in memif_sockets:
dump = self.vapi.memif_socket_filename_dump()
self.assertTrue(
self._check_socket_filename(
dump = self.vapi.memif_socket_filename_dump()
self.assertTrue(
self._check_socket_filename(
- dump, 0, b"%s/memif.sock" % six.ensure_binary(
- self.tempdir, encoding='utf-8')))
+ dump, 0, "%s/memif.sock" % self.tempdir))
def _create_delete_test_one_interface(self, memif):
memif.add_vpp_config()
def _create_delete_test_one_interface(self, memif):
memif.add_vpp_config()
# existing path
memif_sockets.append(
VppSocketFilename(
# existing path
memif_sockets.append(
VppSocketFilename(
- self, 1, b"%s/memif1.sock" % six.ensure_binary(
- self.tempdir, encoding='utf-8')))
+ self, 1, "%s/memif1.sock" % self.tempdir))
# default path (test tempdir)
memif_sockets.append(
VppSocketFilename(
self,
2,
# default path (test tempdir)
memif_sockets.append(
VppSocketFilename(
self,
2,
add_default_folder=True))
# create new folder in default folder
memif_sockets.append(
VppSocketFilename(
self,
3,
add_default_folder=True))
# create new folder in default folder
memif_sockets.append(
VppSocketFilename(
self,
3,
add_default_folder=True))
memif = VppMemif(
add_default_folder=True))
memif = VppMemif(
secret="abc")
remote_socket = VppSocketFilename(self.remote_test, 1,
secret="abc")
remote_socket = VppSocketFilename(self.remote_test, 1,
- b"%s/memif.sock" % six.ensure_binary(
- self.tempdir, encoding='utf-8'))
+ "%s/memif.sock" % self.tempdir)
remote_socket.add_vpp_config()
remote_memif = VppMemif(
remote_socket.add_vpp_config()
remote_memif = VppMemif(
VppEnum.vl_api_memif_mode_t.MEMIF_MODE_API_ETHERNET)
remote_socket = VppSocketFilename(self.remote_test, 1,
VppEnum.vl_api_memif_mode_t.MEMIF_MODE_API_ETHERNET)
remote_socket = VppSocketFilename(self.remote_test, 1,
- b"%s/memif.sock" % six.ensure_binary(
- self.tempdir, encoding='utf-8'))
+ "%s/memif.sock" % self.tempdir)
remote_socket.add_vpp_config()
remote_memif = VppMemif(
remote_socket.add_vpp_config()
remote_memif = VppMemif(
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 = b"%s/%s" % (
- six.ensure_binary(self._test.tempdir, encoding='utf-8'),
- self.socket_filename)
+ self.socket_filename = "%s/%s" % (self._test.tempdir,
+ self.socket_filename)
return rv
def remove_vpp_config(self):
return rv
def remove_vpp_config(self):