diff --git a/db/geni_control.in b/db/geni_control.in index ecaad223b09af35f50e32fd6211d118076a5d977..07fdd13af1a88ce5b622a7f9eaeeb0e6d7269c20 100755 --- a/db/geni_control.in +++ b/db/geni_control.in @@ -43,6 +43,7 @@ use Node; use libGeni; use GeniResource; use GeniHRN; +use GeniXML; sub fatal($); sub AllocNodes(); @@ -51,7 +52,6 @@ sub Register(); sub UnRegister(); sub ClearAll(); sub StartAll(); -sub RestartAll(); sub StopAll(); sub WaitAll(); sub PurgeAll(); @@ -90,7 +90,7 @@ my $eid = shift; my $action = shift; 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; } else { @@ -176,10 +176,6 @@ SWITCH: for ($action) { StartAll(); last SWITCH; }; - /^restart$/ && do { - RestartAll(); - last SWITCH; - }; /^stop$/ && do { StopAll(); last SWITCH; @@ -280,18 +276,10 @@ sub PurgeAll() sub StartAll() { - libGeni::StartSlivers($experiment, $this_user, 0, $debug) == 0 or + libGeni::StartSlivers($experiment, $this_user, $debug) == 0 or 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() { my @resources = GeniResource->LookupAll($experiment); @@ -353,8 +341,8 @@ sub GetManifests() print STDERR "No manifest for $resource\n"; next; } - - print STDERR Dumper($manifest); + + print STDERR Dumper(GeniXML::Serialize($manifest, 1)); } return 0;