Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
emulab
emulab-devel
Commits
6b5d23fd
Commit
6b5d23fd
authored
Feb 09, 2012
by
Leigh B Stoller
Browse files
Merge branch 'mymaster'
parents
630ccf31
4e5d2b02
Changes
2
Hide whitespace changes
Inline
Side-by-side
protogeni/lib/GeniAM.pm.in
View file @
6b5d23fd
#
!/usr/bin/perl -wT
#
#
GENIPUBLIC
-
COPYRIGHT
#
Copyright
(
c
)
2008
-
201
1
University
of
Utah
and
the
Flux
Group
.
#
Copyright
(
c
)
2008
-
201
2
University
of
Utah
and
the
Flux
Group
.
#
All
rights
reserved
.
#
package
GeniAM
;
...
...
@@ -555,6 +555,21 @@ sub SliverStatus()
my $expires_str = POSIX::strftime("%Y-%m-%dT%H:%M:%S", @expires);
$status->{'
pg_expires
'} = $expires_str;
# Grab the keys (logins) for inclusion.
my $slice_experiment = $slice->GetExperiment();
if (!defined($slice_experiment)) {
print STDERR "*** No Experiment for $slice\n";
}
else {
my $bindings;
if ($slice_experiment->NonLocalUsers(\$bindings)) {
print STDERR "*** No bindings for $slice_experiment\n";
}
elsif (@{ $bindings }) {
$status->{'
users
'} = $bindings;
}
}
my $details = $pgstatus->{'
details
'};
my @children = ();
while ( my ($pgurn, $pgrstat) = each(%$details) ) {
...
...
protogeni/lib/GeniCMV2.pm.in
View file @
6b5d23fd
...
...
@@ -232,7 +232,7 @@ sub Resolve($)
print
STDERR
"*** No bindings for $slice_experiment
\n
"
;
}
elsif
(@{
$
bindings
})
{
$
blob
->{
'
key
s'
}
=
$
bindings
;
$
blob
->{
'
user
s'
}
=
$
bindings
;
}
}
}
...
...
@@ -280,7 +280,7 @@ sub Resolve($)
print
STDERR
"*** No bindings for $slice_experiment
\n
"
;
}
elsif
(@{
$
bindings
})
{
$
blob
->{
'
key
s'
}
=
$
bindings
;
$
blob
->{
'
user
s'
}
=
$
bindings
;
}
}
return
GeniResponse
->
Create
(
GENIRESPONSE_SUCCESS
,
$
blob
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment