afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

updated logging.warn to logging.warning due to deprecation in python3, fixed python 2/3 filter issue in tests, fixed utf decoding for some missed popen commands

Browse source
This commit is contained in:
Blake Harnden 2019-06-03 14:36:21 -07:00
parent 69b1297002
commit 597bd21994
14 changed files with 70 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

20
daemon/core/api/tlv/broker.py
View file

@ -236,7 +236,7 @@ class CoreBroker(object):
return 0
if len(msghdr) != coreapi.CoreMessage.header_len:
logging.warn("warning: broker received not enough data len=%s", len(msghdr))
logging.warning("warning: broker received not enough data len=%s", len(msghdr))
return len(msghdr)
msgtype, msgflags, msglen = coreapi.CoreMessage.unpack_header(msghdr)
@ -413,7 +413,7 @@ class CoreBroker(object):
remotenum = n2num
if key in self.tunnels.keys():
logging.warn("tunnel with key %s (%s-%s) already exists!", key, n1num, n2num)
logging.warning("tunnel with key %s (%s-%s) already exists!", key, n1num, n2num)
else:
_id = key & ((1 << 16) - 1)
logging.info("adding tunnel for %s-%s to %s with key %s", n1num, n2num, remoteip, key)
@ -452,17 +452,17 @@ class CoreBroker(object):
# add other nets here that do not require tunnels
if nodeutils.is_node(net, NodeTypes.EMANE_NET):
logging.warn("emane network does not require a tunnel")
logging.warning("emane network does not require a tunnel")
return None
server_interface = getattr(net, "serverintf", None)
if nodeutils.is_node(net, NodeTypes.CONTROL_NET) and server_interface is not None:
logging.warn("control networks with server interfaces do not need a tunnel")
logging.warning("control networks with server interfaces do not need a tunnel")
return None
servers = self.getserversbynode(node_id)
if len(servers) < 2:
logging.warn("not enough servers to create a tunnel: %s", servers)
logging.warning("not enough servers to create a tunnel: %s", servers)
return None
hosts = []
@ -678,7 +678,7 @@ class CoreBroker(object):
"""
server = self.getserverbyname(servername)
if server is None:
logging.warn("ignoring unknown server: %s", servername)
logging.warning("ignoring unknown server: %s", servername)
return
if server.sock is None or server.host is None or server.port is None:
@ -754,10 +754,10 @@ class CoreBroker(object):
try:
nodecls = nodeutils.get_node_class(NodeTypes(nodetype))
except KeyError:
logging.warn("broker invalid node type %s", nodetype)
logging.warning("broker invalid node type %s", nodetype)
return handle_locally, servers
if nodecls is None:
logging.warn("broker unimplemented node type %s", nodetype)
logging.warning("broker unimplemented node type %s", nodetype)
return handle_locally, servers
if issubclass(nodecls, CoreNetworkBase) and nodetype != NodeTypes.WIRELESS_LAN.value:
# network node replicated on all servers; could be optimized
@ -1091,12 +1091,12 @@ class CoreBroker(object):
control_nets = value.split()
if len(control_nets) < 2:
logging.warn("multiple controlnet prefixes do not exist")
logging.warning("multiple controlnet prefixes do not exist")
return
servers = self.session.broker.getservernames()
if len(servers) < 2:
logging.warn("not distributed")
logging.warning("not distributed")
return
servers.remove("localhost")

44
daemon/core/api/tlv/corehandlers.py
View file

@ -120,7 +120,7 @@ class CoreHandler(socketserver.BaseRequestHandler):
time.sleep(1)
wait += 1
if wait == timeout:
logging.warn("queue failed to be empty, finishing request handler")
logging.warning("queue failed to be empty, finishing request handler")
break
logging.info("client disconnected: notifying threads")
@ -129,7 +129,7 @@ class CoreHandler(socketserver.BaseRequestHandler):
logging.info("waiting for thread: %s", thread.getName())
thread.join(timeout)
if thread.isAlive():
logging.warn("joining %s failed: still alive after %s sec", thread.getName(), timeout)
logging.warning("joining %s failed: still alive after %s sec", thread.getName(), timeout)
logging.info("connection closed: %s", self.client_address)
if self.session:
@ -422,7 +422,7 @@ class CoreHandler(socketserver.BaseRequestHandler):
message_type, message_flags, message_len = coreapi.CoreMessage.unpack_header(header)
if message_len == 0:
logging.warn("received message with no data")
logging.warning("received message with no data")
data = b""
while len(data) < message_len:
@ -629,7 +629,7 @@ class CoreHandler(socketserver.BaseRequestHandler):
"""
replies = []
if message.flags & MessageFlags.ADD.value and message.flags & MessageFlags.DELETE.value:
logging.warn("ignoring invalid message: add and delete flag both set")
logging.warning("ignoring invalid message: add and delete flag both set")
return ()
node_type = None
@ -1009,7 +1009,7 @@ class CoreHandler(socketserver.BaseRequestHandler):
self.session.location.reset()
else:
if not config_data.data_values:
logging.warn("location data missing")
logging.warning("location data missing")
else:
values = [float(x) for x in config_data.data_values.split("|")]
@ -1144,7 +1144,7 @@ class CoreHandler(socketserver.BaseRequestHandler):
node = self.session.get_node(node_id)
if node is None:
logging.warn("request to configure service for unknown node %s", node_id)
logging.warning("request to configure service for unknown node %s", node_id)
return replies
services = ServiceShim.servicesfromopaque(opaque)
@ -1247,7 +1247,7 @@ class CoreHandler(socketserver.BaseRequestHandler):
model_class = self.session.mobility.models.get(object_name)
if not model_class:
logging.warn("model class does not exist: %s", object_name)
logging.warning("model class does not exist: %s", object_name)
return []
config = self.session.mobility.get_model_config(node_id, object_name)
@ -1256,7 +1256,7 @@ class CoreHandler(socketserver.BaseRequestHandler):
elif message_type != ConfigFlags.RESET:
# store the configuration values for later use, when the node
if not object_name:
logging.warn("no configuration object for node: %s", node_id)
logging.warning("no configuration object for node: %s", node_id)
return []
parsed_config = {}
@ -1317,7 +1317,7 @@ class CoreHandler(socketserver.BaseRequestHandler):
model_class = self.session.emane.models.get(object_name)
if not model_class:
logging.warn("model class does not exist: %s", object_name)
logging.warning("model class does not exist: %s", object_name)
return []
config = self.session.emane.get_model_config(node_id, object_name)
@ -1326,7 +1326,7 @@ class CoreHandler(socketserver.BaseRequestHandler):
elif message_type != ConfigFlags.RESET:
# store the configuration values for later use, when the node
if not object_name:
logging.warn("no configuration object for node: %s", node_id)
logging.warning("no configuration object for node: %s", node_id)
return []
parsed_config = {}
@ -1353,11 +1353,11 @@ class CoreHandler(socketserver.BaseRequestHandler):
compressed_data = message.get_tlv(FileTlvs.COMPRESSED_DATA.value)
if compressed_data:
logging.warn("Compressed file data not implemented for File message.")
logging.warning("Compressed file data not implemented for File message.")
return ()
if source_name and data:
logging.warn("ignoring invalid File message: source and data TLVs are both present")
logging.warning("ignoring invalid File message: source and data TLVs are both present")
return ()
# some File Messages store custom files in services,
@ -1435,7 +1435,7 @@ class CoreHandler(socketserver.BaseRequestHandler):
self.session.start_mobility(node_ids=(node.id,))
return ()
logging.warn("dropping unhandled Event message with node number")
logging.warning("dropping unhandled Event message with node number")
return ()
self.session.set_state(event_type)
@ -1454,7 +1454,7 @@ class CoreHandler(socketserver.BaseRequestHandler):
self.send_node_emulation_id(_id)
elif event_type == EventTypes.RUNTIME_STATE:
if self.session.master:
logging.warn("Unexpected event message: RUNTIME state received at session master")
logging.warning("Unexpected event message: RUNTIME state received at session master")
else:
# master event queue is started in session.checkruntime()
self.session.start_events()
@ -1462,7 +1462,7 @@ class CoreHandler(socketserver.BaseRequestHandler):
self.session.data_collect()
elif event_type == EventTypes.SHUTDOWN_STATE:
if self.session.master:
logging.warn("Unexpected event message: SHUTDOWN state received at session master")
logging.warning("Unexpected event message: SHUTDOWN state received at session master")
elif event_type in {EventTypes.START, EventTypes.STOP, EventTypes.RESTART, EventTypes.PAUSE,
EventTypes.RECONFIGURE}:
handled = False
@ -1477,7 +1477,7 @@ class CoreHandler(socketserver.BaseRequestHandler):
self.session.mobility_event(event_data)
handled = True
if not handled:
logging.warn("Unhandled event message: event type %s ", event_type.name)
logging.warning("Unhandled event message: event type %s ", event_type.name)
elif event_type == EventTypes.FILE_OPEN:
filename = event_data.name
self.session.open_xml(filename, start=False)
@ -1492,14 +1492,14 @@ class CoreHandler(socketserver.BaseRequestHandler):
name = event_data.name
data = event_data.data
if etime is None:
logging.warn("Event message scheduled event missing start time")
logging.warning("Event message scheduled event missing start time")
return ()
if message.flags & MessageFlags.ADD.value:
self.session.add_event(float(etime), node=node, name=name, data=data)
else:
raise NotImplementedError
else:
logging.warn("unhandled event message: event type %s", event_type)
logging.warning("unhandled event message: event type %s", event_type)
return ()
@ -1518,7 +1518,7 @@ class CoreHandler(socketserver.BaseRequestHandler):
try:
node = self.session.get_node(node_id)
except KeyError:
logging.warn("ignoring event for service '%s', unknown node '%s'", name, node_id)
logging.warning("ignoring event for service '%s', unknown node '%s'", name, node_id)
return
fail = ""
@ -1556,7 +1556,7 @@ class CoreHandler(socketserver.BaseRequestHandler):
if num > 1:
unknown_data += ", "
num -= 1
logging.warn("Event requested for unknown service(s): %s", unknown_data)
logging.warning("Event requested for unknown service(s): %s", unknown_data)
unknown_data = "Unknown:" + unknown_data
event_data = EventData(
@ -1595,7 +1595,7 @@ class CoreHandler(socketserver.BaseRequestHandler):
session = self.coreemu.sessions.get(session_id)
if session is None:
logging.warn("session %s not found", session_id)
logging.warning("session %s not found", session_id)
continue
logging.info("request to modify to session: %s", session.id)
@ -1655,7 +1655,7 @@ class CoreHandler(socketserver.BaseRequestHandler):
logging.info("request to terminate session %s", session_id)
self.coreemu.delete_session(session_id)
else:
logging.warn("unhandled session flags for session %s", session_id)
logging.warning("unhandled session flags for session %s", session_id)
return ()