help="root registry", metavar="URL", default=None)
parser.add_option("-s", "--sliceapi", dest="sm", default=None, metavar="URL",
help="slice API - in general a SM URL, but can be used to talk to an aggregate")
+ parser.add_option("-R", "--raw", dest="raw", action="store_true", default=False,
+ help="Display raw, unparsed server response")
parser.add_option("-d", "--dir", dest="sfi_dir",
help="config & working directory - default is %default",
metavar="PATH", default=Sfi.default_sfi_dir())
api_options['call_id']=unique_call_id()
result = server.ListSlices(creds, *self.ois(server,api_options))
value = ReturnValue.get_value(result)
- display_list(value)
+ if self.options.raw:
+ print result
+ else:
+ display_list(value)
return
# show rspec for named slice
result = server.ListResources (creds, api_options)
value = ReturnValue.get_value(result)
if options.file is None:
- display_rspec(value, options.format)
+ if self.options.raw:
+ print result
+ else:
+ display_rspec(value, options.format)
else:
save_rspec_to_file(value, options.file)
return
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
+ if self.options.raw:
+ print result
+ else:
+ print value
else:
save_rspec_to_file (value, options.file)
return value
api_options = {}
api_options ['call_id'] = unique_call_id()
result = server.DeleteSliver(slice_urn, creds, *self.ois(server, api_options ) )
- # xxx no ReturnValue ??
- return result
+ value = ReturnValue.get_value(result)
+ if self.options.raw:
+ print result
+ else:
+ print value
+ return value
def status(self, options, args):
"""
# options and call_id when supported
api_options = {}
- api_options['call_id']=unique_call_id()
+ api_options['call_id']=unique_call_id()
result = server.SliverStatus(slice_urn, creds, *self.ois(server,api_options))
value = ReturnValue.get_value(result)
- print value
+ if self.options.raw:
+ print result
+ else:
+ print value
if options.file:
save_variable_to_file(value, options.file, options.fileformat)
delegated_cred = self.delegate_cred(slice_cred, get_authority(self.authority))
creds.append(delegated_cred)
# xxx Thierry - does this not need an api_options as well ?
- return server.Start(slice_urn, creds)
+ result = server.Start(slice_urn, creds)
+ value = ReturnValue.get_value(result)
+ if self.options.raw:
+ print result
+ else:
+ print value
+ return value
def stop(self, options, args):
"""
if options.delegate:
delegated_cred = self.delegate_cred(slice_cred, get_authority(self.authority))
creds.append(delegated_cred)
- return server.Stop(slice_urn, creds)
+ result = server.Stop(slice_urn, creds)
+ value = ReturnValue.get_value(result)
+ if self.options.raw:
+ print result
+ else:
+ print value
+ return value
# reset named slice
def reset(self, options, args):
if options.delegate:
delegated_cred = self.delegate_cred(slice_cred, get_authority(self.authority))
creds.append(delegated_cred)
- return server.reset_slice(creds, slice_urn)
+ result = server.reset_slice(creds, slice_urn)
+ value = ReturnValue.get_value(result)
+ if self.options.raw:
+ print result
+ else:
+ print value
+ return value
def renew(self, options, args):
"""
api_options['call_id']=unique_call_id()
result = server.RenewSliver(slice_urn, creds, time, *self.ois(server,api_options))
value = ReturnValue.get_value(result)
+ if self.options.raw:
+ print result
+ else:
+ print value
return value
if options.delegate:
delegated_cred = self.delegate_cred(slice_cred, get_authority(self.authority))
creds.append(delegated_cred)
- return server.Shutdown(slice_urn, creds)
+ result = server.Shutdown(slice_urn, creds)
+ value = ReturnValue.get_value(result)
+ if self.options.raw:
+ print result
+ else:
+ print value
+ return value
def get_ticket(self, options, args):
+++ /dev/null
-from sfa.util.version import version_core
-from sfa.util.xrn import Xrn
-from sfa.util.callids import Callids
-from sfa.managers import aggregate_manager
-
-class AggregateManager(aggregate_manager.AggregateManager):
-
- def __init__ (self, config): pass
-
- # essentially a union of the core version, the generic version (this code) and
- # whatever the driver needs to expose
- def GetVersion(self, api, options):
-
- xrn=Xrn(api.hrn)
- version = version_core()
- version_generic = {
- 'interface':'aggregate',
- 'sfa': 2,
- 'geni_api': 2,
- 'geni_api_versions': {'2': 'http://%s:%s' % (api.config.SFA_AGGREGATE_HOST, api.config.SFA_AGGREGATE_PORT)},
- 'hrn':xrn.get_hrn(),
- 'urn':xrn.get_urn(),
- }
- version.update(version_generic)
- testbed_version = self.driver.aggregate_version()
- version.update(testbed_version)
- return version
-
- def ListSlices(self, api, creds, options):
- call_id = options.get('call_id')
- if Callids().already_handled(call_id): return []
- return self.driver.list_slices (creds, options)
-
- def ListResources(self, api, creds, options):
- call_id = options.get('call_id')
- if Callids().already_handled(call_id): return ""
-
- # get slice's hrn from options
- slice_xrn = options.get('geni_slice_urn', None)
- # pass None if no slice is specified
- if not slice_xrn:
- slice_hrn, slice_urn = None, None
- else:
- xrn = Xrn(slice_xrn)
- slice_urn=xrn.get_urn()
- slice_hrn=xrn.get_hrn()
-
- return self.driver.list_resources (slice_urn, slice_hrn, creds, options)
-
- def SliverStatus (self, api, xrn, creds, options):
- call_id = options.get('call_id')
- if Callids().already_handled(call_id): return {}
-
- xrn = Xrn(xrn)
- slice_urn=xrn.get_urn()
- slice_hrn=xrn.get_hrn()
- return self.driver.sliver_status (slice_urn, slice_hrn)
-
- def CreateSliver(self, api, xrn, creds, rspec_string, users, options):
- """
- Create the sliver[s] (slice) at this aggregate.
- Verify HRN and initialize the slice record in PLC if necessary.
- """
- call_id = options.get('call_id')
- if Callids().already_handled(call_id): return ""
-
- xrn = Xrn(xrn)
- slice_urn=xrn.get_urn()
- slice_hrn=xrn.get_hrn()
-
- return self.driver.create_sliver (slice_urn, slice_hrn, creds, rspec_string, users, options)
-
- def DeleteSliver(self, api, xrn, creds, options):
- call_id = options.get('call_id')
- if Callids().already_handled(call_id): return True
-
- xrn = Xrn(xrn)
- slice_urn=xrn.get_urn()
- slice_hrn=xrn.get_hrn()
- return self.driver.delete_sliver (slice_urn, slice_hrn, creds, options)
-
- def RenewSliver(self, api, xrn, creds, expiration_time, options):
- call_id = options.get('call_id')
- if Callids().already_handled(call_id): return True
-
- xrn = Xrn(xrn)
- slice_urn=xrn.get_urn()
- slice_hrn=xrn.get_hrn()
- return self.driver.renew_sliver (slice_urn, slice_hrn, creds, expiration_time, options)
-
- ### these methods could use an options extension for at least call_id
- def start_slice(self, api, xrn, creds):
- xrn = Xrn(xrn)
- slice_urn=xrn.get_urn()
- slice_hrn=xrn.get_hrn()
- return self.driver.start_slice (slice_urn, slice_hrn, creds)
-
- def stop_slice(self, api, xrn, creds):
- xrn = Xrn(xrn)
- slice_urn=xrn.get_urn()
- slice_hrn=xrn.get_hrn()
- return self.driver.stop_slice (slice_urn, slice_hrn, creds)
-
- def reset_slice(self, api, xrn):
- xrn = Xrn(xrn)
- slice_urn=xrn.get_urn()
- slice_hrn=xrn.get_hrn()
- return self.driver.reset_slice (slice_urn, slice_hrn)
-
- def GetTicket(self, api, xrn, creds, rspec, users, options):
-
- xrn = Xrn(xrn)
- slice_urn=xrn.get_urn()
- slice_hrn=xrn.get_hrn()
-
- return self.driver.get_ticket (slice_urn, slice_hrn, creds, rspec, options)
-
class RegistryManager(RegistryManager):
- def __init__ (self, config): pass
-
- # The GENI GetVersion call
- def GetVersion(self, api, options):
- peers = dict ( [ (hrn,interface.get_url()) for (hrn,interface) in api.registries.iteritems()
- if hrn != api.hrn])
- xrn=Xrn(api.hrn)
- return version_core({'interface':'registry',
- 'sfa': 2,
- 'geni_api': 2,
- 'hrn':xrn.get_hrn(),
- 'urn':xrn.get_urn(),
- 'peers':peers})
-
def GetCredential(self, api, xrn, type, is_self=False):
# convert xrn to hrn
if type:
return new_cred.save_to_string(save_parents=True)
- def Resolve(self, api, xrns, type=None, full=True):
-
- if not isinstance(xrns, types.ListType):
- xrns = [xrns]
- # try to infer type if not set and we get a single input
- if not type:
- type = Xrn(xrns).get_type()
- hrns = [urn_to_hrn(xrn)[0] for xrn in xrns]
-
- # load all known registry names into a prefix tree and attempt to find
- # the longest matching prefix
- # create a dict where key is a registry hrn and its value is a list
- # of hrns at that registry (determined by the known prefix tree).
- xrn_dict = {}
- registries = api.registries
- tree = prefixTree()
- registry_hrns = registries.keys()
- tree.load(registry_hrns)
- for xrn in xrns:
- registry_hrn = tree.best_match(urn_to_hrn(xrn)[0])
- if registry_hrn not in xrn_dict:
- xrn_dict[registry_hrn] = []
- xrn_dict[registry_hrn].append(xrn)
-
- records = []
- for registry_hrn in xrn_dict:
- # skip the hrn without a registry hrn
- # XX should we let the user know the authority is unknown?
- if not registry_hrn:
- continue
-
- # if the best match (longest matching hrn) is not the local registry,
- # forward the request
- xrns = xrn_dict[registry_hrn]
- if registry_hrn != api.hrn:
- credential = api.getCredential()
- interface = api.registries[registry_hrn]
- server_proxy = api.server_proxy(interface, credential)
- peer_records = server_proxy.Resolve(xrns, credential,type)
- # pass foreign records as-is
- # previous code used to read
- # records.extend([SfaRecord(dict=record).as_dict() for record in peer_records])
- # not sure why the records coming through xmlrpc had to be processed at all
- records.extend(peer_records)
-
- # try resolving the remaining unfound records at the local registry
- local_hrns = list ( set(hrns).difference([record['hrn'] for record in records]) )
- #
- local_records = dbsession.query(RegRecord).filter(RegRecord.hrn.in_(local_hrns))
- if type:
- local_records = local_records.filter_by(type=type)
- local_records=local_records.all()
- logger.info("Resolve: local_records=%s (type=%s)"%(local_records,type))
- local_dicts = [ record.__dict__ for record in local_records ]
-
- if full:
- # in full mode we get as much info as we can, which involves contacting the
- # testbed for getting implementation details about the record
- self.driver.augment_records_with_testbed_info(local_dicts)
- # also we fill the 'url' field for known authorities
- # used to be in the driver code, sounds like a poorman thing though
- def solve_neighbour_url (record):
- if not record.type.startswith('authority'): return
- hrn=record.hrn
- for neighbour_dict in [ api.aggregates, api.registries ]:
- if hrn in neighbour_dict:
- record.url=neighbour_dict[hrn].get_url()
- return
- for record in local_records: solve_neighbour_url (record)
-
- # convert local record objects to dicts for xmlrpc
- # xxx somehow here calling dict(record) issues a weird error
- # however record.todict() seems to work fine
- # records.extend( [ dict(record) for record in local_records ] )
- records.extend( [ record.todict() for record in local_records ] )
- if not records:
- raise RecordNotFound(str(hrns))
-
- return records
-
- def List (self, api, xrn, origin_hrn=None):
- hrn, type = urn_to_hrn(xrn)
- # load all know registry names into a prefix tree and attempt to find
- # the longest matching prefix
- registries = api.registries
- registry_hrns = registries.keys()
- tree = prefixTree()
- tree.load(registry_hrns)
- registry_hrn = tree.best_match(hrn)
-
- #if there was no match then this record belongs to an unknow registry
- if not registry_hrn:
- raise MissingAuthority(xrn)
- # if the best match (longest matching hrn) is not the local registry,
- # forward the request
- record_dicts = []
- if registry_hrn != api.hrn:
- credential = api.getCredential()
- interface = api.registries[registry_hrn]
- server_proxy = api.server_proxy(interface, credential)
- record_list = server_proxy.List(xrn, credential)
- # same as above, no need to process what comes from through xmlrpc
- # pass foreign records as-is
- record_dicts = record_list
-
- # if we still have not found the record yet, try the local registry
- if not record_dicts:
- if not api.auth.hierarchy.auth_exists(hrn):
- raise MissingAuthority(hrn)
- records = dbsession.query(RegRecord).filter_by(authority=hrn)
- record_dicts=[ record.todict() for record in records ]
-
- return record_dicts
-
-
- def CreateGid(self, api, xrn, cert):
- # get the authority
- authority = Xrn(xrn=xrn).get_authority_hrn()
- auth_info = api.auth.get_auth_info(authority)
- if not cert:
- pkey = Keypair(create=True)
- else:
- certificate = Certificate(string=cert)
- pkey = certificate.get_pubkey()
- gid = api.auth.hierarchy.create_gid(xrn, create_uuid(), pkey)
- return gid.save_to_string(save_parents=True)
-
- ####################
- # utility for handling relationships among the SFA objects
- # given that the SFA db does not handle this sort of relationsships
- # it will rely on side-effects in the testbed to keep this persistent
-
# subject_record describes the subject of the relationships
# ref_record contains the target values for the various relationships we need to manage
# (to begin with, this is just the slice x person relationship)
link_ids = [ tuple.pointer for tuple in link_id_tuples ]
self.driver.update_relation (subject_type, target_type, subject_id, link_ids)
- def Register(self, api, record_dict):
-
- hrn, type = record_dict['hrn'], record_dict['type']
- urn = hrn_to_urn(hrn,type)
- # validate the type
- if type not in ['authority', 'slice', 'node', 'user']:
- raise UnknownSfaType(type)
-
- # check if record_dict already exists
- existing_records = dbsession.query(RegRecord).filter_by(type=type,hrn=hrn).all()
- if existing_records:
- raise ExistingRecord(hrn)
-
- assert ('type' in record_dict)
- # returns the right type of RegRecord according to type in record
- record = make_record(dict=record_dict)
- record.just_created()
- record.authority = get_authority(record.hrn)
- auth_info = api.auth.get_auth_info(record.authority)
- pub_key = None
- # make sure record has a gid
- if not record.gid:
- uuid = create_uuid()
- pkey = Keypair(create=True)
- if getattr(record,'keys',None):
- pub_key=record.keys
- # use only first key in record
- if isinstance(record.keys, types.ListType):
- pub_key = record.keys[0]
- pkey = convert_public_key(pub_key)
-
- gid_object = api.auth.hierarchy.create_gid(urn, uuid, pkey)
- gid = gid_object.save_to_string(save_parents=True)
- record.gid = gid
-
- if type in ["authority"]:
- # update the tree
- if not api.auth.hierarchy.auth_exists(hrn):
- api.auth.hierarchy.create_auth(hrn_to_urn(hrn,'authority'))
-
- # get the GID from the newly created authority
- gid = auth_info.get_gid_object()
- record.gid=gid.save_to_string(save_parents=True)
-
- # update testbed-specific data if needed
- pointer = self.driver.register (record.__dict__, hrn, pub_key)
-
- record.pointer=pointer
- dbsession.add(record)
- dbsession.commit()
-
- # update membership for researchers, pis, owners, operators
- self.update_relations (record, record)
-
- return record.get_gid_object().save_to_string(save_parents=True)
-
- def Update(self, api, record_dict):
- assert ('type' in record_dict)
- new_record=RegRecord(dict=record_dict)
- type = new_record.type
- hrn = new_record.hrn
-
- # make sure the record exists
- record = dbsession.query(RegRecord).filter_by(type=type,hrn=hrn).first()
- if not record:
- raise RecordNotFound("hrn=%s, type=%s"%(hrn,type))
- record.just_updated()
-
- # validate the type
- if type not in ['authority', 'slice', 'node', 'user']:
- raise UnknownSfaType(type)
-
- # Use the pointer from the existing record, not the one that the user
- # gave us. This prevents the user from inserting a forged pointer
- pointer = record.pointer
-
- # is the a change in keys ?
- new_key=None
- if type=='user':
- if getattr(new_key,'keys',None):
- new_key=new_record.keys
- if isinstance (new_key,types.ListType):
- new_key=new_key[0]
-
- # update the PLC information that was specified with the record
- if not self.driver.update (record.__dict__, new_record.__dict__, hrn, new_key):
- logger.warning("driver.update failed")
-
- # take new_key into account
- if new_key:
- # update the openssl key and gid
- pkey = convert_public_key(new_key)
- uuid = create_uuid()
- urn = hrn_to_urn(hrn,type)
- gid_object = api.auth.hierarchy.create_gid(urn, uuid, pkey)
- gid = gid_object.save_to_string(save_parents=True)
- record.gid = gid
- dsession.commit()
-
- # update membership for researchers, pis, owners, operators
- self.update_relations (record, new_record)
-
- return 1
-
- # expecting an Xrn instance
- def Remove(self, api, xrn, origin_hrn=None):
- hrn=xrn.get_hrn()
- type=xrn.get_type()
- request=dbsession.query(RegRecord).filter_by(hrn=hrn)
- if type and type not in ['all', '*']:
- request=request.filter_by(type=type)
-
- record = request.first()
- if not record:
- msg="Could not find hrn %s"%hrn
- if type: msg += " type=%s"%type
- raise RecordNotFound(msg)
-
- type = record.type
- if type not in ['slice', 'user', 'node', 'authority'] :
- raise UnknownSfaType(type)
-
- credential = api.getCredential()
- registries = api.registries
-
- # Try to remove the object from the PLCDB of federated agg.
- # This is attempted before removing the object from the local agg's PLCDB and sfa table
- if hrn.startswith(api.hrn) and type in ['user', 'slice', 'authority']:
- for registry in registries:
- if registry not in [api.hrn]:
- try:
- result=registries[registry].remove_peer_object(credential, record, origin_hrn)
- except:
- pass
-
- # call testbed callback first
- # IIUC this is done on the local testbed TOO because of the refreshpeer link
- if not self.driver.remove(record.__dict__):
- logger.warning("driver.remove failed")
-
- # delete from sfa db
- dbsession.delete(record)
- dbsession.commit()
-
- return 1
-
- # This is a PLC-specific thing, won't work with other platforms
- def get_key_from_incoming_ip (self, api):
- # verify that the callers's ip address exist in the db and is an interface
- # for a node in the db
- (ip, port) = api.remote_addr
- interfaces = self.driver.shell.GetInterfaces({'ip': ip}, ['node_id'])
- if not interfaces:
- raise NonExistingRecord("no such ip %(ip)s" % locals())
- nodes = self.driver.shell.GetNodes([interfaces[0]['node_id']], ['node_id', 'hostname'])
- if not nodes:
- raise NonExistingRecord("no such node using ip %(ip)s" % locals())
- node = nodes[0]
-
- # look up the sfa record
- record=dbsession.query(RegRecord).filter_by(type='node',pointer=node['node_id']).first()
- if not record:
- raise RecordNotFound("node with pointer %s"%node['node_id'])
-
- # generate a new keypair and gid
- uuid = create_uuid()
- pkey = Keypair(create=True)
- urn = hrn_to_urn(record.hrn, record.type)
- gid_object = api.auth.hierarchy.create_gid(urn, uuid, pkey)
- gid = gid_object.save_to_string(save_parents=True)
- record.gid = gid
-
- # update the record
- dbsession.commit()
-
- # attempt the scp the key
- # and gid onto the node
- # this will only work for planetlab based components
- (kfd, key_filename) = tempfile.mkstemp()
- (gfd, gid_filename) = tempfile.mkstemp()
- pkey.save_to_file(key_filename)
- gid_object.save_to_file(gid_filename, save_parents=True)
- host = node['hostname']
- key_dest="/etc/sfa/node.key"
- gid_dest="/etc/sfa/node.gid"
- scp = "/usr/bin/scp"
- #identity = "/etc/planetlab/root_ssh_key.rsa"
- identity = "/etc/sfa/root_ssh_key"
- scp_options=" -i %(identity)s " % locals()
- scp_options+="-o StrictHostKeyChecking=no " % locals()
- scp_key_command="%(scp)s %(scp_options)s %(key_filename)s root@%(host)s:%(key_dest)s" %\
- locals()
- scp_gid_command="%(scp)s %(scp_options)s %(gid_filename)s root@%(host)s:%(gid_dest)s" %\
- locals()
-
- all_commands = [scp_key_command, scp_gid_command]
-
- for command in all_commands:
- (status, output) = commands.getstatusoutput(command)
- if status:
- raise Exception, output
-
- for filename in [key_filename, gid_filename]:
- os.unlink(filename)
-
- return 1
git://git.onelab.eu / sfa.git / commitdiff