lab/mininet-sample
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

only log some information when relevant

Browse Source
This commit is contained in:
Quentin De Coninck 2020-07-08 14:48:20 +02:00
parent 3c9df58592
commit 4d1fe8a2ce
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/experiment.py
View File

@ -199,30 +199,26 @@ class Experiment(object):
""" """
Function only meaningful to MPTCP with a specific path manager Function only meaningful to MPTCP with a specific path manager
""" """
if self.experiment_parameter.get(ExperimentParameter.KERNELPMC) != "netlink": if self.experiment_parameter.get(ExperimentParameter.KERNELPMC) == "netlink":
logging.warning("Client: unable to change the userspace pm if the kernel pm is not netlink") logging.info("Running user-space path manager on client")
else:
upmc = self.experiment_parameter.get(ExperimentParameter.USERPMC) upmc = self.experiment_parameter.get(ExperimentParameter.USERPMC)
upmca = self.experiment_parameter.get(ExperimentParameter.USERPMC_ARGS) upmca = self.experiment_parameter.get(ExperimentParameter.USERPMC_ARGS)
self.topo.command_to(self.topo_config.client, "{} {} &>{} &".format( self.topo.command_to(self.topo_config.client, "{} {} &>{} &".format(
upmc, upmca, "upmc.log")) upmc, upmca, "upmc.log"))
if self.experiment_parameter.get(ExperimentParameter.KERNELPMS) != "netlink": if self.experiment_parameter.get(ExperimentParameter.KERNELPMS) == "netlink":
logging.warning("Server: unable to change the userspace pm if the kernel pm is not netlink") logging.info("Running user-space path manager on server")
else:
upms = self.experiment_parameter.get(ExperimentParameter.USERPMS) upms = self.experiment_parameter.get(ExperimentParameter.USERPMS)
upmsa = self.experiment_parameter.get(ExperimentParameter.USERPMS_ARGS) upmsa = self.experiment_parameter.get(ExperimentParameter.USERPMS_ARGS)
self.topo.command_to(self.topo_config.server, "{} {} &>{} &".format( self.topo.command_to(self.topo_config.server, "{} {} &>{} &".format(
upms, upmsa, "upms.log")) upms, upmsa, "upms.log"))
def clean_userspace_path_manager(self): def clean_userspace_path_manager(self):
if self.experiment_parameter.get(ExperimentParameter.KERNELPMC) != "netlink": if self.experiment_parameter.get(ExperimentParameter.KERNELPMC) == "netlink":
logging.warning("Client: unable to change the userspace pm if the kernel pm is not netlink") logging.info("Cleaning user-space path manager on client")
else:
upmc = self.experiment_parameter.get(ExperimentParameter.USERPMC) upmc = self.experiment_parameter.get(ExperimentParameter.USERPMC)
self.topo.command_to(self.topo_config.client, "killall {}".format(upmc)) self.topo.command_to(self.topo_config.client, "killall {}".format(upmc))
if self.experiment_parameter.get(ExperimentParameter.KERNELPMS) != "netlink": if self.experiment_parameter.get(ExperimentParameter.KERNELPMS) == "netlink":
logging.warning("Server: unable to change the userspace pm if the kernel pm is not netlink") logging.info("Cleaning user-space path manager on server")
else:
upms = self.experiment_parameter.get(ExperimentParameter.USERPMS) upms = self.experiment_parameter.get(ExperimentParameter.USERPMS)
self.topo.command_to(self.topo_config.client, "killall {}".format(upms)) self.topo.command_to(self.topo_config.client, "killall {}".format(upms))