X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fclient%2Fsfaadmin.py;h=cf88a3a3027462b3659082c731a23b195e943df4;hb=74d0c3bc711fe8c7d2baa20d6e46c598b22c9fda;hp=169bfedec3fe279ca91ea8ee950052157b264df0;hpb=af81f9e278ebfb25a7675629aa23c3b2cf7f79db;p=sfa.git diff --git a/sfa/client/sfaadmin.py b/sfa/client/sfaadmin.py index 169bfede..cf88a3a3 100755 --- a/sfa/client/sfaadmin.py +++ b/sfa/client/sfaadmin.py @@ -8,14 +8,14 @@ from optparse import OptionParser from sfa.generic import Generic from sfa.util.xrn import Xrn from sfa.storage.record import Record -from sfa.client.sfi import save_records_to_file + from sfa.trust.hierarchy import Hierarchy from sfa.trust.gid import GID from sfa.trust.certificate import convert_public_key -from sfa.client.candidates import Candidates - from sfa.client.common import optparse_listvalue_callback, optparse_dictvalue_callback, terminal_render, filter_records +from sfa.client.candidates import Candidates +from sfa.client.sfi import save_records_to_file pprinter = PrettyPrinter(indent=4) @@ -24,9 +24,9 @@ try: except: help_basedir='*unable to locate Hierarchy().basedir' -def args(*args, **kwargs): +def add_options(*args, **kwargs): def _decorator(func): - func.__dict__.setdefault('options', []).insert(0, (args, kwargs)) + func.__dict__.setdefault('add_options', []).insert(0, (args, kwargs)) return func return _decorator @@ -48,11 +48,11 @@ class RegistryCommands(Commands): version = self.api.manager.GetVersion(self.api, {}) pprinter.pprint(version) - @args('-x', '--xrn', dest='xrn', metavar='', help='authority to list (hrn/urn - mandatory)') - @args('-t', '--type', dest='type', metavar='', help='object type', default='all') - @args('-r', '--recursive', dest='recursive', metavar='', help='list all child records', + @add_options('-x', '--xrn', dest='xrn', metavar='', help='authority to list (hrn/urn - mandatory)') + @add_options('-t', '--type', dest='type', metavar='', help='object type', default='all') + @add_options('-r', '--recursive', dest='recursive', metavar='', help='list all child records', action='store_true', default=False) - @args('-v', '--verbose', dest='verbose', action='store_true', default=False) + @add_options('-v', '--verbose', dest='verbose', action='store_true', default=False) def list(self, xrn, type=None, recursive=False, verbose=False): """List names registered at a given authority - possibly filtered by type""" xrn = Xrn(xrn, type) @@ -66,10 +66,10 @@ class RegistryCommands(Commands): terminal_render (list, options) - @args('-x', '--xrn', dest='xrn', metavar='', help='object hrn/urn (mandatory)') - @args('-t', '--type', dest='type', metavar='', help='object type', default=None) - @args('-o', '--outfile', dest='outfile', metavar='', help='save record to file') - @args('-f', '--format', dest='format', metavar='', type='choice', + @add_options('-x', '--xrn', dest='xrn', metavar='', help='object hrn/urn (mandatory)') + @add_options('-t', '--type', dest='type', metavar='', help='object type', default=None) + @add_options('-o', '--outfile', dest='outfile', metavar='', help='save record to file') + @add_options('-f', '--format', dest='format', metavar='', type='choice', choices=('text', 'xml', 'simple'), help='display record in different formats') def show(self, xrn, type=None, format=None, outfile=None): """Display details for a registered object""" @@ -81,10 +81,9 @@ class RegistryCommands(Commands): save_records_to_file(outfile, records) - def _record_dict(self, xrn=None, type=None, - url=None, description=None, email='', - key=None, - slices=[], researchers=[], pis=[], extras={}): + def _record_dict(self, xrn, type, email, key, + slices, researchers, pis, + url, description, extras): record_dict = {} if xrn: if type: @@ -107,7 +106,7 @@ class RegistryCommands(Commands): if slices: record_dict['slices'] = slices if researchers: - record_dict['researcher'] = researchers + record_dict['reg-researchers'] = researchers if email: record_dict['email'] = email if pis: @@ -117,17 +116,16 @@ class RegistryCommands(Commands): return record_dict - @args('-x', '--xrn', dest='xrn', metavar='', help='object hrn/urn', default=None) - @args('-t', '--type', dest='type', metavar='', help='object type (mandatory)',) - @args('-a', '--all', dest='all', metavar='', action='store_true', default=False, help='check all users GID') - @args('-v', '--verbose', dest='verbose', metavar='', action='store_true', default=False, help='verbose mode: display user\'s hrn ') + @add_options('-x', '--xrn', dest='xrn', metavar='', help='object hrn/urn', default=None) + @add_options('-t', '--type', dest='type', metavar='', help='object type (mandatory)',) + @add_options('-a', '--all', dest='all', metavar='', action='store_true', default=False, help='check all users GID') + @add_options('-v', '--verbose', dest='verbose', metavar='', action='store_true', default=False, help='verbose mode: display user\'s hrn ') def check_gid(self, xrn=None, type=None, all=None, verbose=None): """Check the correspondance between the GID and the PubKey""" # db records - from sfa.storage.alchemy import dbsession from sfa.storage.model import RegRecord - db_query = dbsession.query(RegRecord).filter_by(type=type) + db_query = self.api.dbsession().query(RegRecord).filter_by(type=type) if xrn and not all: hrn = Xrn(xrn).get_hrn() db_query = db_query.filter_by(hrn=hrn) @@ -185,65 +183,68 @@ Users having a GID/PubKey correpondence NOT OK: %s and are: \n%s\n\n"%(len(NOKEY - @args('-x', '--xrn', dest='xrn', metavar='', help='object hrn/urn (mandatory)') - @args('-t', '--type', dest='type', metavar='', help='object type', default=None) - @args('-e', '--email', dest='email', default="", + @add_options('-x', '--xrn', dest='xrn', metavar='', help='object hrn/urn (mandatory)') + @add_options('-t', '--type', dest='type', metavar='', help='object type', default=None) + @add_options('-e', '--email', dest='email', default="", help="email (mandatory for users)") - @args('-u', '--url', dest='url', metavar='', default=None, + @add_options('-u', '--url', dest='url', metavar='', default=None, help="URL, useful for slices") - @args('-d', '--description', dest='description', metavar='', + @add_options('-d', '--description', dest='description', metavar='', help='Description, useful for slices', default=None) - @args('-k', '--key', dest='key', metavar='', help='public key string or file', + @add_options('-k', '--key', dest='key', metavar='', help='public key string or file', default=None) - @args('-s', '--slices', dest='slices', metavar='', help='Set/replace slice xrns', + @add_options('-s', '--slices', dest='slices', metavar='', help='Set/replace slice xrns', default='', type="str", action='callback', callback=optparse_listvalue_callback) - @args('-r', '--researchers', dest='researchers', metavar='', help='Set/replace slice researchers', + @add_options('-r', '--researchers', dest='researchers', metavar='', help='Set/replace slice researchers', default='', type="str", action='callback', callback=optparse_listvalue_callback) - @args('-p', '--pis', dest='pis', metavar='', + @add_options('-p', '--pis', dest='pis', metavar='', help='Set/replace Principal Investigators/Project Managers', default='', type="str", action='callback', callback=optparse_listvalue_callback) - @args('-X','--extra',dest='extras',default={},type='str',metavar="", action="callback", callback=optparse_dictvalue_callback, nargs=1, help="set extra/testbed-dependent flags, e.g. --extra enabled=true") - def register(self, xrn, type=None, url=None, description=None, key=None, slices='', - pis='', researchers='',email='', extras={}): + @add_options('-X','--extra',dest='extras',default={},type='str',metavar="", action="callback", callback=optparse_dictvalue_callback, nargs=1, help="set extra/testbed-dependent flags, e.g. --extra enabled=true") + def register(self, xrn, type=None, email='', key=None, + slices='', pis='', researchers='', + url=None, description=None, extras={}): """Create a new Registry record""" - record_dict = self._record_dict(xrn=xrn, type=type, url=url, key=key, - slices=slices, researchers=researchers, email=email, pis=pis, extras=extras) + record_dict = self._record_dict(xrn=xrn, type=type, email=email, key=key, + slices=slices, researchers=researchers, pis=pis, + url=url, description=description, extras=extras) self.api.manager.Register(self.api, record_dict) - @args('-x', '--xrn', dest='xrn', metavar='', help='object hrn/urn (mandatory)') - @args('-t', '--type', dest='type', metavar='', help='object type', default=None) - @args('-u', '--url', dest='url', metavar='', help='URL', default=None) - @args('-d', '--description', dest='description', metavar='', + @add_options('-x', '--xrn', dest='xrn', metavar='', help='object hrn/urn (mandatory)') + @add_options('-t', '--type', dest='type', metavar='', help='object type', default=None) + @add_options('-u', '--url', dest='url', metavar='', help='URL', default=None) + @add_options('-d', '--description', dest='description', metavar='', help='Description', default=None) - @args('-k', '--key', dest='key', metavar='', help='public key string or file', + @add_options('-k', '--key', dest='key', metavar='', help='public key string or file', default=None) - @args('-s', '--slices', dest='slices', metavar='', help='Set/replace slice xrns', + @add_options('-s', '--slices', dest='slices', metavar='', help='Set/replace slice xrns', default='', type="str", action='callback', callback=optparse_listvalue_callback) - @args('-r', '--researchers', dest='researchers', metavar='', help='Set/replace slice researchers', + @add_options('-r', '--researchers', dest='researchers', metavar='', help='Set/replace slice researchers', default='', type="str", action='callback', callback=optparse_listvalue_callback) - @args('-p', '--pis', dest='pis', metavar='', + @add_options('-p', '--pis', dest='pis', metavar='', help='Set/replace Principal Investigators/Project Managers', default='', type="str", action='callback', callback=optparse_listvalue_callback) - @args('-X','--extra',dest='extras',default={},type='str',metavar="", action="callback", callback=optparse_dictvalue_callback, nargs=1, help="set extra/testbed-dependent flags, e.g. --extra enabled=true") - def update(self, xrn, type=None, url=None, description=None, key=None, slices='', - pis='', researchers='', extras={}): + @add_options('-X','--extra',dest='extras',default={},type='str',metavar="", action="callback", callback=optparse_dictvalue_callback, nargs=1, help="set extra/testbed-dependent flags, e.g. --extra enabled=true") + def update(self, xrn, type=None, email='', key=None, + slices='', pis='', researchers='', + url=None, description=None, extras={}): """Update an existing Registry record""" - print 'incoming PIS',pis - record_dict = self._record_dict(xrn=xrn, type=type, url=url, description=description, - key=key, slices=slices, researchers=researchers, pis=pis, extras=extras) + record_dict = self._record_dict(xrn=xrn, type=type, email=email, key=key, + slices=slices, researchers=researchers, pis=pis, + url=url, description=description, extras=extras) self.api.manager.Update(self.api, record_dict) - @args('-x', '--xrn', dest='xrn', metavar='', help='object hrn/urn (mandatory)') - @args('-t', '--type', dest='type', metavar='', help='object type', default=None) + @add_options('-x', '--xrn', dest='xrn', metavar='', help='object hrn/urn (mandatory)') + @add_options('-t', '--type', dest='type', metavar='', help='object type', default=None) def remove(self, xrn, type=None): """Remove given object from the registry""" xrn = Xrn(xrn, type) self.api.manager.Remove(self.api, xrn) - @args('-x', '--xrn', dest='xrn', metavar='', help='object hrn/urn (mandatory)') - @args('-t', '--type', dest='type', metavar='', help='object type', default=None) + @add_options('-x', '--xrn', dest='xrn', metavar='', help='object hrn/urn (mandatory)') + @add_options('-t', '--type', dest='type', metavar='', help='object type', default=None) def credential(self, xrn, type=None): """Invoke GetCredential""" cred = self.api.manager.GetCredential(self.api, xrn, type, self.api.hrn) @@ -260,13 +261,13 @@ Users having a GID/PubKey correpondence NOT OK: %s and are: \n%s\n\n"%(len(NOKEY """Initialize or upgrade the db""" from sfa.storage.dbschema import DBSchema dbschema=DBSchema() - dbschema.init_or_upgrade + dbschema.init_or_upgrade() - @args('-a', '--all', dest='all', metavar='', action='store_true', default=False, + @add_options('-a', '--all', dest='all', metavar='', action='store_true', default=False, help='Remove all registry records and all files in %s area' % help_basedir) - @args('-c', '--certs', dest='certs', metavar='', action='store_true', default=False, + @add_options('-c', '--certs', dest='certs', metavar='', action='store_true', default=False, help='Remove all cached certs/gids found in %s' % help_basedir ) - @args('-0', '--no-reinit', dest='reinit', metavar='', action='store_false', default=True, + @add_options('-0', '--no-reinit', dest='reinit', metavar='', action='store_false', default=True, help='Prevents new DB schema from being installed after cleanup') def nuke(self, all=False, certs=False, reinit=True): """Cleanup local registry DB, plus various additional filesystem cleanups optionally""" @@ -306,19 +307,21 @@ Users having a GID/PubKey correpondence NOT OK: %s and are: \n%s\n\n"%(len(NOKEY class CertCommands(Commands): + + def __init__(self, *args, **kwds): + self.api= Generic.the_flavour().make_api(interface='registry') def import_gid(self, xrn): pass - @args('-x', '--xrn', dest='xrn', metavar='', help='object hrn/urn (mandatory)') - @args('-t', '--type', dest='type', metavar='', help='object type', default=None) - @args('-o', '--outfile', dest='outfile', metavar='', help='output file', default=None) + @add_options('-x', '--xrn', dest='xrn', metavar='', help='object hrn/urn (mandatory)') + @add_options('-t', '--type', dest='type', metavar='', help='object type', default=None) + @add_options('-o', '--outfile', dest='outfile', metavar='', help='output file', default=None) def export(self, xrn, type=None, outfile=None): """Fetch an object's GID from the Registry""" - from sfa.storage.alchemy import dbsession from sfa.storage.model import RegRecord hrn = Xrn(xrn).get_hrn() - request=dbsession.query(RegRecord).filter_by(hrn=hrn) + request=self.api.dbsession().query(RegRecord).filter_by(hrn=hrn) if type: request = request.filter_by(type=type) record=request.first() if record: @@ -337,7 +340,7 @@ class CertCommands(Commands): outfile = os.path.abspath('./%s.gid' % gid.get_hrn()) gid.save_to_file(outfile, save_parents=True) - @args('-g', '--gidfile', dest='gid', metavar='', help='path of gid file to display (mandatory)') + @add_options('-g', '--gidfile', dest='gid', metavar='', help='path of gid file to display (mandatory)') def display(self, gidfile): """Print contents of a GID file""" gid_path = os.path.abspath(gidfile) @@ -358,14 +361,14 @@ class AggregateCommands(Commands): version = self.api.manager.GetVersion(self.api, {}) pprinter.pprint(version) - @args('-x', '--xrn', dest='xrn', metavar='', help='object hrn/urn (mandatory)') + @add_options('-x', '--xrn', dest='xrn', metavar='', help='object hrn/urn (mandatory)') def status(self, xrn): """Retrieve the status of the slivers belonging to the named slice (Status)""" urns = [Xrn(xrn, 'slice').get_urn()] status = self.api.manager.Status(self.api, urns, [], {}) pprinter.pprint(status) - @args('-r', '--rspec-version', dest='rspec_version', metavar='', + @add_options('-r', '--rspec-version', dest='rspec_version', metavar='', default='GENI', help='version/format of the resulting rspec response') def resources(self, rspec_version='GENI'): """Display the available resources at an aggregate""" @@ -375,8 +378,8 @@ class AggregateCommands(Commands): print resources - @args('-x', '--xrn', dest='xrn', metavar='', help='slice hrn/urn (mandatory)') - @args('-r', '--rspec', dest='rspec', metavar='', help='rspec file (mandatory)') + @add_options('-x', '--xrn', dest='xrn', metavar='', help='slice hrn/urn (mandatory)') + @add_options('-r', '--rspec', dest='rspec', metavar='', help='rspec file (mandatory)') def allocate(self, xrn, rspec): """Allocate slivers""" xrn = Xrn(xrn, 'slice') @@ -387,7 +390,7 @@ class AggregateCommands(Commands): print manifest - @args('-x', '--xrn', dest='xrn', metavar='', help='slice hrn/urn (mandatory)') + @add_options('-x', '--xrn', dest='xrn', metavar='', help='slice hrn/urn (mandatory)') def provision(self, xrn): """Provision slivers""" xrn = Xrn(xrn, 'slice') @@ -398,7 +401,7 @@ class AggregateCommands(Commands): - @args('-x', '--xrn', dest='xrn', metavar='', help='slice hrn/urn (mandatory)') + @add_options('-x', '--xrn', dest='xrn', metavar='', help='slice hrn/urn (mandatory)') def delete(self, xrn): """Delete slivers""" self.api.manager.Delete(self.api, [xrn], [], {}) @@ -484,11 +487,10 @@ class SfaAdmin: self.summary_usage(category_name) # ensure options are valid - options = getattr(command, 'options', []) usage = "%%prog %s %s [options]" % (category_name, command_name) parser = OptionParser(usage=usage) - for arg, kwd in options: - parser.add_option(*arg, **kwd) + for args, kwdargs in getattr(command, 'add_options', []): + parser.add_option(*args, **kwdargs) (opts, cmd_args) = parser.parse_args(argv) cmd_kwds = vars(opts) @@ -508,8 +510,9 @@ class SfaAdmin: #traceback.print_exc() print command.__doc__ parser.print_help() + sys.exit(1) #raise except Exception: print "Command failed, please check log for more info" raise - + sys.exit(1)