Move wifi experiment specific arguments to separate parser
This also fixes a crash when using wifi_ping.py example due
to code not being fully removed.
Change-Id: I06662cc4f19b4899b4261da313cea943c3a258cd
diff --git a/minindn/helpers/experiment.py b/minindn/helpers/experiment.py
index c454ff4..b6c2b02 100644
--- a/minindn/helpers/experiment.py
+++ b/minindn/helpers/experiment.py
@@ -23,6 +23,7 @@
import time
import sys
+import argparse
from itertools import cycle
from mininet.log import info
@@ -130,3 +131,15 @@
nodesPingedList = []
return pingedDict
+
+ import argparse
+
+ @staticmethod
+ def getWifiExperimentParser(parent=argparse.ArgumentParser()):
+ parser = argparse.ArgumentParser(prog='minindn-wifi', parents=[parent], add_help=False)
+
+ parser.add_argument('--mobility',action='store_true',dest='mobility',default=False,
+ help='Enable custom mobility for topology (defined in script)')
+ parser.add_argument('--model-mob',action='store_true',dest='modelMob',default=False,
+ help='Enable model mobility for topology (defined in script; see adhoc experiment for how to specify in topology file)')
+ return parser
\ No newline at end of file
diff --git a/minindn/wifi/minindnwifi.py b/minindn/wifi/minindnwifi.py
index 2e3b9ea..8eb9b2c 100644
--- a/minindn/wifi/minindnwifi.py
+++ b/minindn/wifi/minindnwifi.py
@@ -120,9 +120,6 @@
parser.add_argument('--result-dir', action='store', dest='resultDir', default=None,
help='Specify the full path destination folder where experiment results will be moved')
- parser.add_argument('--mobility',action='store_true',dest='mobility',default=False,
- help='Enable custom mobility for topology (defined in topology file)')
-
parser.add_argument('--ifb',action='store_true',dest='ifb',default=False,
help='Simulate delay on receiver-side by use of virtual IFB devices (see docs)')
@@ -391,9 +388,6 @@
parser.add_argument('--result-dir', action='store', dest='resultDir', default=None,
help='Specify the full path destination folder where experiment results will be moved')
- parser.add_argument('--mobility',action='store_true',dest='mobility',default=False,
- help='Enable custom mobility for topology (defined in topology file)')
-
parser.add_argument('--ifb',action='store_true',dest='ifb',default=False,
help='Simulate delay on receiver-side by use of virtual IFB devices (see docs)')