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

Merge branch 'rb'

Browse Source
This commit is contained in:
Raphael Bauduin 2015-06-08 11:52:58 -07:00
commit 62890ec05e
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/mpIterator.py
View File

@ -26,8 +26,8 @@ parser.add_option("-t", "--tests", dest="tests_dir",
help="Directory holding tests", metavar="TESTSDIR" , default="./tests") help="Directory holding tests", metavar="TESTSDIR" , default="./tests")
parser.add_option("-l", "--logs", dest="logs_dir", parser.add_option("-l", "--logs", dest="logs_dir",
help="Directory where to log", metavar="LOGSDIR" , default="./logs") help="Directory where to log", metavar="LOGSDIR" , default="./logs")
parser.add_option("-r", "--repeat", dest="repeat", action="store_true", parser.add_option("-r", "--repeat", dest="repeat",
help="Reuse existing logs", metavar="REPEAT" , default=False) help="Reuse existing logs", metavar="REPEAT" , default="")
(options, args) = parser.parse_args() (options, args) = parser.parse_args()
@ -39,9 +39,8 @@ repeat = options.repeat
# take timestamp, used as subdirectory in logs_dir # take timestamp, used as subdirectory in logs_dir
timestamp=datetime.datetime.now().isoformat() timestamp=datetime.datetime.now().isoformat()
if repeat: if repeat!="":
print "not implemented" timestamp=repeat
timestamp="2015-06-01T14:57:31.617534"
#timestamp = "2015-05-26T15:42:45.419949" #timestamp = "2015-05-26T15:42:45.419949"
for test_name in [name for name in os.listdir(tests_dir) if os.path.isdir(os.path.join(tests_dir, name))]: for test_name in [name for name in os.listdir(tests_dir) if os.path.isdir(os.path.join(tests_dir, name))]:
@ -81,13 +80,14 @@ for test_name in [name for name in os.listdir(tests_dir) if os.path.isdir(os.pat
print checker.logs print checker.logs
else: else:
print checker.logs print checker.logs
for k in validations["aggregators"]: if validations["aggregators"]!=None:
# Identify checker class for k in validations["aggregators"]:
name = k.title().replace("_","")+"Aggregator" # Identify checker class
klass= globals()[name] name = k.title().replace("_","")+"Aggregator"
# instantiate checker with validations and test_name klass= globals()[name]
agg = klass(validations, test_name, destDir) # instantiate checker with validations and test_name
print agg agg = klass(validations, test_name, destDir)
print agg