Commit eca5ed35 authored by Leigh B. Stoller's avatar Leigh B. Stoller
Browse files

Ack, query fix bug in previous revision.

parent 20024967
......@@ -2969,9 +2969,10 @@ class experiment:
res = DBQuery("select n.phys_nodeid,i.IP from reserved as r "
"left join nodes as n on n.node_id=r.node_id "
"left join node_types as nt on nt.type=n.type ".
"left join interfaces as i on i.node_id=n.phys_nodeid "
" and i.role='ctrl' "
"where r.pid=%s and r.eid=%s and n.isvirtnode=1 and "
"where r.pid=%s and r.eid=%s and nt.isvirtnode=1 and "
" (n.type='pcplab' or r.sharing_mode is not null) "
"group by n.phys_nodeid",
(argdict["proj"], argdict["exp"]))
......@@ -3087,9 +3088,10 @@ class experiment:
res = DBQuery("select n.phys_nodeid,i.IP from reserved as r "
"left join nodes as n on n.node_id=r.node_id "
"left join node_types as nt on nt.type=n.type ".
"left join interfaces as i on i.node_id=n.phys_nodeid "
" and i.role='ctrl' "
"where r.pid=%s and r.eid=%s and n.isvirtnode=1 and "
"where r.pid=%s and r.eid=%s and nt.isvirtnode=1 and "
" (n.type='pcplab' or r.sharing_mode is not null) "
"group by n.phys_nodeid",
(argdict["proj"], argdict["exp"]))
......
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