From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Mon, 28 Nov 2011 19:44:57 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-2.0-1~6^2~4
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=080e7f90e2c66067aea94c96c4de68fc998e009b;hp=-c;p=sfa.git

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

Conflicts:
	sfa/util/config.py
---

080e7f90e2c66067aea94c96c4de68fc998e009b
diff --combined sfa/client/sfi.py
index 28fe3ffa,f89c5e05..ae4d97a5
--- a/sfa/client/sfi.py
+++ b/sfa/client/sfi.py
@@@ -4,7 -4,6 +4,7 @@@
  
  import sys
  sys.path.append('.')
 +
  import os, os.path
  import tempfile
  import socket
@@@ -14,26 -13,23 +14,27 @@@ import pickl
  from lxml import etree
  from StringIO import StringIO
  from optparse import OptionParser
 -from sfa.client.client_helper import pg_users_arg, sfa_users_arg
 -from sfa.util.sfalogging import sfi_logger
 +
  from sfa.trust.certificate import Keypair, Certificate
  from sfa.trust.gid import GID
  from sfa.trust.credential import Credential
  from sfa.trust.sfaticket import SfaTicket
 -from sfa.util.record import SfaRecord, UserRecord, SliceRecord, NodeRecord, AuthorityRecord
 -from sfa.rspecs.rspec import RSpec
 -from sfa.rspecs.rspec_converter import RSpecConverter
 +
 +from sfa.util.sfalogging import sfi_logger
  from sfa.util.xrn import get_leaf, get_authority, hrn_to_urn
 -import sfa.client.xmlrpcprotocol as xmlrpcprotocol
  from sfa.util.config import Config
  from sfa.util.version import version_core
  from sfa.util.cache import Cache
 +from sfa.util.record import SfaRecord, UserRecord, SliceRecord, NodeRecord, AuthorityRecord
 +
 +from sfa.rspecs.rspec import RSpec
 +from sfa.rspecs.rspec_converter import RSpecConverter
  from sfa.rspecs.version_manager import VersionManager
+ from sfa.client.return_value import ReturnValue
  
 +import sfa.client.xmlrpcprotocol as xmlrpcprotocol
 +from sfa.client.client_helper import pg_users_arg, sfa_users_arg
 +
  AGGREGATE_PORT=12346
  CM_PORT=12346
  
@@@ -424,13 -420,13 +425,13 @@@ class Sfi
              version = cache.get(cache_key)
              
          if not version: 
-             version = server.GetVersion()
+             result = server.GetVersion()
+             version= ReturnValue.get_value(result)
              # cache version for 24 hours
              cache.add(cache_key, version, ttl= 60*60*24)
              self.logger.info("Updating cache file %s" % cache_file)
              cache.save_to_file(cache_file)
  
- 
          return version   
          
  
@@@ -917,7 -913,8 +918,8 @@@
                  server=self.registry
              else:
                  server = self.server_proxy_from_opts(opts)
-             version=server.GetVersion()
+             result = server.GetVersion()
+             version = ReturnValue.get_value(result)
          for (k,v) in version.iteritems():
              print "%-20s: %s"%(k,v)
          if opts.file:
@@@ -938,8 -935,9 +940,9 @@@
          if self.server_supports_options_arg(server):
              options = {'call_id': unique_call_id()}
              call_args.append(options)
-         results = server.ListSlices(*call_args)
-         display_list(results)
+         result = server.ListSlices(*call_args)
+         value = ReturnValue.get_value(result)
+         display_list(value)
          return
      
      # show rspec for named slice
@@@ -977,10 -975,11 +980,11 @@@
  
          call_args = [creds, options]
          result = server.ListResources(*call_args)
+         value = ReturnValue.get_value(result)
          if opts.file is None:
-             display_rspec(result, opts.format)
+             display_rspec(value, opts.format)
          else:
-             save_rspec_to_file(result, opts.file)
+             save_rspec_to_file(value, opts.file)
          return
  
      # created named slice with given rspec
@@@ -1032,11 -1031,12 +1036,12 @@@
              options = {'call_id': unique_call_id()}
              call_args.append(options)
          result = server.CreateSliver(*call_args)
+         value = ReturnValue.get_value(result)
          if opts.file is None:
-             print result
+             print value
          else:
-             save_rspec_to_file (result, opts.file)
-         return result
+             save_rspec_to_file (value, opts.file)
+         return value
  
      # get a ticket for the specified slice
      def get_ticket(self, opts, args):
@@@ -1158,7 -1158,9 +1163,9 @@@
          if self.server_supports_options_arg(server):
              options = {'call_id': unique_call_id()}
              call_args.append(options)
-         return server.RenewSliver(*call_args)
+         result =  server.RenewSliver(*call_args)
+         value = ReturnValue.get_value(result)
+         return value
  
  
      def status(self, opts, args):
@@@ -1175,9 -1177,10 +1182,10 @@@
              options = {'call_id': unique_call_id()}
              call_args.append(options)
          result = server.SliverStatus(*call_args)
-         print result
+         value = ReturnValue.get_value(result)
+         print value
          if opts.file:
-             save_variable_to_file(result, opts.file, opts.fileformat)
+             save_variable_to_file(value, opts.file, opts.fileformat)
  
  
      def shutdown(self, opts, args):