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

Switch from control_net to control_iface usage.

parent 3bf5809e
...@@ -63,7 +63,7 @@ while (<IF>) { ...@@ -63,7 +63,7 @@ while (<IF>) {
$query .= "LEFT JOIN reserved AS r ON n.node_id = r.node_id "; $query .= "LEFT JOIN reserved AS r ON n.node_id = r.node_id ";
} }
$query .= "WHERE (n.type='$nodetype' OR t.class='$nodetype') "; $query .= "WHERE (n.type='$nodetype' OR t.class='$nodetype') ";
$query .= "AND i.card = t.control_net "; $query .= "AND i.iface = t.control_iface ";
$query .= "ORDER BY n.priority"; $query .= "ORDER BY n.priority";
my $result = DBQueryFatal($query); my $result = DBQueryFatal($query);
......
...@@ -125,13 +125,13 @@ if (defined($nickname)) { ...@@ -125,13 +125,13 @@ if (defined($nickname)) {
# Must be a valid type. # Must be a valid type.
# #
my $query_result = my $query_result =
DBQueryFatal("select osid,control_net from node_types ". DBQueryFatal("select osid,control_iface from node_types ".
"where type='$nodetype'"); "where type='$nodetype'");
if (! $query_result->numrows) { if (! $query_result->numrows) {
fatal("*** $0:\n". fatal("*** $0:\n".
" No such nodetype $nodetype is defined in the DB!\n"); " No such nodetype $nodetype is defined in the DB!\n");
} }
my ($defosid,$control_net) = $query_result->fetchrow_array(); my ($defosid,$control_iface) = $query_result->fetchrow_array();
# #
# For now, just pcwa/pcron is allowed until we have more DB state that says # For now, just pcwa/pcron is allowed until we have more DB state that says
...@@ -247,12 +247,14 @@ else { ...@@ -247,12 +247,14 @@ else {
"(node_id, status, status_timestamp) ". "(node_id, status, status_timestamp) ".
"values ('$nodename', 'down', now()) "); "values ('$nodename', 'down', now()) ");
# Note that card/port are arbitrary for remote nodes since they are
# not connected to local switches!
my $ifacerole = TBDB_IFACEROLE_CONTROL(); my $ifacerole = TBDB_IFACEROLE_CONTROL();
DBQueryFatal("insert into interfaces ". DBQueryFatal("insert into interfaces ".
"(node_id, card, port, IP, interface_type, iface, role) ". "(node_id, card, port, IP, interface_type, iface, role) ".
"values ('$nodename', $control_net, 1, '$nodeip', ". "values ('$nodename', 0, 1, '$nodeip', ".
" 'fxp', 'eth0', '$ifacerole')"); " 'fxp', '$control_iface', '$ifacerole')");
DBQueryFatal("insert into reserved ". DBQueryFatal("insert into reserved ".
"(node_id, pid, eid, rsrv_time, vname) ". "(node_id, pid, eid, rsrv_time, vname) ".
......
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