Commit 02c9af99 authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Replace card with iface in join.

parent 36f81cec
#!/usr/bin/perl -w #!/usr/bin/perl -w
# #
# Copyright (c) 2000-2014 University of Utah and the Flux Group. # Copyright (c) 2000-2017 University of Utah and the Flux Group.
# #
# {{{EMULAB-LICENSE # {{{EMULAB-LICENSE
# #
...@@ -154,7 +154,7 @@ $db_result = ...@@ -154,7 +154,7 @@ $db_result =
"left join interfaces as i on i.node_id=n.phys_nodeid ". "left join interfaces as i on i.node_id=n.phys_nodeid ".
"left join interfaces as i2 on i2.node_id=n.node_id ". "left join interfaces as i2 on i2.node_id=n.node_id ".
"left join reserved as r on r.node_id=n.node_id ". "left join reserved as r on r.node_id=n.node_id ".
"where n.role='virtnode' and i2.card is null and ". "where n.role='virtnode' and i2.iface is null and ".
" (i.IP is not null or n.jailip is not null) and ". " (i.IP is not null or n.jailip is not null) and ".
" i.role='" . TBDB_IFACEROLE_CONTROL() . "'"); " i.role='" . TBDB_IFACEROLE_CONTROL() . "'");
...@@ -170,7 +170,7 @@ $db_result = ...@@ -170,7 +170,7 @@ $db_result =
"on n.phys_nodeid=i.node_id and n.node_id!=i.node_id ". "on n.phys_nodeid=i.node_id and n.node_id!=i.node_id ".
"where n.role='testnode' ". "where n.role='testnode' ".
" and (i.IP is not null or n.jailip is not null) ". " and (i.IP is not null or n.jailip is not null) ".
" and (i.card is null or ". " and (i.iface is null or ".
" i.role='" . TBDB_IFACEROLE_GW() . "') "); " i.role='" . TBDB_IFACEROLE_GW() . "') ");
process_nodes($db_result); process_nodes($db_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