Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
emulab-stable
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
emulab
emulab-stable
Commits
cb95c1d7
Commit
cb95c1d7
authored
Jan 29, 2013
by
Leigh Stoller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add public_url to CM Sliverstatus() return blob, and pg_public_url to
AM version of same.
parent
65761bb6
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
0 deletions
+6
-0
protogeni/lib/GeniAM.pm.in
protogeni/lib/GeniAM.pm.in
+2
-0
protogeni/lib/GeniCMV2.pm.in
protogeni/lib/GeniCMV2.pm.in
+4
-0
No files found.
protogeni/lib/GeniAM.pm.in
View file @
cb95c1d7
...
...
@@ -602,6 +602,8 @@ sub SliverStatus()
# include the pg status
$status->{'
pg_status
'} = $pgstatus->{'
status
'};
$status->{'
pg_public_url
'} = $pgstatus->{'
public_url
'}
if (exists($pgstatus->{'
public_url
'}));
# include the expiration, converting to UTC
my $slice = GeniSlice->Lookup($slice_urn);
...
...
protogeni/lib/GeniCMV2.pm.in
View file @
cb95c1d7
...
...
@@ -1094,6 +1094,10 @@ sub SliverStatus($)
"error"
=>
$
aggregate
->
ErrorLog
(),
"details"
=>
{},
};
$
blob
->{
'public_url'
}
=
"$TBBASE/showslicepub.php?publicid="
.
$
slice
->
publicid
()
if
(
defined
($
slice
->
publicid
()));
foreach
my
$
sliver
(@
slivers
)
{
if
($
sliver
->
isa
(
"GeniAggregate"
))
{
next
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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