Commit 75599b00 authored by Timothy Stack's avatar Timothy Stack
Browse files

Allow experiment.info while activating or in modify_reparse so loghole

can run.
parent 57ac9dd1
...@@ -1692,7 +1692,9 @@ class experiment: ...@@ -1692,7 +1692,9 @@ class experiment:
result = {} result = {}
mapping = None mapping = None
if state == "active": if (state == "active" or
state == "activating" or
state == "modify_reparse"):
dbres = DBQuery( dbres = DBQuery(
"select r.vname,r.node_id,n.type,n.def_boot_osid,ns.status," "select r.vname,r.node_id,n.type,n.def_boot_osid,ns.status,"
"n.eventstate," "n.eventstate,"
...@@ -1745,11 +1747,13 @@ class experiment: ...@@ -1745,11 +1747,13 @@ class experiment:
pass pass
if argdict["aspect"] == "mapping": if argdict["aspect"] == "mapping":
if state != "active": if (state != "active" and
state != "activating" and
state != "modify_reparse"):
return EmulabResponse(RESPONSE_ERROR, return EmulabResponse(RESPONSE_ERROR,
output="Experiment is not active!") output="Experiment is not active!")
# Just return the mapping above # Just return the mapping above
result = mapping result = scrubdict(mapping)
pass pass
elif argdict["aspect"] == "links": elif argdict["aspect"] == "links":
dbres = DBQueryFatal("SELECT vname,ips from virt_nodes " dbres = DBQueryFatal("SELECT vname,ips from virt_nodes "
......
Markdown is supported
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