Commit 9dae58e5 authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Fix for bug thats been around for a long time; the event scheduler expects

the event list to be a list of eight items, but we were sending back only
seven for the static events. Up until FreeBSD 10 this did not seem to be a
problem, but under 10, core dump!
parent 45c0d9ef
...@@ -3186,14 +3186,16 @@ class experiment: ...@@ -3186,14 +3186,16 @@ class experiment:
"EVPROXY", "EVPROXY",
"UPDATE", "UPDATE",
"", "",
"__plab_setup")) "__plab_setup",
""))
result.append((str(count), result.append((str(count),
"0.0", "0.0",
"__%s_proxy" % plab[0], "__%s_proxy" % plab[0],
"EVPROXY", "EVPROXY",
"CLEAR", "CLEAR",
"", "",
"__plab_teardown")) "__plab_teardown",
""))
count += 1 count += 1
pass pass
...@@ -3203,14 +3205,16 @@ class experiment: ...@@ -3203,14 +3205,16 @@ class experiment:
"SIMULATOR", "SIMULATOR",
"LOG", "LOG",
"Plab setup delay", "Plab setup delay",
"__plab_setup")) "__plab_setup",
""))
result.append((str(count), result.append((str(count),
"0.0", "0.0",
"__plab_setup", "__plab_setup",
"TIMELINE", "TIMELINE",
"RUN", "RUN",
"", "",
"__ns_sequence")) "__ns_sequence",
""))
result.append((str(count), result.append((str(count),
"2.0", "2.0",
...@@ -3218,14 +3222,16 @@ class experiment: ...@@ -3218,14 +3222,16 @@ class experiment:
"SIMULATOR", "SIMULATOR",
"LOG", "LOG",
"Plab teardown delay", "Plab teardown delay",
"__plab_teardown")) "__plab_teardown",
""))
result.append((str(count), result.append((str(count),
"0.0", "0.0",
"__plab_teardown", "__plab_teardown",
"TIMELINE", "TIMELINE",
"RUN", "RUN",
"", "",
"__ns_teardown")) "__ns_teardown",
""))
pass pass
return EmulabResponse(RESPONSE_SUCCESS, value=result) return EmulabResponse(RESPONSE_SUCCESS, value=result)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment