add none experiment

Signed-off-by: Benjamin Hesmans <benjamin.hesmans@uclouvain.be>

src/mpExperience.py

@@ -4,6 +4,8 @@ class MpExperience:
 	PING = "ping"
 	NCPV = "ncpv"
 	NC = "nc"
+	NONE = "none"
+
 	def __init__(self, xpParam, mpTopo, mpConfig):
 		self.xpParam  = xpParam
 		self.mpTopo   = mpTopo

src/mpExperienceNone.py

@@ -0,0 +1,16 @@
+from mpExperience import MpExperience
+from mpParamXp import MpParamXp
+
+class  MpExperienceNone(MpExperience):
+	def __init__(self, xpParamFile, mpTopo, mpConfig):
+		MpExperience.__init__(self, xpParamFile, mpTopo, mpConfig)
+		MpExperience.classicRun(self)
+
+	def prepapre(self):
+		MpExperience.prepare(self)
+
+	def clean(self):
+		MpExperience.clean(self)
+
+	def run(self):
+		self.mpTopo.getCLI()

src/mpParamXp.py

@@ -51,7 +51,7 @@ class MpParamXp(MpParam):
 
 	defaultValue[CLIENTPCAP] = "no"
 	defaultValue[SERVERPCAP] = "no"
-	defaultValue[XPTYPE] = "ping"
+	defaultValue[XPTYPE] = "none"
 	defaultValue[PINGCOUNT] = "5"
 	defaultValue[DDIBS] = "1k"
 	defaultValue[DDOBS] = "1k"

src/mpXpRunner.py

@@ -65,15 +65,15 @@ class MpXpRunner:
 		if xp == MpExperience.PING:
 			MpExperiencePing(self.xpParam, self.mpTopo,
 					self.mpTopoConfig)
-			self.mpTopo.getCLI()
 		elif xp == MpExperience.NCPV:
 			MpExperienceNCPV(self.xpParam, self.mpTopo,
 					self.mpTopoConfig)
-			self.mpTopo.getCLI()
 		elif xp == MpExperience.NC:
 			MpExperienceNC(self.xpParam, self.mpTopo,
 					self.mpTopoConfig)
-			self.mpTopo.getCLI()
+		elif xp == MpExperience.NONE:
+			MpExperienceNC(self.xpParam, self.mpTopo,
+					self.mpTopoConfig)
 		else:
 			print("Unfound xp type..." + xp)