X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fclient%2Fsfi.py;h=421ff10e6df53d821bf916a601abfd072f0d4d32;hb=cf630d87d633f3861e3ac8a50433fa29ca46a74e;hp=fc6a7b486300c23abd351a3df19f0ed7a0846eec;hpb=89d0fa4efde57cb62445af75c16bdc42bc03693a;p=sfa.git diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py index fc6a7b48..421ff10e 100755 --- a/sfa/client/sfi.py +++ b/sfa/client/sfi.py @@ -4,6 +4,7 @@ import sys sys.path.append('.') + import os, os.path import tempfile import socket @@ -13,22 +14,28 @@ import pickle 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.storage.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 +import sfa.client.xmlrpcprotocol as xmlrpcprotocol +from sfa.client.return_value import ReturnValue +from sfa.client.client_helper import pg_users_arg, sfa_users_arg + AGGREGATE_PORT=12346 CM_PORT=12346 @@ -417,19 +424,19 @@ class Sfi: if cache: 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 - def server_supports_call_id_arg(self, server): + def server_supports_options_arg(self, server): """ Returns true if server support the optional call_id arg, false otherwise. """ @@ -441,11 +448,11 @@ class Sfi: version_parts = code_tag_parts[0].split(".") major, minor = version_parts[0], version_parts[1] rev = code_tag_parts[1] - if int(major) > 1: - if int(minor) > 0 or int(rev) > 20: + if int(major) >= 1: + if int(minor) >= 2: return True return False - + # # Get various credential and spec files # @@ -912,7 +919,8 @@ class Sfi: 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: @@ -929,25 +937,32 @@ class Sfi: delegated_cred = self.delegate_cred(user_cred, get_authority(self.authority)) creds.append(delegated_cred) server = self.server_proxy_from_opts(opts) - #results = server.ListSlices(creds, unique_call_id()) - results = server.ListSlices(creds) - display_list(results) + call_args = [creds] + if self.server_supports_options_arg(server): + options = {'call_id': unique_call_id()} + call_args.append(options) + result = server.ListSlices(*call_args) + value = ReturnValue.get_value(result) + display_list(value) return # show rspec for named slice def resources(self, opts, args): user_cred = self.get_user_cred().save_to_string(save_parents=True) server = self.slicemgr - call_options = {} server = self.server_proxy_from_opts(opts) + + options = {'call_id': unique_call_id()} + #panos add info options + if opts.info: + options['info'] = opts.info if args: cred = self.get_slice_cred(args[0]).save_to_string(save_parents=True) hrn = args[0] - call_options = {'geni_slice_urn': hrn_to_urn(hrn, 'slice')} + options['geni_slice_urn'] = hrn_to_urn(hrn, 'slice') else: cred = user_cred - hrn = None creds = [cred] if opts.delegate: @@ -958,23 +973,19 @@ class Sfi: server_version = self.get_cached_server_version(server) if 'sfa' in server_version: # just request the version the client wants - call_options['rspec_version'] = version_manager.get_version(opts.rspec_version).to_dict() + options['rspec_version'] = version_manager.get_version(opts.rspec_version).to_dict() else: # this must be a protogeni aggregate. We should request a v2 ad rspec # regardless of what the client user requested - call_options['rspec_version'] = version_manager.get_version('ProtoGENI 2').to_dict() - #panos add info options - if opts.info: - call_options['info'] = opts.info + options['rspec_version'] = version_manager.get_version('ProtoGENI 2').to_dict() - call_args = [creds, call_options] - if self.server_supports_call_id_arg(server): - call_args.append(unique_call_id()) + 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 @@ -1022,15 +1033,16 @@ class Sfi: if delegated_cred: creds.append(delegated_cred) call_args = [slice_urn, creds, rspec, users] - if self.server_supports_call_id_arg(server): - call_args.append(unique_call_id()) - + if self.server_supports_options_arg(server): + 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): @@ -1095,10 +1107,10 @@ class Sfi: delegated_cred = self.delegate_cred(slice_cred, get_authority(self.authority)) creds.append(delegated_cred) server = self.server_proxy_from_opts(opts) - call_args = [slice_urn, creds] - if self.server_supports_call_id_arg(server): - call_args.append(unique_call_id()) + if self.server_supports_options_arg(server): + options = {'call_id': unique_call_id()} + call_args.append(options) return server.DeleteSliver(*call_args) # start named slice @@ -1149,9 +1161,12 @@ class Sfi: time = args[1] call_args = [slice_urn, creds, time] - if self.server_supports_call_id_arg(server): - call_args.append(unique_call_id()) - return server.RenewSliver(*call_args) + if self.server_supports_options_arg(server): + options = {'call_id': unique_call_id()} + call_args.append(options) + result = server.RenewSliver(*call_args) + value = ReturnValue.get_value(result) + return value def status(self, opts, args): @@ -1164,12 +1179,14 @@ class Sfi: creds.append(delegated_cred) server = self.server_proxy_from_opts(opts) call_args = [slice_urn, creds] - if self.server_supports_call_id_arg(server): - call_args.append(unique_call_id()) + if self.server_supports_options_arg(server): + 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):