from sfa.trust.hierarchy import Hierarchy
from sfa.trust.gid import GID
+from sfa.client.candidates import Candidates
+
pprinter = PrettyPrinter(indent=4)
try:
return func
return _decorator
-### utility to match command-line args to names
-class Candidates:
- def __init__ (self, names):
- self.names=names
- # is an input string acceptable for one of the known names?
- @staticmethod
- def fits (input, name):
- return name.find(input)==0
- # returns one of the names if the input name has a unique match
- # or None otherwise
- def only_match (self, input):
- matches=[ name for name in self.names if Candidates.fits(input,name) ]
- if len(matches)==1: return matches[0]
- else: return None
-
class Commands(object):
def _get_commands(self):
- available_methods = []
+ command_names = []
for attrib in dir(self):
if callable(getattr(self, attrib)) and not attrib.startswith('_'):
- available_methods.append(attrib)
- return available_methods
+ command_names.append(attrib)
+ return command_names
class RegistryCommands(Commands):
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"""
- records = self.api.manager.Resolve(self.api, xrn, type, True)
+ records = self.api.manager.Resolve(self.api, xrn, type, details=True)
for record in records:
sfa_record = Record(dict=record)
sfa_record.dump(format)
from sfa.importer import Importer
importer = Importer()
importer.run()
+
+ def sync_db(self):
+ """Initialize or upgrade the db"""
+ from sfa.storage.dbschema import DBSchema
+ dbschema=DBSchema()
+ dbschema.init_or_upgrade
@args('-a', '--all', dest='all', metavar='<all>', action='store_true', default=False,
help='Remove all registry records and all files in %s area' % help_basedir)
'aggregate': AggregateCommands,
'slicemgr': SliceManagerCommands}
- def find_category (self, string):
- for (k,v) in SfaAdmin.CATEGORIES.items():
- if k.startswith(string): return k
- for (k,v) in SfaAdmin.CATEGORIES.items():
- if k.find(string) >=1: return k
- return None
+ # returns (name,class) or (None,None)
+ def find_category (self, input):
+ full_name=Candidates (SfaAdmin.CATEGORIES.keys()).only_match(input)
+ if not full_name: return (None,None)
+ return (full_name,SfaAdmin.CATEGORIES[full_name])
def summary_usage (self, category=None):
- print "Usage:", self.script_name + " category action [<options>]"
+ print "Usage:", self.script_name + " category command [<options>]"
if category and category in SfaAdmin.CATEGORIES:
categories=[category]
else:
self.summary_usage()
# ensure category is valid
- category_str = argv.pop(0)
- category=self.find_category (category_str)
- if not category:
- self.summary_usage()
+ category_input = argv.pop(0)
+ (category_name, category_class) = self.find_category (category_input)
+ if not category_name or not category_class:
+ self.summary_usage(category_name)
- usage = "%%prog %s action [options]" % (category)
+ usage = "%%prog %s command [options]" % (category_name)
parser = OptionParser(usage=usage)
- command_class = SfaAdmin.CATEGORIES.get(category, None)
- if not command_class:
- self.summary_usage(category)
# ensure command is valid
- command_instance = command_class()
- actions = command_instance._get_commands()
+ category_instance = category_class()
+ commands = category_instance._get_commands()
if len(argv) < 1:
- action = '__call__'
+ # xxx what is this about ?
+ command_name = '__call__'
else:
- action = argv.pop(0)
+ command_input = argv.pop(0)
+ command_name = Candidates (commands).only_match (command_input)
- if hasattr(command_instance, action):
- command = getattr(command_instance, action)
+ if command_name and hasattr(category_instance, command_name):
+ command = getattr(category_instance, command_name)
else:
- self.summary_usage(category)
+ self.summary_usage(category_name)
# ensure options are valid
options = getattr(command, 'options', [])
- usage = "%%prog %s %s [options]" % (category, action)
+ usage = "%%prog %s %s [options]" % (category_name, command_name)
parser = OptionParser(usage=usage)
for arg, kwd in options:
parser.add_option(*arg, **kwd)
print "Command failed, please check log for more info"
raise
-candidates_specs=[
-('create delete reset resources slices start status stop version',
- [ ('ver','version'),
- ('r',None),
- ('re',None),
- ('res',None),
- ('rese','reset'),
- ('reset','reset'),
- ('reso','resources'),
- ('sli','slices'),
- ('st',None),
- ('sta',None),
- ('stop','stop'),
- ('a',None),
-])
-]
-
-def test_candidates ():
- for (names, tuples) in candidates_specs:
- names=names.split()
- for (input,expected) in tuples:
- got=Candidates(names).only_match(input)
- if got==expected: print '.',
- else: print 'X FAIL','names[',names,'] input',input,'expected',expected,'got',got
-
-if __name__ == '__main__':
- test_candidates()
git://git.onelab.eu / sfa.git / blobdiff