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

mpExperienceDITG: fix silly bug

Browse Source
This commit is contained in:
Quentin De Coninck 2016-06-07 16:10:47 +02:00
parent c2436d574a
commit 040a8229e7
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mpExperienceDITG.py
View File

@ -41,8 +41,8 @@ class MpExperienceDITG(MpExperience):
""" """
self.kbytes = self.xpParam.getParam(MpParamXp.DITGKBYTES) 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)
self.bursts_on_packets_sec = self.xpParam.getParam(MpParamXp.BURSTSONPACKETSSEC) self.bursts_on_packets_sec = self.xpParam.getParam(MpParamXp.DITGBURSTSONPACKETSSEC)
self.bursts_off_packets_sec = self.xpParam.getParam(MpParamXp.BURSTSOFFPACKETSSEC) self.bursts_off_packets_sec = self.xpParam.getParam(MpParamXp.DITGBURSTSOFFPACKETSSEC)
def prepare(self): def prepare(self):
MpExperience.prepare(self) MpExperience.prepare(self)
@ -54,9 +54,9 @@ class MpExperienceDITG(MpExperience):
s = MpExperienceDITG.ITGSEND_BIN + " -a " + self.mpConfig.getServerIP() + \ s = MpExperienceDITG.ITGSEND_BIN + " -a " + self.mpConfig.getServerIP() + \
" -T TCP -k " + self.kbytes + " -l " + MpExperienceDITG.DITG_TEMP_LOG " -T TCP -k " + self.kbytes + " -l " + MpExperienceDITG.DITG_TEMP_LOG
if self.mean_poisson_packets_sec: if self.mean_poisson_packets_sec != "0":
s += " -O " + self.mean_poisson_packets_sec s += " -O " + self.mean_poisson_packets_sec
elif self.bursts_on_packets_sec and self.bursts_off_packets_sec: elif self.bursts_on_packets_sec != "0" and self.bursts_off_packets_sec != "0":
s += " -B C " + self.bursts_on_packets_sec + " C " + self.bursts_off_packets_sec s += " -B C " + self.bursts_on_packets_sec + " C " + self.bursts_off_packets_sec
s += " && " + MpExperienceDITG.ITGDEC_BIN + " " + MpExperienceDITG.DITG_TEMP_LOG + " &> " + MpExperienceDITG.DITG_LOG s += " && " + MpExperienceDITG.ITGDEC_BIN + " " + MpExperienceDITG.DITG_TEMP_LOG + " &> " + MpExperienceDITG.DITG_LOG

10
src/mpParamXp.py
View File

@ -52,8 +52,8 @@ class MpParamXp(MpParam):
VLCTIME = "vlcTime" VLCTIME = "vlcTime"
DITGKBYTES = "ditgKBytes" DITGKBYTES = "ditgKBytes"
DITGMEANPOISSONPACKETSSEC = "ditgMeanPoissonPacketsSec" DITGMEANPOISSONPACKETSSEC = "ditgMeanPoissonPacketsSec"
BURSTSONPACKETSSEC = "burstsOnPacketsSec" DITGBURSTSONPACKETSSEC = "ditgBurstsOnPacketsSec"
BURSTSOFFPACKETSSEC = "burstsOffPacketsSec" DITGBURSTSOFFPACKETSSEC = "ditgBurstsOffPacketsSec"
PRIOPATH0 = "prioPath0" PRIOPATH0 = "prioPath0"
PRIOPATH1 = "prioPath1" PRIOPATH1 = "prioPath1"
BACKUPPATH0 = "backupPath0" BACKUPPATH0 = "backupPath0"
@ -131,9 +131,9 @@ class MpParamXp(MpParam):
defaultValue[VLCFILE] = "bunny_ibmff_360.mpd" defaultValue[VLCFILE] = "bunny_ibmff_360.mpd"
defaultValue[VLCTIME] = "0" defaultValue[VLCTIME] = "0"
defaultValue[DITGKBYTES] = "10000" defaultValue[DITGKBYTES] = "10000"
defaultValue[DITGMEANPOISSONPACKETSSEC] = "1500" defaultValue[DITGMEANPOISSONPACKETSSEC] = "0"
defaultValue[BURSTSONPACKETSSEC] = "2250" defaultValue[DITGBURSTSONPACKETSSEC] = "0"
defaultValue[BURSTSOFFPACKETSSEC] = "750" defaultValue[DITGBURSTSOFFPACKETSSEC] = "0"
defaultValue[PRIOPATH0] = "0" defaultValue[PRIOPATH0] = "0"
defaultValue[PRIOPATH1] = "0" defaultValue[PRIOPATH1] = "0"
defaultValue[BACKUPPATH0] = "0" defaultValue[BACKUPPATH0] = "0"