Commit 1da13062 authored by Leigh B Stoller's avatar Leigh B Stoller

Minor tweaks.

parent 940c886b
...@@ -43,6 +43,7 @@ use Node; ...@@ -43,6 +43,7 @@ use Node;
use libGeni; use libGeni;
use GeniResource; use GeniResource;
use GeniHRN; use GeniHRN;
use GeniXML;
sub fatal($); sub fatal($);
sub AllocNodes(); sub AllocNodes();
...@@ -51,7 +52,6 @@ sub Register(); ...@@ -51,7 +52,6 @@ sub Register();
sub UnRegister(); sub UnRegister();
sub ClearAll(); sub ClearAll();
sub StartAll(); sub StartAll();
sub RestartAll();
sub StopAll(); sub StopAll();
sub WaitAll(); sub WaitAll();
sub PurgeAll(); sub PurgeAll();
...@@ -90,7 +90,7 @@ my $eid = shift; ...@@ -90,7 +90,7 @@ my $eid = shift;
my $action = shift; my $action = shift;
if ($action =~ if ($action =~
/^(alloc|free|clear|wait|purge|start|restart|mapnodes|status|stop|register|unregister||manifests|renew)$/) { /^(alloc|free|clear|wait|purge|start|mapnodes|status|stop|register|unregister||manifests|renew)$/) {
$action = $1; $action = $1;
} }
else { else {
...@@ -176,10 +176,6 @@ SWITCH: for ($action) { ...@@ -176,10 +176,6 @@ SWITCH: for ($action) {
StartAll(); StartAll();
last SWITCH; last SWITCH;
}; };
/^restart$/ && do {
RestartAll();
last SWITCH;
};
/^stop$/ && do { /^stop$/ && do {
StopAll(); StopAll();
last SWITCH; last SWITCH;
...@@ -280,18 +276,10 @@ sub PurgeAll() ...@@ -280,18 +276,10 @@ sub PurgeAll()
sub StartAll() sub StartAll()
{ {
libGeni::StartSlivers($experiment, $this_user, 0, $debug) == 0 or libGeni::StartSlivers($experiment, $this_user, $debug) == 0 or
fatal("Cannot start slivers!\n"); fatal("Cannot start slivers!\n");
} }
sub RestartAll()
{
libGeni::StartSlivers($experiment, $this_user, 1, $debug) == 0 or
fatal("Cannot restart slivers!\n");
return 0;
}
sub StopAll() sub StopAll()
{ {
my @resources = GeniResource->LookupAll($experiment); my @resources = GeniResource->LookupAll($experiment);
...@@ -353,8 +341,8 @@ sub GetManifests() ...@@ -353,8 +341,8 @@ sub GetManifests()
print STDERR "No manifest for $resource\n"; print STDERR "No manifest for $resource\n";
next; next;
} }
print STDERR Dumper($manifest); print STDERR Dumper(GeniXML::Serialize($manifest, 1));
} }
return 0; return 0;
......
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