Commit 3a7d6c7e authored by Leigh B Stoller's avatar Leigh B Stoller

Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel

parents 92f83e48 542603fc
......@@ -965,6 +965,9 @@ sub UpdateNodeTypeXpidPermissions()
my $auxdata = $rowref->{'auxdata'};
my $count = $rowref->{'count'};
next
if (! ($policy eq TBADMINCTRL_POLICY_TYPE()));
if ($debug) {
print "Type Perm: $ppid, $pgid, $count, $auxdata\n";
}
......
......@@ -28,6 +28,12 @@ FILES = $(wildcard *.py)
FILES += $(wildcard $(SRCDIR)/*.py)
FILES += $(wildcard $(SRCDIR)/*.rspec)
ALLFILES = $(notdir $(FILES))
# Gather up the AM tests and include their subdirectory
AMFILES1 = $(wildcard $(SRCDIR)/am/*.py)
AMFILES = $(addprefix am/, $(notdir $(AMFILES1)))
ALLFILES += $(AMFILES)
TARBALL = $(INSTALL_WWWDIR)/downloads/protogeni-tests.tar.gz
install: install-mkdir \
......@@ -37,7 +43,7 @@ install: install-mkdir \
control-install:
install-mkdir:
-mkdir -p $(INSTALL_TOPDIR)/opsdir/protogeni/test
-mkdir -p $(INSTALL_TOPDIR)/opsdir/protogeni/test/am
clean:
rm -f *.o core *.pl *.pm *.py
......
......@@ -52,7 +52,10 @@ params = [myslice["urn"], [slicecred]]
try:
response = do_method("am", "DeleteSliver", params,
response_handler=geni_am_response_handler)
print "Sliver %s has been deleted." % (SLICENAME)
print "value = %s" % (response)
if response:
print "Sliver %s has been deleted." % (SLICENAME)
else:
msg = "Something went wrong. Sliver %s has not been deleted."
print msg % (SLICENAME)
except xmlrpclib.Fault, e:
Fatal("Could not delete sliver: %s" % (str(e)))
......@@ -79,8 +79,7 @@ print "Renewed the slice, asking for slice credential again";
slicecred = get_slice_credential( myslice, mycredential )
print "Got the slice credential, renewing the sliver";
params = [SLICEURN, [slicecred]]
print "WARNING: No expiration time passed!"
params = [SLICEURN, [slicecred], valid_until]
try:
response = do_method("am", "RenewSliver", params,
response_handler=geni_am_response_handler)
......
......@@ -31,7 +31,6 @@ use Carp;
use POSIX;
use XML::LibXML;
use XML::Simple;
use GeniXML;
# Configure variables
my $TB = "@prefix@";
......@@ -47,9 +46,7 @@ my $OURDOMAIN = "@OURDOMAIN@";
my $cmid = '';
if ($PGENISUPPORT) {
require libGeni;
require GeniHRN;
$cmid = GeniHRN::Generate($OURDOMAIN, "authority", "cm");
}
# Flags.
......@@ -1012,6 +1009,7 @@ sub LoadCurrentResources($)
sub LoadVirtNodes($)
{
my ($self) = @_;
my $gotgeninodes = 0;
$self->printdb("Loading virtual nodes\n");
......@@ -1083,6 +1081,9 @@ sub LoadVirtNodes($)
# Mark this as being a virtual typed node.
$vnode->_isvtyped($isvtyped);
# dynamic inclusion below.
$gotgeninodes++ if ($isgeni);
# All this info is stashed in our local object.
$vnode->_nodeweight(undef);
$vnode->_isremotenode($isremote);
......@@ -1267,6 +1268,18 @@ sub LoadVirtNodes($)
# Add to the list.
$self->vnodes()->{$vname} = $vnode;
}
if ($gotgeninodes) {
if ($PGENISUPPORT) {
require libGeni;
require GeniXML;
import GeniXML;
$cmid = GeniHRN::Generate($OURDOMAIN, "authority", "cm");
}
else {
tberror("Using geni nodes but PROTOGENI_SUPPORT is not defined\n");
return -1;
}
}
#
# Go back and look for any VMs that were fixed to nodes. Need to make
......
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