From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 14 Dec 2011 16:53:22 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-2.0-5~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=96eb4cdaa6e16333d80095a4012cb71937b70030;hp=-c;p=sfa.git

Merge branch 'master' of ssh://git.onelab.eu/git/sfa
---

96eb4cdaa6e16333d80095a4012cb71937b70030
diff --combined sfa/client/sfi.py
index ad3d8bbf,cdd628dd..c5eadc5b
--- a/sfa/client/sfi.py
+++ b/sfa/client/sfi.py
@@@ -340,6 -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,
@@@ -911,12 -913,12 +911,12 @@@ or with an slice hrn, shows currently p
          # 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
@@@ -964,12 -966,11 +964,11 @@@
          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: