Skip to content

GitLab

Commit edfc5c18 authored by Leigh B. Stoller's avatar Leigh B. Stoller
Browse files
Options

Change RenewSliver() to take either a slice or sliver credential.

parent 6d7378a8
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 6 deletions
protogeni/lib/GeniCM.pm.in
View file @ edfc5c18
......@@ -2173,6 +2173,7 @@ sub RenewSliver($)
my $credstr = $argref->{'credential'};
my $expires = $argref->{'valid_until'};
my $message = "Error renewing aggregate";
my $slice_uuid;
if (! (defined($credstr) && defined($expires))) {
return GeniResponse->Create(GENIRESPONSE_BADARGS);
......@@ -2182,7 +2183,7 @@ sub RenewSliver($)
return GeniResponse->Create(GENIRESPONSE_ERROR, undef,
"Could not create GeniCredential object");
}
my $sliver_uuid = $credential->target_uuid();
my $target_uuid = $credential->target_uuid();
my $user_uuid = $credential->owner_uuid();
#
......@@ -2197,12 +2198,13 @@ sub RenewSliver($)
return GeniResponse->Create( GENIRESPONSE_FORBIDDEN, undef,
"Insufficient privilege" );
my $aggregate = GeniAggregate->Lookup($sliver_uuid);
if (!defined($aggregate)) {
return GeniResponse->Create(GENIRESPONSE_BADARGS, undef,
"No such aggregate $sliver_uuid");
my $aggregate = GeniAggregate->Lookup($target_uuid);
if (defined($aggregate)) {
$slice_uuid = $aggregate->slice_uuid();
}
else {
$slice_uuid = $target_uuid;
}
my $slice_uuid = $aggregate->slice_uuid();
my $slice = GeniSlice->Lookup($slice_uuid);
if (!defined($slice)) {
return GeniResponse->Create(GENIRESPONSE_ERROR, undef,
......
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