git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.onelab.eu/git/sfa
[sfa.git]
/
sfa
/
client
/
sfi.py
diff --git
a/sfa/client/sfi.py
b/sfa/client/sfi.py
index
ad3d8bb
..
c5eadc5
100644
(file)
--- a/
sfa/client/sfi.py
+++ b/
sfa/client/sfi.py
@@
-911,12
+911,12
@@
or with an slice hrn, shows currently provisioned resources
# not contained in this request will be removed from the slice
# CreateSliver has supported the options argument for a while now so it should
# not contained in this request will be removed from the slice
# CreateSliver has supported the options argument for a while now so it should
- # be safe to assume this server support it
+ # be safe to assume this server support it
api_options = {}
api_options ['append'] = False
api_options ['call_id'] = unique_call_id()
api_options = {}
api_options ['append'] = False
api_options ['call_id'] = unique_call_id()
- result = server.CreateSliver(slice_urn, creds, rspec, users,
api_options
)
+ result = server.CreateSliver(slice_urn, creds, rspec, users,
*self.ois(server, api_options)
)
value = ReturnValue.get_value(result)
if options.file is None:
print value
value = ReturnValue.get_value(result)
if options.file is None:
print value
@@
-964,12
+964,11
@@
or with an slice hrn, shows currently provisioned resources
if options.delegate:
delegated_cred = self.delegate_cred(slice_cred, get_authority(self.authority))
creds.append(delegated_cred)
if options.delegate:
delegated_cred = self.delegate_cred(slice_cred, get_authority(self.authority))
creds.append(delegated_cred)
- call_args.append(creds)
# options and call_id when supported
api_options = {}
api_options['call_id']=unique_call_id()
# options and call_id when supported
api_options = {}
api_options['call_id']=unique_call_id()
- result = server.SliverStatus(slice_urn, creds, self.ois(server,api_options))
+ result = server.SliverStatus(slice_urn, creds,
*
self.ois(server,api_options))
value = ReturnValue.get_value(result)
print value
if options.file:
value = ReturnValue.get_value(result)
print value
if options.file: