From f9a817df125bad3e4187f16d80945f512d87cd52 Mon Sep 17 00:00:00 2001 From: peusterm Date: Mon, 18 Jul 2016 09:06:04 +0200 Subject: [PATCH] cleaned up logging --- src/emuvim/dcemulator/net.py | 27 +++++++++++++++------------ src/emuvim/dcemulator/node.py | 2 +- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/emuvim/dcemulator/net.py b/src/emuvim/dcemulator/net.py index adf17d4..51f53a3 100755 --- a/src/emuvim/dcemulator/net.py +++ b/src/emuvim/dcemulator/net.py @@ -44,6 +44,9 @@ from emuvim.dcemulator.monitoring import DCNetworkMonitor from emuvim.dcemulator.node import Datacenter, EmulatorCompute from emuvim.dcemulator.resourcemodel import ResourceModelRegistrar +LOG = logging.getLogger("dcemulator.net") +LOG.setLevel(logging.DEBUG) + class DCNetwork(Containernet): """ Wraps the original Mininet/Containernet class and provides @@ -110,7 +113,7 @@ class DCNetwork(Containernet): dc.net = self # set reference to network self.dcs[label] = dc dc.create() # finally create the data center in our Mininet instance - logging.info("added data center: %s" % label) + LOG.info("added data center: %s" % label) return dc def addLink(self, node1, node2, **params): @@ -120,7 +123,7 @@ class DCNetwork(Containernet): """ assert node1 is not None assert node2 is not None - logging.debug("addLink: n1=%s n2=%s" % (str(node1), str(node2))) + LOG.debug("addLink: n1=%s n2=%s" % (str(node1), str(node2))) # ensure type of node1 if isinstance( node1, basestring ): if node1 in self.dcs: @@ -314,12 +317,12 @@ class DCNetwork(Containernet): # if all shortest paths are wanted, use: all_shortest_paths path = nx.shortest_path(self.DCNetwork_graph, src_sw, dst_sw, weight=kwargs.get('weight')) except: - logging.exception("No path could be found between {0} and {1}".format(vnf_src_name, vnf_dst_name)) - logging.debug("Graph nodes: %r" % self.DCNetwork_graph.nodes()) - logging.debug("Graph edges: %r" % self.DCNetwork_graph.edges()) + LOG.exception("No path could be found between {0} and {1}".format(vnf_src_name, vnf_dst_name)) + LOG.debug("Graph nodes: %r" % self.DCNetwork_graph.nodes()) + LOG.debug("Graph edges: %r" % self.DCNetwork_graph.edges()) return "No path could be found between {0} and {1}".format(vnf_src_name, vnf_dst_name) - logging.info("Path between {0} and {1}: {2}".format(vnf_src_name, vnf_dst_name, path)) + LOG.info("Path between {0} and {1}: {2}".format(vnf_src_name, vnf_dst_name, path)) current_hop = src_sw switch_inport_nr = src_sw_inport_nr @@ -344,9 +347,9 @@ class DCNetwork(Containernet): if next_hop == vnf_dst_name: switch_outport_nr = dst_sw_outport_nr - logging.info("end node reached: {0}".format(vnf_dst_name)) + LOG.info("end node reached: {0}".format(vnf_dst_name)) elif not isinstance( next_node, OVSSwitch ): - logging.info("Next node: {0} is not a switch".format(next_hop)) + LOG.info("Next node: {0} is not a switch".format(next_hop)) return "Next node: {0} is not a switch".format(next_hop) else: # take first link between switches by default @@ -476,7 +479,7 @@ class DCNetwork(Containernet): ofcmd = '' node.dpctl(cmd, ofcmd) - logging.info("{3} in switch: {0} in_port: {1} out_port: {2}".format(node.name, switch_inport_nr, + LOG.info("{3} in switch: {0} in_port: {1} out_port: {2}".format(node.name, switch_inport_nr, switch_outport_nr, cmd)) # start Ryu Openflow controller as Remote Controller for the DCNetwork @@ -510,7 +513,7 @@ class DCNetwork(Containernet): else: url = self.ryu_REST_api + '/' + str(prefix) if data: - #logging.info('POST: {0}'.format(str(data))) + #LOG.info('POST: {0}'.format(str(data))) req = urllib2.Request(url, str(data)) else: req = urllib2.Request(url) @@ -518,8 +521,8 @@ class DCNetwork(Containernet): ret = urllib2.urlopen(req).read() return ret except: - logging.info('error url: {0}'.format(str(url))) - if data: logging.info('error POST: {0}'.format(str(data))) + LOG.info('error url: {0}'.format(str(url))) + if data: LOG.info('error POST: {0}'.format(str(data))) # need to respect that some match fields must be integers # http://ryu.readthedocs.io/en/latest/app/ofctl_rest.html#description-of-match-and-actions diff --git a/src/emuvim/dcemulator/node.py b/src/emuvim/dcemulator/node.py index b29d634..aa9fb4a 100755 --- a/src/emuvim/dcemulator/node.py +++ b/src/emuvim/dcemulator/node.py @@ -32,7 +32,7 @@ import logging import time import json -LOG = logging.getLogger("dcemulator") +LOG = logging.getLogger("dcemulator.node") LOG.setLevel(logging.DEBUG) -- 2.25.1