X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fclient%2Fsfi.py;h=c5eadc5b1cc9ed083d99eeb82a90c7c9a347bfcc;hb=96eb4cdaa6e16333d80095a4012cb71937b70030;hp=6da7ddae70e285f093e1d4a9feb3609e27f6ab7b;hpb=c2ec6bbcf6abede141d44ec88952ae3030ab5519;p=sfa.git diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py index 6da7ddae..c5eadc5b 100644 --- a/sfa/client/sfi.py +++ b/sfa/client/sfi.py @@ -340,8 +340,6 @@ class Sfi: parser.add_option("-D", "--debug", action="store_true", dest="debug", default=False, help="Debug (xml-rpc) protocol messages") - parser.add_option("-p", "--protocol", dest="protocol", default="xmlrpc", - help="RPC protocol (xmlrpc or soap)") # would it make sense to use ~/.ssh/id_rsa as a default here ? parser.add_option("-k", "--private-key", action="store", dest="user_private_key", default=None, @@ -913,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 - # 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() - 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 @@ -966,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) - call_args.append(creds) # 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: