X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fclient%2Fsfi.py;h=9ed3c84815d1f6a401b8238f4cf27806794a1bfd;hb=99374374f38fb62e54a6c284eec6b06c1c53dff7;hp=e6ea68d0c41ed57d0cc3bb651ebf63cf4df412cd;hpb=88e161052c3ee8b12d81810f55c7ab6b5cb237bc;p=sfa.git diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py index e6ea68d0..9ed3c848 100755 --- a/sfa/client/sfi.py +++ b/sfa/client/sfi.py @@ -18,12 +18,12 @@ 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.util.sfaticket import SfaTicket +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.xrn import get_leaf, get_authority, hrn_to_urn -import sfa.util.xmlrpcprotocol as xmlrpcprotocol +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 @@ -232,9 +232,9 @@ class Sfi: parser.add_option("-d", "--delegate", dest="delegate", default=None, action="store_true", help="Include a credential delegated to the user's root"+\ - "authority in set of credentials for this call") - - # registy filter option + "authority in set of credentials for this call") + + # registy filter option if command in ("list", "show", "remove"): parser.add_option("-t", "--type", dest="type", type="choice", help="type filter ([all]|user|slice|authority|node|aggregate)", @@ -266,7 +266,7 @@ class Sfi: help="output file format ([xml]|xmllist|hrnlist)", default="xml", choices=("xml", "xmllist", "hrnlist")) - if command in ("status"): + if command in ("status", "version"): parser.add_option("-o", "--output", dest="file", help="output dictionary to file", metavar="FILE", default=None) parser.add_option("-F", "--fileformat", dest="fileformat", type="choice", @@ -398,9 +398,9 @@ class Sfi: self.cert_file = cert_file self.cert = GID(filename=cert_file) self.logger.info("Contacting Registry at: %s"%self.reg_url) - self.registry = xmlrpcprotocol.get_server(self.reg_url, key_file, cert_file, timeout=self.options.timeout, verbose=self.options.debug) + self.registry = xmlrpcprotocol.server_proxy(self.reg_url, key_file, cert_file, timeout=self.options.timeout, verbose=self.options.debug) self.logger.info("Contacting Slice Manager at: %s"%self.sm_url) - self.slicemgr = xmlrpcprotocol.get_server(self.sm_url, key_file, cert_file, timeout=self.options.timeout, verbose=self.options.debug) + self.slicemgr = xmlrpcprotocol.server_proxy(self.sm_url, key_file, cert_file, timeout=self.options.timeout, verbose=self.options.debug) return def get_cached_server_version(self, server): @@ -429,7 +429,7 @@ class Sfi: 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 +441,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 # @@ -493,7 +493,7 @@ class Sfi: self.logger.info("Getting Registry issued cert") self.read_config() # *hack. need to set registyr before _get_gid() is called - self.registry = xmlrpcprotocol.get_server(self.reg_url, key_file, cert_file, timeout=self.options.timeout, verbose=self.options.debug) + self.registry = xmlrpcprotocol.server_proxy(self.reg_url, key_file, cert_file, timeout=self.options.timeout, verbose=self.options.debug) gid = self._get_gid(type='user') self.registry = None self.logger.info("Writing certificate to %s"%cert_file) @@ -521,7 +521,7 @@ class Sfi: if args: hrn = args[0] gid = self._get_gid(hrn) - self.logger.debug("Sfi.get_gid-> %s",gid.save_to_string(save_parents=True)) + self.logger.debug("Sfi.get_gid-> %s" % gid.save_to_string(save_parents=True)) return gid def _get_gid(self, hrn=None, type=None): @@ -646,7 +646,7 @@ class Sfi: return key_string # xxx opts undefined - def get_component_server_from_hrn(self, hrn): + def get_component_proxy_from_hrn(self, hrn): # direct connection to the nodes component manager interface user_cred = self.get_user_cred().save_to_string(save_parents=True) records = self.registry.Resolve(hrn, user_cred) @@ -655,9 +655,9 @@ class Sfi: self.logger.warning("No such component:%r"% opts.component) record = records[0] - return self.get_server(record['hostname'], CM_PORT, self.key_file, self.cert_file) + return self.server_proxy(record['hostname'], CM_PORT, self.key_file, self.cert_file) - def get_server(self, host, port, keyfile, certfile): + def server_proxy(self, host, port, keyfile, certfile): """ Return an instance of an xmlrpc server connection """ @@ -666,10 +666,10 @@ class Sfi: host_parts = host.split('/') host_parts[0] = host_parts[0] + ":" + str(port) url = "http://%s" % "/".join(host_parts) - return xmlrpcprotocol.get_server(url, keyfile, certfile, timeout=self.options.timeout, verbose=self.options.debug) + return xmlrpcprotocol.server_proxy(url, keyfile, certfile, timeout=self.options.timeout, verbose=self.options.debug) # xxx opts could be retrieved in self.options - def get_server_from_opts(self, opts): + def server_proxy_from_opts(self, opts): """ Return instance of an xmlrpc connection to a slice manager, aggregate or component server depending on the specified opts @@ -677,10 +677,10 @@ class Sfi: server = self.slicemgr # direct connection to an aggregate if hasattr(opts, 'aggregate') and opts.aggregate: - server = self.get_server(opts.aggregate, opts.port, self.key_file, self.cert_file) + server = self.server_proxy(opts.aggregate, opts.port, self.key_file, self.cert_file) # direct connection to the nodes component manager interface if hasattr(opts, 'component') and opts.component: - server = self.get_component_server_from_hrn(opts.component) + server = self.get_component_proxy_from_hrn(opts.component) return server #========================================================================== @@ -911,10 +911,12 @@ class Sfi: if opts.version_registry: server=self.registry else: - server = self.get_server_from_opts(opts) + server = self.server_proxy_from_opts(opts) version=server.GetVersion() for (k,v) in version.iteritems(): print "%-20s: %s"%(k,v) + if opts.file: + save_variable_to_file(version, opts.file, opts.fileformat) # list instantiated slices def slices(self, opts, args): @@ -926,9 +928,12 @@ class Sfi: if opts.delegate: delegated_cred = self.delegate_cred(user_cred, get_authority(self.authority)) creds.append(delegated_cred) - server = self.get_server_from_opts(opts) - #results = server.ListSlices(creds, unique_call_id()) - results = server.ListSlices(creds) + server = self.server_proxy_from_opts(opts) + call_args = [creds] + 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) return @@ -936,16 +941,19 @@ class Sfi: def resources(self, opts, args): user_cred = self.get_user_cred().save_to_string(save_parents=True) server = self.slicemgr - call_options = {} - server = self.get_server_from_opts(opts) + 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: @@ -956,44 +964,44 @@ 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) if opts.file is None: display_rspec(result, opts.format) else: save_rspec_to_file(result, opts.file) return - + # created named slice with given rspec def create(self, opts, args): - server = self.get_server_from_opts(opts) + server = self.server_proxy_from_opts(opts) server_version = self.get_cached_server_version(server) slice_hrn = args[0] - slice_urn = hrn_to_urn(slice_hrn, 'slice') + slice_urn = hrn_to_urn(slice_hrn, 'slice') user_cred = self.get_user_cred() slice_cred = self.get_slice_cred(slice_hrn).save_to_string(save_parents=True) - # delegate the cred to the callers root authority - delegated_cred = self.delegate_cred(slice_cred, get_authority(self.authority)+'.slicemanager') - #delegated_cred = self.delegate_cred(slice_cred, get_authority(slice_hrn)) - #creds.append(delegated_cred) + + if hasattr(opts, 'aggregate') and opts.aggregate: + delegated_cred = None + else: + # delegate the cred to the callers root authority + delegated_cred = self.delegate_cred(slice_cred, get_authority(self.authority)+'.slicemanager') + #delegated_cred = self.delegate_cred(slice_cred, get_authority(slice_hrn)) + #creds.append(delegated_cred) + rspec_file = self.get_rspec_file(args[1]) rspec = open(rspec_file).read() - # need to pass along user keys to the aggregate. + # need to pass along user keys to the aggregate. # users = [ # { urn: urn:publicid:IDN+emulab.net+user+alice - # keys: [, ] + # keys: [, ] # }] users = [] slice_records = self.registry.Resolve(slice_urn, [user_cred.save_to_string(save_parents=True)]) @@ -1002,7 +1010,7 @@ class Sfi: user_hrns = slice_record['researcher'] user_urns = [hrn_to_urn(hrn, 'user') for hrn in user_hrns] user_records = self.registry.Resolve(user_urns, [user_cred.save_to_string(save_parents=True)]) - + if 'sfa' not in server_version: users = pg_users_arg(user_records) rspec = RSpec(rspec) @@ -1011,11 +1019,13 @@ class Sfi: creds = [slice_cred] else: users = sfa_users_arg(user_records, slice_record) - creds = [slice_cred, delegated_cred] + creds = [slice_cred] + 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) if opts.file is None: print result @@ -1035,7 +1045,7 @@ class Sfi: creds.append(delegated_cred) rspec_file = self.get_rspec_file(rspec_path) rspec = open(rspec_file).read() - server = self.get_server_from_opts(opts) + server = self.server_proxy_from_opts(opts) ticket_string = server.GetTicket(slice_urn, creds, rspec, []) file = os.path.join(self.options.sfi_dir, get_leaf(slice_hrn) + ".ticket") self.logger.info("writing ticket to %s"%file) @@ -1066,7 +1076,7 @@ class Sfi: for hostname in hostnames: try: self.logger.info("Calling redeem_ticket at %(hostname)s " % locals()) - server = self.get_server(hostname, CM_PORT, self.key_file, \ + server = self.server_proxy(hostname, CM_PORT, self.key_file, \ self.cert_file, self.options.debug) server.RedeemTicket(ticket.save_to_string(save_parents=True), slice_cred) self.logger.info("Success") @@ -1085,11 +1095,11 @@ class Sfi: if opts.delegate: delegated_cred = self.delegate_cred(slice_cred, get_authority(self.authority)) creds.append(delegated_cred) - server = self.get_server_from_opts(opts) - + 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 @@ -1101,7 +1111,7 @@ class Sfi: if opts.delegate: delegated_cred = self.delegate_cred(slice_cred, get_authority(self.authority)) creds.append(delegated_cred) - server = self.get_server_from_opts(opts) + server = self.server_proxy_from_opts(opts) return server.Start(slice_urn, creds) # stop named slice @@ -1113,14 +1123,14 @@ class Sfi: if opts.delegate: delegated_cred = self.delegate_cred(slice_cred, get_authority(self.authority)) creds.append(delegated_cred) - server = self.get_server_from_opts(opts) + server = self.server_proxy_from_opts(opts) return server.Stop(slice_urn, creds) # reset named slice def reset(self, opts, args): slice_hrn = args[0] slice_urn = hrn_to_urn(slice_hrn, 'slice') - server = self.get_server_from_opts(opts) + server = self.server_proxy_from_opts(opts) slice_cred = self.get_slice_cred(args[0]).save_to_string(save_parents=True) creds = [slice_cred] if opts.delegate: @@ -1131,7 +1141,7 @@ class Sfi: def renew(self, opts, args): slice_hrn = args[0] slice_urn = hrn_to_urn(slice_hrn, 'slice') - server = self.get_server_from_opts(opts) + server = self.server_proxy_from_opts(opts) slice_cred = self.get_slice_cred(args[0]).save_to_string(save_parents=True) creds = [slice_cred] if opts.delegate: @@ -1140,8 +1150,9 @@ 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()) + if self.server_supports_options_arg(server): + options = {'call_id': unique_call_id()} + call_args.append(options) return server.RenewSliver(*call_args) @@ -1153,10 +1164,11 @@ class Sfi: if opts.delegate: delegated_cred = self.delegate_cred(slice_cred, get_authority(self.authority)) creds.append(delegated_cred) - server = self.get_server_from_opts(opts) + 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 if opts.file: @@ -1171,7 +1183,7 @@ class Sfi: if opts.delegate: delegated_cred = self.delegate_cred(slice_cred, get_authority(self.authority)) creds.append(delegated_cred) - server = self.get_server_from_opts(opts) + server = self.server_proxy_from_opts(opts) return server.Shutdown(slice_urn, creds) def print_help (self):