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

mpExperienceDITG: change name of parameter, be clearer

Browse Source
This commit is contained in:
Quentin De Coninck 2016-06-01 15:37:13 +02:00
parent e77baf3b65
commit cca5ee9635
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/mpExperienceDITG.py
View File

@ -38,17 +38,18 @@ class MpExperienceDITG(MpExperience):
""" """
todo : param LD_PRELOAD ?? todo : param LD_PRELOAD ??
""" """
self.bytes = self.xpParam.getParam(MpParamXp.DITGBYTES) self.kbytes = self.xpParam.getParam(MpParamXp.DITGKBYTES)
self.mean_poisson_packets_sec = self.xpParam.getParam(MpParamXp.DITGMEANPOISSONPACKETSSEC) self.mean_poisson_packets_sec = self.xpParam.getParam(MpParamXp.DITGMEANPOISSONPACKETSSEC)
def prepare(self): def prepare(self):
MpExperience.prepare(self) MpExperience.prepare(self)
self.mpTopo.commandTo(self.mpConfig.client, "rm " + MpExperienceDITG.IPERF_LOG) self.mpTopo.commandTo(self.mpConfig.client, "rm " + MpExperienceDITG.DITG_LOG)
self.mpTopo.commandTo(self.mpConfig.server, "rm " + MpExperienceDITG.SERVER_LOG) self.mpTopo.commandTo(self.mpConfig.server, "rm " + MpExperienceDITG.DITG_SERVER_LOG)
self.mpTopo.commandTo(self.mpConfig.client, "rm " + MpExperienceDITG.DITG_TEMP_LOG)
def getClientCmd(self): def getClientCmd(self):
s = MpExperienceDITG.ITGSEND_BIN + " -a " + self.mpConfig.getServerIP() + \ s = MpExperienceDITG.ITGSEND_BIN + " -a " + self.mpConfig.getServerIP() + \
" -T TCP -k " + self.bytes + " -O " + self.mean_poisson_packets_sec + " -l " + MpExperienceDITG.DITG_TEMP_LOG + " && " + \ " -T TCP -k " + self.kbytes + " -O " + self.mean_poisson_packets_sec + " -l " + MpExperienceDITG.DITG_TEMP_LOG + " && " + \
MpExperienceDITG.ITGDEC_BIN + " " + MpExperienceDITG.DITG_TEMP_LOG + " &> " + MpExperienceDITG.DITG_LOG MpExperienceDITG.ITGDEC_BIN + " " + MpExperienceDITG.DITG_TEMP_LOG + " &> " + MpExperienceDITG.DITG_LOG
print(s) print(s)
return s return s

4
src/mpParamXp.py
View File

@ -50,7 +50,7 @@ class MpParamXp(MpParam):
SIRIBUFFERSIZE = "siriBufferSize" SIRIBUFFERSIZE = "siriBufferSize"
VLCFILE = "vlcFile" VLCFILE = "vlcFile"
VLCTIME = "vlcTime" VLCTIME = "vlcTime"
DITGBYTES = "ditgBytes" DITGKBYTES = "ditgKBytes"
DITGMEANPOISSONPACKETSSEC = "ditgMeanPoissonPacketsSec" DITGMEANPOISSONPACKETSSEC = "ditgMeanPoissonPacketsSec"
PRIOPATH0 = "prioPath0" PRIOPATH0 = "prioPath0"
PRIOPATH1 = "prioPath1" PRIOPATH1 = "prioPath1"
@ -126,7 +126,7 @@ class MpParamXp(MpParam):
defaultValue[SIRIBUFFERSIZE] = "9" defaultValue[SIRIBUFFERSIZE] = "9"
defaultValue[VLCFILE] = "bunny_ibmff_360.mpd" defaultValue[VLCFILE] = "bunny_ibmff_360.mpd"
defaultValue[VLCTIME] = "0" defaultValue[VLCTIME] = "0"
defaultValue[DITGBYTES] = "10000" defaultValue[DITGKBYTES] = "10000"
defaultValue[DITGMEANPOISSONPACKETSSEC] = "1500" defaultValue[DITGMEANPOISSONPACKETSSEC] = "1500"
defaultValue[PRIOPATH0] = "0" defaultValue[PRIOPATH0] = "0"
defaultValue[PRIOPATH1] = "0" defaultValue[PRIOPATH1] = "0"