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

Switch from control_net to control_iface usage.

parent 3a0d92f7
......@@ -160,7 +160,7 @@ $nodes_result =
"left join nodes on r.node_id=nodes.node_id ".
"left join node_types on node_types.type=nodes.type ".
"left join interfaces as i on r.node_id=i.node_id ".
" and i.card=node_types.control_net ".
" and i.iface=node_types.control_iface ".
" where i.IP!='NULL' and r.node_id not like 'sh%' ".
" and node_types.isvirtnode=0 ".
" and node_types.isremotenode=0 ".
......
......@@ -149,7 +149,7 @@ my $db_result =
" from nodes as n ".
"left join node_types as nt on n.type=nt.type ".
"left join interfaces as i on n.node_id=i.node_id and ".
" nt.control_net=i.card ".
" nt.control_iface=i.iface ".
"where nt.isvirtnode=0 and nt.issubnode=0 and ".
" n.role='testnode' and i.IP is not null ".
"order by nt.type,n.node_id");
......@@ -330,7 +330,7 @@ $db_result =
"left join nodes as n on r.node_id=n.node_id ".
"left join node_types as nt on n.type=nt.type ".
"left join interfaces as i on n.node_id=i.node_id and ".
" nt.control_net=i.card ".
" nt.control_iface=i.iface ".
"where nt.issubnode=1 and ".
" n.role='testnode' and i.IP is not null ".
"order by nt.type,n.node_id");
......
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