nico
/
master-thesis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[controller] ++ debug output

This commit is contained in:
Nico Schottelius 2019-02-23 18:25:53 +01:00
parent bd49e36544
commit 4e5f3c65a0
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
p4app/controller.py
View File

@ -48,11 +48,15 @@ class L2Controller(object):
@staticmethod @staticmethod
def prefix_to_net(net, mask): def prefix_to_net(net, mask):
""" work around ipaddress bug """ """ work around ipaddress bug """
return "{}0/{}".format(net, mask) net = "{}0/{}".format(net, mask)
log.debug("net: {}".format(net))
return net
@staticmethod @staticmethod
def prefix_to_host(net, mask): def prefix_to_host(net, mask):
""" work around ipaddress bug """ """ work around ipaddress bug """
host = "{}1/{}".format(net, mask)
log.debug("host: {}".format(host))
return "{}1/{}".format(net, mask) return "{}1/{}".format(net, mask)
@staticmethod @staticmethod
@ -151,6 +155,7 @@ class L2Controller(object):
def commandline(self): def commandline(self):
parser = argparse.ArgumentParser(description='controller++') parser = argparse.ArgumentParser(description='controller++')
parser.add_argument('--mode', help='Select mode / settings to use', choices=self.modes) parser.add_argument('--mode', help='Select mode / settings to use', choices=self.modes)
parser.add_argument('--debug', help='Enable debug logging', action='store_true')
args = parser.parse_args() args = parser.parse_args()
self.mode = args.mode self.mode = args.mode
@ -171,5 +176,7 @@ if __name__ == "__main__":
controller = L2Controller(sw_name) controller = L2Controller(sw_name)
controller.commandline() controller.commandline()
if controller.args.debug:
log.setLevel(logging.DEBUG)
controller.config() controller.config()
controller.run_cpu_port_loop() controller.run_cpu_port_loop()