mpExperienceSiri: register xp

This commit is contained in:
Quentin De Coninck 2016-04-14 16:01:39 +02:00
parent 151497d1d7
commit 134f3897d2
3 changed files with 7 additions and 2 deletions

View File

@ -10,6 +10,7 @@ class MpExperience:
EPLOAD = "epload"
NETPERF = "netperf"
AB = "ab"
SIRI = "siri"
SENDFILE = "sendfile"
def __init__(self, xpParam, mpTopo, mpConfig):

View File

@ -53,13 +53,13 @@ class MpExperienceSiri(MpExperience):
MpExperienceSiri.SERVER_LOG)
def getSiriServerCmd(self):
s = "python " + os.path.dirname(os.path.abspath(__file__)) + \
s = "python3 " + os.path.dirname(os.path.abspath(__file__)) + \
"/siri_server.py &>" + MpExperienceSiri.SERVER_LOG + "&"
print(s)
return s
def getSiriClientCmd(self):
s = MpExperienceSiri.JAVA_BIN + " -jar siriClient.jar" + self.mpConfig.getServerIP() + \
s = MpExperienceSiri.JAVA_BIN + " -jar siriClient.jar " + self.mpConfig.getServerIP() + \
" 8080 " + self.run_time + " " + self.query_size + " " + self.response_size + \
" " + self.delay_query_response + " " + self.min_payload_size + " " + \
self.max_payload_size + " " + self.interval_time_ms + " " + self.buffer_size + \

View File

@ -14,6 +14,7 @@ from mpExperienceSendFile import MpExperienceSendFile
from mpExperienceEpload import MpExperienceEpload
from mpExperienceNetperf import MpExperienceNetperf
from mpExperienceAb import MpExperienceAb
from mpExperienceSiri import MpExperienceSiri
from mpExperienceNone import MpExperienceNone
from mpExperience import MpExperience
from mpECMPSingleInterfaceTopo import MpECMPSingleInterfaceTopo
@ -96,6 +97,9 @@ class MpXpRunner:
elif xp == MpExperience.AB:
MpExperienceAb(self.xpParam, self.mpTopo,
self.mpTopoConfig)
elif xp == MpExperience.SIRI:
MpExperienceSiri(self.xpParam, self.mpTopo,
self.mpTopoConfig)
elif xp == MpExperience.SENDFILE:
MpExperienceSendFile(self.xpParam, self.mpTopo,
self.mpTopoConfig)