f string updates to all but services complete
This commit is contained in:
Blake Harnden
parent
7d2a615716
commit
07b4408076
3 changed files with 75 additions and 97 deletions
|
|
@ -180,7 +180,7 @@ class CoreTlvDataString(CoreTlvData):
|
|||
:rtype: tuple
|
||||
"""
|
||||
if not isinstance(value, str):
|
||||
raise ValueError("value not a string: %s" % type(value))
|
||||
raise ValueError(f"value not a string: {type(value)}")
|
||||
value = value.encode("utf-8")
|
||||
|
||||
if len(value) < 256:
|
||||
|
|
@ -220,7 +220,7 @@ class CoreTlvDataUint16List(CoreTlvData):
|
|||
:rtype: tuple
|
||||
"""
|
||||
if not isinstance(values, tuple):
|
||||
raise ValueError("value not a tuple: %s" % values)
|
||||
raise ValueError(f"value not a tuple: {values}")
|
||||
|
||||
data = b""
|
||||
for value in values:
|
||||
|
|
@ -237,7 +237,8 @@ class CoreTlvDataUint16List(CoreTlvData):
|
|||
:param data: data to unpack
|
||||
:return: unpacked data
|
||||
"""
|
||||
data_format = "!%dH" % (len(data) / 2)
|
||||
size = int(len(data) / 2)
|
||||
data_format = f"!{size}H"
|
||||
return struct.unpack(data_format, data)
|
||||
|
||||
@classmethod
|
||||
|
|
@ -435,7 +436,7 @@ class CoreTlv(object):
|
|||
try:
|
||||
return self.tlv_type_map(self.tlv_type).name
|
||||
except ValueError:
|
||||
return "unknown tlv type: %s" % str(self.tlv_type)
|
||||
return f"unknown tlv type: {self.tlv_type}"
|
||||
|
||||
def __str__(self):
|
||||
"""
|
||||
|
|
@ -444,11 +445,7 @@ class CoreTlv(object):
|
|||
:return: string representation
|
||||
:rtype: str
|
||||
"""
|
||||
return "%s <tlvtype = %s, value = %s>" % (
|
||||
self.__class__.__name__,
|
||||
self.type_str(),
|
||||
self.value,
|
||||
)
|
||||
return f"{self.__class__.__name__} <tlvtype = {self.type_str()}, value = {self.value}>"
|
||||
|
||||
|
||||
class CoreNodeTlv(CoreTlv):
|
||||
|
|
@ -734,7 +731,7 @@ class CoreMessage(object):
|
|||
:return: nothing
|
||||
"""
|
||||
if key in self.tlv_data:
|
||||
raise KeyError("key already exists: %s (val=%s)" % (key, value))
|
||||
raise KeyError(f"key already exists: {key} (val={value})")
|
||||
|
||||
self.tlv_data[key] = value
|
||||
|
||||
|
|
@ -793,7 +790,7 @@ class CoreMessage(object):
|
|||
try:
|
||||
return MessageTypes(self.message_type).name
|
||||
except ValueError:
|
||||
return "unknown message type: %s" % str(self.message_type)
|
||||
return f"unknown message type: {self.message_type}"
|
||||
|
||||
def flag_str(self):
|
||||
"""
|
||||
|
|
@ -810,12 +807,13 @@ class CoreMessage(object):
|
|||
try:
|
||||
message_flags.append(self.flag_map(flag).name)
|
||||
except ValueError:
|
||||
message_flags.append("0x%x" % flag)
|
||||
message_flags.append(f"0x{flag:x}")
|
||||
flag <<= 1
|
||||
if not (self.flags & ~(flag - 1)):
|
||||
break
|
||||
|
||||
return "0x%x <%s>" % (self.flags, " | ".join(message_flags))
|
||||
message_flags = " | ".join(message_flags)
|
||||
return f"0x{self.flags:x} <{message_flags}>"
|
||||
|
||||
def __str__(self):
|
||||
"""
|
||||
|
|
@ -824,20 +822,16 @@ class CoreMessage(object):
|
|||
:return: string representation
|
||||
:rtype: str
|
||||
"""
|
||||
result = "%s <msgtype = %s, flags = %s>" % (
|
||||
self.__class__.__name__,
|
||||
self.type_str(),
|
||||
self.flag_str(),
|
||||
)
|
||||
result = f"{self.__class__.__name__} <msgtype = {self.type_str()}, flags = {self.flag_str()}>"
|
||||
|
||||
for key in self.tlv_data:
|
||||
value = self.tlv_data[key]
|
||||
try:
|
||||
tlv_type = self.tlv_class.tlv_type_map(key).name
|
||||
except ValueError:
|
||||
tlv_type = "tlv type %s" % key
|
||||
tlv_type = f"tlv type {key}"
|
||||
|
||||
result += "\n %s: %s" % (tlv_type, value)
|
||||
result += f"\n {tlv_type}: {value}"
|
||||
|
||||
return result
|
||||
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ class CoreHandler(socketserver.BaseRequestHandler):
|
|||
self.handler_threads = []
|
||||
num_threads = int(server.config["numthreads"])
|
||||
if num_threads < 1:
|
||||
raise ValueError("invalid number of threads: %s" % num_threads)
|
||||
raise ValueError(f"invalid number of threads: {num_threads}")
|
||||
|
||||
logging.debug("launching core server handler threads: %s", num_threads)
|
||||
for _ in range(num_threads):
|
||||
|
|
@ -460,7 +460,7 @@ class CoreHandler(socketserver.BaseRequestHandler):
|
|||
try:
|
||||
header = self.request.recv(coreapi.CoreMessage.header_len)
|
||||
except IOError as e:
|
||||
raise IOError("error receiving header (%s)" % e)
|
||||
raise IOError(f"error receiving header ({e})")
|
||||
|
||||
if len(header) != coreapi.CoreMessage.header_len:
|
||||
if len(header) == 0:
|
||||
|
|
@ -478,10 +478,7 @@ class CoreHandler(socketserver.BaseRequestHandler):
|
|||
while len(data) < message_len:
|
||||
data += self.request.recv(message_len - len(data))
|
||||
if len(data) > message_len:
|
||||
error_message = (
|
||||
"received message length does not match received data (%s != %s)"
|
||||
% (len(data), message_len)
|
||||
)
|
||||
error_message = f"received message length does not match received data ({len(data)} != {message_len})"
|
||||
logging.error(error_message)
|
||||
raise IOError(error_message)
|
||||
|
||||
|
|
@ -573,11 +570,7 @@ class CoreHandler(socketserver.BaseRequestHandler):
|
|||
)
|
||||
except KeyError:
|
||||
# multiple TLVs of same type cause KeyError exception
|
||||
reply_message = "CoreMessage (type %d flags %d length %d)" % (
|
||||
message_type,
|
||||
message_flags,
|
||||
message_length,
|
||||
)
|
||||
reply_message = f"CoreMessage (type {message_type} flags {message_flags} length {message_length})"
|
||||
|
||||
logging.debug("sending reply:\n%s", reply_message)
|
||||
|
||||
|
|
@ -999,7 +992,7 @@ class CoreHandler(socketserver.BaseRequestHandler):
|
|||
RegisterTlvs.EXECUTE_SERVER.value, execute_server
|
||||
)
|
||||
tlv_data += coreapi.CoreRegisterTlv.pack(
|
||||
RegisterTlvs.SESSION.value, "%s" % sid
|
||||
RegisterTlvs.SESSION.value, str(sid)
|
||||
)
|
||||
message = coreapi.CoreRegMessage.pack(0, tlv_data)
|
||||
replies.append(message)
|
||||
|
|
@ -1104,7 +1097,7 @@ class CoreHandler(socketserver.BaseRequestHandler):
|
|||
self.session.mobility.config_reset(node_id)
|
||||
self.session.emane.config_reset(node_id)
|
||||
else:
|
||||
raise Exception("cant handle config all: %s" % message_type)
|
||||
raise Exception(f"cant handle config all: {message_type}")
|
||||
|
||||
return replies
|
||||
|
||||
|
|
@ -1158,7 +1151,7 @@ class CoreHandler(socketserver.BaseRequestHandler):
|
|||
if metadata_configs is None:
|
||||
metadata_configs = {}
|
||||
data_values = "|".join(
|
||||
["%s=%s" % (x, metadata_configs[x]) for x in metadata_configs]
|
||||
[f"{x}={metadata_configs[x]}" for x in metadata_configs]
|
||||
)
|
||||
data_types = tuple(ConfigDataTypes.STRING.value for _ in metadata_configs)
|
||||
config_response = ConfigData(
|
||||
|
|
@ -1239,7 +1232,7 @@ class CoreHandler(socketserver.BaseRequestHandler):
|
|||
services = sorted(group_map[group], key=lambda x: x.name.lower())
|
||||
logging.debug("sorted services for group(%s): %s", group, services)
|
||||
end_index = start_index + len(services) - 1
|
||||
group_strings.append("%s:%s-%s" % (group, start_index, end_index))
|
||||
group_strings.append(f"{group}:{start_index}-{end_index}")
|
||||
start_index += len(services)
|
||||
for service_name in services:
|
||||
captions.append(service_name.name)
|
||||
|
|
@ -1714,24 +1707,24 @@ class CoreHandler(socketserver.BaseRequestHandler):
|
|||
):
|
||||
status = self.session.services.stop_service(node, service)
|
||||
if status:
|
||||
fail += "Stop %s," % service.name
|
||||
fail += f"Stop {service.name},"
|
||||
if (
|
||||
event_type == EventTypes.START.value
|
||||
or event_type == EventTypes.RESTART.value
|
||||
):
|
||||
status = self.session.services.startup_service(node, service)
|
||||
if status:
|
||||
fail += "Start %s(%s)," % service.name
|
||||
fail += f"Start ({service.name}),"
|
||||
if event_type == EventTypes.PAUSE.value:
|
||||
status = self.session.services.validate_service(node, service)
|
||||
if status:
|
||||
fail += "%s," % service.name
|
||||
fail += f"{service.name},"
|
||||
if event_type == EventTypes.RECONFIGURE.value:
|
||||
self.session.services.service_reconfigure(node, service)
|
||||
|
||||
fail_data = ""
|
||||
if len(fail) > 0:
|
||||
fail_data += "Fail:" + fail
|
||||
fail_data += f"Fail:{fail}"
|
||||
unknown_data = ""
|
||||
num = len(unknown)
|
||||
if num > 0:
|
||||
|
|
@ -1741,14 +1734,14 @@ class CoreHandler(socketserver.BaseRequestHandler):
|
|||
unknown_data += ", "
|
||||
num -= 1
|
||||
logging.warning("Event requested for unknown service(s): %s", unknown_data)
|
||||
unknown_data = "Unknown:" + unknown_data
|
||||
unknown_data = f"Unknown:{unknown_data}"
|
||||
|
||||
event_data = EventData(
|
||||
node=node_id,
|
||||
event_type=event_type,
|
||||
name=name,
|
||||
data=fail_data + ";" + unknown_data,
|
||||
time="%s" % time.time(),
|
||||
time=str(time.time()),
|
||||
)
|
||||
|
||||
self.session.broadcast_event(event_data)
|
||||
|
|
@ -1769,7 +1762,7 @@ class CoreHandler(socketserver.BaseRequestHandler):
|
|||
thumb = message.get_tlv(SessionTlvs.THUMB.value)
|
||||
user = message.get_tlv(SessionTlvs.USER.value)
|
||||
logging.debug(
|
||||
"SESSION message flags=0x%x sessions=%s" % (message.flags, session_id_str)
|
||||
"SESSION message flags=0x%x sessions=%s", message.flags, session_id_str
|
||||
)
|
||||
|
||||
if message.flags == 0:
|
||||
|
|
@ -1940,7 +1933,7 @@ class CoreHandler(socketserver.BaseRequestHandler):
|
|||
# service customizations
|
||||
service_configs = self.session.services.all_configs()
|
||||
for node_id, service in service_configs:
|
||||
opaque = "service:%s" % service.name
|
||||
opaque = f"service:{service.name}"
|
||||
data_types = tuple(
|
||||
repeat(ConfigDataTypes.STRING.value, len(ServiceShim.keys))
|
||||
)
|
||||
|
|
@ -1976,7 +1969,7 @@ class CoreHandler(socketserver.BaseRequestHandler):
|
|||
file_data = FileData(
|
||||
message_type=MessageFlags.ADD.value,
|
||||
name=str(file_name),
|
||||
type="hook:%s" % state,
|
||||
type=f"hook:{state}",
|
||||
data=str(config_data),
|
||||
)
|
||||
self.session.broadcast_file(file_data)
|
||||
|
|
@ -1992,7 +1985,7 @@ class CoreHandler(socketserver.BaseRequestHandler):
|
|||
metadata_configs = self.session.metadata.get_configs()
|
||||
if metadata_configs:
|
||||
data_values = "|".join(
|
||||
["%s=%s" % (x, metadata_configs[x]) for x in metadata_configs]
|
||||
[f"{x}={metadata_configs[x]}" for x in metadata_configs]
|
||||
)
|
||||
data_types = tuple(
|
||||
ConfigDataTypes.STRING.value
|
||||
|
|
@ -2041,7 +2034,7 @@ class CoreUdpHandler(CoreHandler):
|
|||
data = self.request[0]
|
||||
header = data[: coreapi.CoreMessage.header_len]
|
||||
if len(header) < coreapi.CoreMessage.header_len:
|
||||
raise IOError("error receiving header (received %d bytes)" % len(header))
|
||||
raise IOError(f"error receiving header (received {len(header)} bytes)")
|
||||
|
||||
message_type, message_flags, message_len = coreapi.CoreMessage.unpack_header(
|
||||
header
|
||||
|
|
@ -2136,7 +2129,7 @@ class CoreUdpHandler(CoreHandler):
|
|||
:return:
|
||||
"""
|
||||
raise Exception(
|
||||
"Unable to queue %s message for later processing using UDP!" % msg
|
||||
f"Unable to queue {msg} message for later processing using UDP!"
|
||||
)
|
||||
|
||||
def sendall(self, data):
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue