Commit 0fb5397d authored by Leigh Stoller's avatar Leigh Stoller

Kill obsolete load if libGeni; no longer needed/users, aborted fork in

the road. And it is a causing an odd perl error.
parent 298b2a58
#!/usr/bin/perl -wT
#
# Copyright (c) 2000-2016 University of Utah and the Flux Group.
# Copyright (c) 2000-2017 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -115,9 +115,6 @@ use event;
use POSIX qw(strftime);
use IO::Handle;
use Fcntl;
if ($PGENISUPPORT) {
require libGeni;
}
# External Programs
my $ssh = "$TB/bin/sshtb -n";
......@@ -381,6 +378,8 @@ sub nodereboot($$)
# Fire off the geninode reboots.
#
if (keys(%geninodes)) {
require libGeni;
my $this_user = User->ThisUser();
if (!defined($this_user)) {
tbdie("Could not determine current user for libGeni\n");
......
#!/usr/bin/perl -w
#
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
# Copyright (c) 2000-2010, 2017 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -102,13 +102,6 @@ if (!$force && $state ne EXPTSTATE_TERMINATING) {
tbdie("Experiment is in the wrong state: $state.\n");
}
if ($PGENISUPPORT) {
require libGeni;
if (libGeni::UnRegister($experiment)) {
tbdie("Could not delete protogeni slice\n");
}
}
print "Clearing out virtual state.\n";
$experiment->RemoveVirtualState() == 0 or $errors++;
......
#!/usr/bin/perl -w
#
# Copyright (c) 2000-2016 University of Utah and the Flux Group.
# Copyright (c) 2000-2017 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -751,18 +751,6 @@ sub doSwapout($) {
return 1;
}
#
# Clear away Geni slivers. Do not proceed if this fails.
#
if ($PGENISUPPORT) {
require libGeni;
if (libGeni::DeleteAllSlivers($experiment, $this_user)) {
tberror("Could not delete slivers\n");
return 1;
}
}
#
# Clear logical interfaces and wires. This might move to support
# swapmod.
......
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