From 134f3897d2319e4436f990fa4c4a433a8e9d105b Mon Sep 17 00:00:00 2001
From: Quentin De Coninck <quentin.deconinck@uclouvain.be>
Date: Thu, 14 Apr 2016 16:01:39 +0200
Subject: [PATCH] mpExperienceSiri: register xp

---
 src/mpExperience.py     | 1 +
 src/mpExperienceSiri.py | 4 ++--
 src/mpXpRunner.py       | 4 ++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/mpExperience.py b/src/mpExperience.py
index d1c7771..69e2b66 100644
--- a/src/mpExperience.py
+++ b/src/mpExperience.py
@@ -10,6 +10,7 @@ class MpExperience:
 	EPLOAD = "epload"
 	NETPERF = "netperf"
 	AB = "ab"
+	SIRI = "siri"
 	SENDFILE = "sendfile"
 
 	def __init__(self, xpParam, mpTopo, mpConfig):
diff --git a/src/mpExperienceSiri.py b/src/mpExperienceSiri.py
index e12acbb..2e55ab5 100644
--- a/src/mpExperienceSiri.py
+++ b/src/mpExperienceSiri.py
@@ -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 + \
diff --git a/src/mpXpRunner.py b/src/mpXpRunner.py
index 48fec28..04f6459 100644
--- a/src/mpXpRunner.py
+++ b/src/mpXpRunner.py
@@ -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)