Commit a368fb2c authored by Robert Ricci's avatar Robert Ricci
Browse files

Add 'notprereserved' flag to avail

... to make it easier to see which nodes are available for
pre-reserving to a project.

Incedentally, 'avail' has the worst argument processing ever.
parent a1dc66d0
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# #
# EMULAB-COPYRIGHT # EMULAB-COPYRIGHT
# Copyright (c) 2000-2008 University of Utah and the Flux Group. # Copyright (c) 2000-2008,2011 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
...@@ -21,7 +21,7 @@ my $d = 0; #debug mode ...@@ -21,7 +21,7 @@ my $d = 0; #debug mode
if ($#ARGV >= 0 && $ARGV[0] =~ /^-?h/i ) { if ($#ARGV >= 0 && $ARGV[0] =~ /^-?h/i ) {
die("Usage:\navail [help] [type[=<type>]] [OS[=<OS>]] [ver[=<OS_ver>]]\n". die("Usage:\navail [help] [type[=<type>]] [OS[=<OS>]] [ver[=<OS_ver>]]\n".
" [[includevirt] or [virtonly[=<phys>]]] [rand]\n". " [[includevirt] or [virtonly[=<phys>]]] [rand]\n".
" [limit=N] [aslist]\n". " [limit=N] [aslist] [notprereserved]\n".
"\n". "\n".
"type \t= pc | shark\n"."OS \t= Linux | FreeBSD | NetBSD | ...\n". "type \t= pc | shark\n"."OS \t= Linux | FreeBSD | NetBSD | ...\n".
"ver \t= 6.2 | 3.4 | 4.0 | 5.2 | ...\n".#"deltas \t= anetd | ...\n". "ver \t= 6.2 | 3.4 | 4.0 | 5.2 | ...\n".#"deltas \t= anetd | ...\n".
...@@ -114,6 +114,10 @@ if (defined($args{"prereserve"})) { ...@@ -114,6 +114,10 @@ if (defined($args{"prereserve"})) {
$cond .= " and a.reserved_pid='$pid' "; $cond .= " and a.reserved_pid='$pid' ";
} }
if (defined($args{"notprereserved"})) {
$cond .= " and a.reserved_pid is null";
}
my $cmd = "select $cols from $join where $cond order by $order $limit"; my $cmd = "select $cols from $join where $cond order by $order $limit";
print "Sending cmd:\n$cmd\n" if $d; print "Sending cmd:\n$cmd\n" if $d;
......
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