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: replace pycodestyle with black
[vpp.git]
/
src
/
vpp-api
/
python
/
vpp_papi
/
vpp_transport_socket.py
diff --git
a/src/vpp-api/python/vpp_papi/vpp_transport_socket.py
b/src/vpp-api/python/vpp_papi/vpp_transport_socket.py
index
c82b8c3
..
3a8c332
100644
(file)
--- a/
src/vpp-api/python/vpp_papi/vpp_transport_socket.py
+++ b/
src/vpp-api/python/vpp_papi/vpp_transport_socket.py
@@
-9,7
+9,7
@@
import multiprocessing
import queue
import logging
import queue
import logging
-logger = logging.getLogger(
'vpp_papi.transport'
)
+logger = logging.getLogger(
"vpp_papi.transport"
)
logger.addHandler(logging.NullHandler())
logger.addHandler(logging.NullHandler())
@@
-26,7
+26,7
@@
class VppTransport:
self.read_timeout = read_timeout if read_timeout > 0 else None
self.parent = parent
self.server_address = server_address
self.read_timeout = read_timeout if read_timeout > 0 else None
self.parent = parent
self.server_address = server_address
- self.header = struct.Struct(
'>QII'
)
+ self.header = struct.Struct(
">QII"
)
self.message_table = {}
# These queues can be accessed async.
# They are always up, but replaced on connect.
self.message_table = {}
# These queues can be accessed async.
# They are always up, but replaced on connect.
@@
-41,11
+41,10
@@
class VppTransport:
def msg_thread_func(self):
while True:
try:
def msg_thread_func(self):
while True:
try:
- rlist, _, _ = select.select([self.socket,
- self.sque._reader], [], [])
+ rlist, _, _ = select.select([self.socket, self.sque._reader], [], [])
except socket.error:
# Terminate thread
except socket.error:
# Terminate thread
- logging.error(
'select failed'
)
+ logging.error(
"select failed"
)
self.q.put(None)
return
self.q.put(None)
return
@@
-71,8
+70,7
@@
class VppTransport:
else:
self.parent.msg_handler_async(msg)
else:
else:
self.parent.msg_handler_async(msg)
else:
- raise VppTransportSocketIOError(
- 2, 'Unknown response from select')
+ raise VppTransportSocketIOError(2, "Unknown response from select")
def connect(self, name, pfx, msg_handler, rx_qlen):
# TODO: Reorder the actions and add "roll-backs",
def connect(self, name, pfx, msg_handler, rx_qlen):
# TODO: Reorder the actions and add "roll-backs",
@@
-80,7
+78,8
@@
class VppTransport:
if self.message_thread is not None:
raise VppTransportSocketIOError(
if self.message_thread is not None:
raise VppTransportSocketIOError(
- 1, "PAPI socket transport connect: Need to disconnect first.")
+ 1, "PAPI socket transport connect: Need to disconnect first."
+ )
# Create a UDS socket
self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
# Create a UDS socket
self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
@@
-107,19
+106,17
@@
class VppTransport:
self.message_thread = threading.Thread(target=self.msg_thread_func)
# Initialise sockclnt_create
self.message_thread = threading.Thread(target=self.msg_thread_func)
# Initialise sockclnt_create
- sockclnt_create = self.parent.messages[
'sockclnt_create'
]
- sockclnt_create_reply = self.parent.messages[
'sockclnt_create_reply'
]
+ sockclnt_create = self.parent.messages[
"sockclnt_create"
]
+ sockclnt_create_reply = self.parent.messages[
"sockclnt_create_reply"
]
- args = {'_vl_msg_id': 15,
- 'name': name,
- 'context': 124}
+ args = {"_vl_msg_id": 15, "name": name, "context": 124}
b = sockclnt_create.pack(args)
self.write(b)
msg = self._read()
hdr, length = self.parent.header.unpack(msg, 0)
if hdr.msgid != 16:
# TODO: Add first numeric argument.
b = sockclnt_create.pack(args)
self.write(b)
msg = self._read()
hdr, length = self.parent.header.unpack(msg, 0)
if hdr.msgid != 16:
# TODO: Add first numeric argument.
- raise VppTransportSocketIOError(
'Invalid reply message'
)
+ raise VppTransportSocketIOError(
"Invalid reply message"
)
r, length = sockclnt_create_reply.unpack(msg)
self.socket_index = r.index
r, length = sockclnt_create_reply.unpack(msg)
self.socket_index = r.index
@@
-184,7
+181,7
@@
class VppTransport:
def write(self, buf):
"""Send a binary-packed message to VPP."""
if not self.connected:
def write(self, buf):
"""Send a binary-packed message to VPP."""
if not self.connected:
- raise VppTransportSocketIOError(1,
'Not connected'
)
+ raise VppTransportSocketIOError(1,
"Not connected"
)
# Send header
header = self.header.pack(0, len(buf), 0)
# Send header
header = self.header.pack(0, len(buf), 0)
@@
-192,8
+189,7
@@
class VppTransport:
self.socket.sendall(header)
self.socket.sendall(buf)
except socket.error as err:
self.socket.sendall(header)
self.socket.sendall(buf)
except socket.error as err:
- raise VppTransportSocketIOError(1, 'Sendall error: {err!r}'.format(
- err=err))
+ raise VppTransportSocketIOError(1, "Sendall error: {err!r}".format(err=err))
def _read_fixed(self, size):
"""Repeat receive until fixed size is read. Return empty on error."""
def _read_fixed(self, size):
"""Repeat receive until fixed size is read. Return empty on error."""
@@
-223,11
+219,11
@@
class VppTransport:
msg = self._read_fixed(hdrlen)
if hdrlen == len(msg):
return msg
msg = self._read_fixed(hdrlen)
if hdrlen == len(msg):
return msg
- raise VppTransportSocketIOError(1,
'Unknown socket read error'
)
+ raise VppTransportSocketIOError(1,
"Unknown socket read error"
)
def read(self, timeout=None):
if not self.connected:
def read(self, timeout=None):
if not self.connected:
- raise VppTransportSocketIOError(1,
'Not connected'
)
+ raise VppTransportSocketIOError(1,
"Not connected"
)
if timeout is None:
timeout = self.read_timeout
try:
if timeout is None:
timeout = self.read_timeout
try: