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

add args for userspace pm

Browse Source 
Signed-off-by: Benjamin Hesmans <benjamin.hesmans@uclouvain.be>
This commit is contained in:
Benjamin Hesmans 2015-02-23 12:42:14 +01:00
parent b9ac0bf3de
commit 2f516754e1
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mpExperience.py
View File

@ -26,14 +26,16 @@ class MpExperience:
print("Client : Error, I can't change the userspace pm if the kernel pm is not netlink !") print("Client : Error, I can't change the userspace pm if the kernel pm is not netlink !")
else: else:
upmc = self.xpParam.getParam(MpParamXp.USERPMC) upmc = self.xpParam.getParam(MpParamXp.USERPMC)
upmca = self.xpParam.getParam(MpParamXp.USERPMCARGS)
self.mpTopo.commandTo(self.mpConfig.client, upmc + \ self.mpTopo.commandTo(self.mpConfig.client, upmc + \
"&>upmc.log &") upmca + " &>upmc.log &")
if self.xpParam.getParam(MpParamXp.KERNELPMS) != "netlink": if self.xpParam.getParam(MpParamXp.KERNELPMS) != "netlink":
print("Server : Error, I can't change the userspace pm if the kernel pm is not netlink !") print("Server : Error, I can't change the userspace pm if the kernel pm is not netlink !")
else: else:
upms = self.xpParam.getParam(MpParamXp.USERPMS) upms = self.xpParam.getParam(MpParamXp.USERPMS)
upmsa = self.xpParam.getParam(MpParamXp.USERPMSARGS)
self.mpTopo.commandTo(self.mpConfig.server, upms + \ self.mpTopo.commandTo(self.mpConfig.server, upms + \
"&>upms.log &") upmsa + " &>upms.log &")
def cleanUserspacePM(self): def cleanUserspacePM(self):
if self.xpParam.getParam(MpParamXp.KERNELPMC) != "netlink": if self.xpParam.getParam(MpParamXp.KERNELPMC) != "netlink":

4
src/mpParamXp.py
View File

@ -9,6 +9,8 @@ class MpParamXp(MpParam):
KERNELPMS = "kpms" KERNELPMS = "kpms"
USERPMC = "upmc" USERPMC = "upmc"
USERPMS = "upms" #userspace path manager client / server USERPMS = "upms" #userspace path manager client / server
USERPMCARGS = "upmc_args"
USERPMSARGS = "upms_args"
CLIENTPCAP = "clientPcap" CLIENTPCAP = "clientPcap"
SERVERPCAP = "serverPcap" SERVERPCAP = "serverPcap"
XPTYPE = "xpType" XPTYPE = "xpType"
@ -42,6 +44,8 @@ class MpParamXp(MpParam):
defaultValue[KERNELPMC] = "fullmesh" defaultValue[KERNELPMC] = "fullmesh"
defaultValue[USERPMC] = "fullmesh" defaultValue[USERPMC] = "fullmesh"
defaultValue[USERPMS] = "fullmesh" defaultValue[USERPMS] = "fullmesh"
defaultValue[USERPMCARGS] = ""
defaultValue[USERPMSARGS] = ""
defaultValue[SCHED] = "default" defaultValue[SCHED] = "default"
defaultValue[CLIENTPCAP] = "no" defaultValue[CLIENTPCAP] = "no"