Commit 54d4eaf4 authored by Leigh B Stoller's avatar Leigh B Stoller

Merge branch 'wvdemeer/emulab-devel-fedapi-fix-expired-xmlrpc-bug-#49'

This merges !8 and closes #49.
parents b5f26869 8cbc123e
......@@ -400,7 +400,7 @@ sub CreateSlice($$)
"SLICE_CREATION" => GeniStd::DateTimeStringToRFC3339String($slice->created()),
"SLICE_EXPIRATION" => GeniStd::DateTimeStringToRFC3339String($slice->expires()),
# "SLICE_EXPIRATION" => GeniStd::DateTimeStringToRFC3339String($sliceCred->expires())
"SLICE_EXPIRED" => $coder->boolean($slice->IsExpired()),
"SLICE_EXPIRED" => $coder->boolean($slice->IsExpired() ? 1 : 0),
"SLICE_DESCRIPTION" => (defined($slice->description()) ? $slice->description() : ''),
#too bad the API doesn't let you return the credential(s) when using create.
# ,"SLICE_CREDENTIAL" => GeniResponse::value($response)
......@@ -543,7 +543,7 @@ sub LookupSlices()
"SLICE_UID" => $slice->uuid(),
"SLICE_CREATION" => GeniStd::DateTimeStringToRFC3339String($slice->created()),
"SLICE_EXPIRATION" => GeniStd::DateTimeStringToRFC3339String($slice->expires()),
"SLICE_EXPIRED" => $coder->boolean($slice->IsExpired()),
"SLICE_EXPIRED" => $coder->boolean($slice->IsExpired() ? 1 : 0),
# "SLICE_EXPIRED" => ($slice->IsExpired() ? 'True' : 'False'),
"SLICE_DESCRIPTION" => (defined($slice->description()) ? $slice->description() : ''),
};
......@@ -809,7 +809,7 @@ sub addSlicesToMemberList($$)
my $blob = {
'SLICE_URN' => $slice->urn(),
'SLICE_ROLE' => 'MEMBER', #on emulab, there is only a 'MEMBER' role for slices
'EXPIRED' => $coder->boolean($slice->IsExpired())
'EXPIRED' => $coder->boolean($slice->IsExpired() ? 1 : 0)
};
push(@{ $result }, $blob);
}
......
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