move body of sfaadmin in sfa/client
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 11 May 2012 09:04:01 +0000 (11:04 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 11 May 2012 09:04:01 +0000 (11:04 +0200)
category can be abbreviated
nicer usage

sfa/client/sfaadmin.py [new file with mode: 0755]
sfa/clientbin/sfaadmin.py

diff --git a/sfa/client/sfaadmin.py b/sfa/client/sfaadmin.py
new file mode 100755 (executable)
index 0000000..48d117f
--- /dev/null
@@ -0,0 +1,428 @@
+#!/usr/bin/python
+import os
+import sys
+import copy
+from pprint import pformat, PrettyPrinter
+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
+
+pprinter = PrettyPrinter(indent=4)
+
+def optparse_listvalue_callback(option, opt, value, parser):
+    setattr(parser.values, option.dest, value.split(','))
+
+def args(*args, **kwargs):
+    def _decorator(func):
+        func.__dict__.setdefault('options', []).insert(0, (args, kwargs))
+        return func
+    return _decorator
+
+class Commands(object):
+    def _get_commands(self):
+        available_methods = []
+        for attrib in dir(self):
+            if callable(getattr(self, attrib)) and not attrib.startswith('_'):
+                available_methods.append(attrib)
+        return available_methods         
+
+
+class RegistryCommands(Commands):
+    def __init__(self, *args, **kwds):
+        self.api= Generic.the_flavour().make_api(interface='registry')
+    def version(self):
+        """Display the Registry version""" 
+        version = self.api.manager.GetVersion(self.api, {})
+        pprinter.pprint(version)
+
+    @args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='authority to list (hrn/urn - mandatory)') 
+    @args('-t', '--type', dest='type', metavar='<type>', help='object type', default=None) 
+    def list(self, xrn, type=None):
+        """List names registered at a given authority - possibly filtered by type"""
+        xrn = Xrn(xrn, type) 
+        records = self.api.manager.List(self.api, xrn.get_hrn())
+        for record in records:
+            if not type or record['type'] == type:
+                print "%s (%s)" % (record['hrn'], record['type'])
+
+
+    @args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='object hrn/urn (mandatory)') 
+    @args('-t', '--type', dest='type', metavar='<type>', help='object type', default=None) 
+    @args('-o', '--outfile', dest='outfile', metavar='<outfile>', help='save record to file') 
+    @args('-f', '--format', dest='format', metavar='<display>', 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"""
+        records = self.api.manager.Resolve(self.api, xrn, type, True)
+        for record in records:
+            sfa_record = Record(dict=record)
+            sfa_record.dump(format) 
+        if outfile:
+            save_records_to_file(outfile, records)  
+
+
+    def _record_dict(self, xrn=None, type=None, url=None, key=None, \
+                     description=None, slices='', researchers=''):              
+        record_dict = {}
+        if xrn:
+            if type:
+                xrn = Xrn(xrn, type)
+            else:
+                xrn = Xrn(xrn)
+            record_dict['urn'] = xrn.get_urn()
+            record_dict['hrn'] = xrn.get_hrn()
+            record_dict['type'] = xrn.get_type()
+        if url:
+            record_dict['url'] = url
+        if key:
+            try:
+                pubkey = open(key, 'r').read()
+            except IOError:
+                pubkey = key
+            record_dict['keys'] = [pubkey]
+        if slices:
+            record_dict['slices'] = slices
+        if researchers:
+            record_dict['researchers'] = researchers
+        if description:
+            record_dict['description'] = description
+        return record_dict
+
+    @args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='object hrn/urn (mandatory)') 
+    @args('-t', '--type', dest='type', metavar='<type>', help='object type', default=None) 
+    @args('-u', '--url', dest='url', metavar='<url>', help='URL', default=None)
+    @args('-d', '--description', dest='description', metavar='<description>', 
+          help='Description', default=None)
+    @args('-k', '--key', dest='key', metavar='<key>', help='public key string or file', 
+          default=None)
+    @args('-s', '--slices', dest='slices', metavar='<slices>', help='slice xrns', 
+          default='', type="str", action='callback', callback=optparse_listvalue_callback)
+    @args('-r', '--researchers', dest='researchers', metavar='<researchers>', help='slice researchers', 
+          default='', type="str", action='callback', callback=optparse_listvalue_callback)
+    @args('-p', '--pis', dest='pis', metavar='<PIs>', 
+          help='Principal Investigators/Project Managers ', 
+          default='', type="str", action='callback', callback=optparse_listvalue_callback)
+    def register(self, xrn, type=None, url=None, description=None, key=None, slices='', 
+                 pis='', researchers=''):
+        """Create a new Registry recory"""
+        record_dict = self._record_dict(xrn=xrn, type=type, url=url, key=key, 
+                                        slices=slices, researchers=researchers)
+        self.api.manager.Register(self.api, record_dict)         
+
+
+    @args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='object hrn/urn (mandatory)')
+    @args('-t', '--type', dest='type', metavar='<type>', help='object type', default=None)
+    @args('-u', '--url', dest='url', metavar='<url>', help='URL', default=None)
+    @args('-d', '--description', dest='description', metavar='<description>',
+          help='Description', default=None)
+    @args('-k', '--key', dest='key', metavar='<key>', help='public key string or file',
+          default=None)
+    @args('-s', '--slices', dest='slices', metavar='<slices>', help='slice xrns',
+          default='', type="str", action='callback', callback=optparse_listvalue_callback)
+    @args('-r', '--researchers', dest='researchers', metavar='<researchers>', help='slice researchers',
+          default='', type="str", action='callback', callback=optparse_listvalue_callback)
+    @args('-p', '--pis', dest='pis', metavar='<PIs>',
+          help='Principal Investigators/Project Managers ',
+          default='', type="str", action='callback', callback=optparse_listvalue_callback)
+    def update(self, xrn, type=None, url=None, description=None, key=None, slices='', 
+               pis='', researchers=''):
+        """Update an existing Registry record""" 
+        record_dict = self._record_dict(xrn=xrn, type=type, url=url, description=description, 
+                                        key=key, slices=slices, researchers=researchers)
+        self.api.manager.Update(self.api, record_dict)
+        
+    @args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='object hrn/urn (mandatory)') 
+    @args('-t', '--type', dest='type', metavar='<type>', 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='<xrn>', help='object hrn/urn (mandatory)') 
+    @args('-t', '--type', dest='type', metavar='<type>', 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)
+        print cred
+   
+
+    def import_registry(self):
+        """Run the importer"""
+        from sfa.importer import Importer
+        importer = Importer()
+        importer.run()
+    
+    @args('-a', '--all', dest='all', metavar='<all>', action='store_true', default=False,
+          help='Remove all registry records and all files in %s area' % Hierarchy().basedir)
+    @args('-c', '--certs', dest='certs', metavar='<certs>', action='store_true', default=False,
+          help='Remove all cached certs/gids found in %s' % Hierarchy().basedir )
+    @args('-0', '--no-reinit', dest='reinit', metavar='<reinit>', 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"""
+        from sfa.storage.dbschema import DBSchema
+        from sfa.util.sfalogging import _SfaLogger
+        logger = _SfaLogger(logfile='/var/log/sfa_import.log', loggername='importlog')
+        logger.setLevelFromOptVerbose(self.api.config.SFA_API_LOGLEVEL)
+        logger.info("Purging SFA records from database")
+        dbschema=DBSchema()
+        dbschema.nuke()
+
+        # for convenience we re-create the schema here, so there's no need for an explicit
+        # service sfa restart
+        # however in some (upgrade) scenarios this might be wrong
+        if reinit:
+            logger.info("re-creating empty schema")
+            dbschema.init_or_upgrade()
+
+        # remove the server certificate and all gids found in /var/lib/sfa/authorities
+        if certs:
+            logger.info("Purging cached certificates")
+            for (dir, _, files) in os.walk('/var/lib/sfa/authorities'):
+                for file in files:
+                    if file.endswith('.gid') or file == 'server.cert':
+                        path=dir+os.sep+file
+                        os.unlink(path)
+
+        # just remove all files that do not match 'server.key' or 'server.cert'
+        if all:
+            logger.info("Purging registry filesystem cache")
+            preserved_files = [ 'server.key', 'server.cert']
+            for (dir,_,files) in os.walk(Hierarchy().basedir):
+                for file in files:
+                    if file in preserved_files: continue
+                    path=dir+os.sep+file
+                    os.unlink(path)
+        
+    
+class CertCommands(Commands):
+    
+    def import_gid(self, xrn):
+        pass
+
+    @args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='object hrn/urn (mandatory)')
+    @args('-t', '--type', dest='type', metavar='<type>', help='object type', default=None)
+    @args('-o', '--outfile', dest='outfile', metavar='<outfile>', 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)
+        if type: request = request.filter_by(type=type)
+        record=request.first()
+        if record:
+            gid = GID(string=record.gid)
+        else:
+            # check the authorities hierarchy
+            hierarchy = Hierarchy()
+            try:
+                auth_info = hierarchy.get_auth_info(hrn)
+                gid = auth_info.gid_object
+            except:
+                print "Record: %s not found" % hrn
+                sys.exit(1)
+        # save to file
+        if not outfile:
+            outfile = os.path.abspath('./%s.gid' % gid.get_hrn())
+        gid.save_to_file(outfile, save_parents=True)
+        
+    @args('-g', '--gidfile', dest='gid', metavar='<gid>', help='path of gid file to display (mandatory)') 
+    def display(self, gidfile):
+        """Print contents of a GID file"""
+        gid_path = os.path.abspath(gidfile)
+        if not gid_path or not os.path.isfile(gid_path):
+            print "No such gid file: %s" % gidfile
+            sys.exit(1)
+        gid = GID(filename=gid_path)
+        gid.dump(dump_parents=True)
+    
+
+class AggregateCommands(Commands):
+
+    def __init__(self, *args, **kwds):
+        self.api= Generic.the_flavour().make_api(interface='aggregate')
+   
+    def version(self):
+        """Display the Aggregate version"""
+        version = self.api.manager.GetVersion(self.api, {})
+        pprinter.pprint(version)
+
+    def slices(self):
+        """List the running slices at this Aggregate"""
+        print self.api.manager.ListSlices(self.api, [], {})
+
+    @args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='object hrn/urn (mandatory)') 
+    def status(self, xrn):
+        """Display the status of a slice or slivers"""
+        urn = Xrn(xrn, 'slice').get_urn()
+        status = self.api.manager.SliverStatus(self.api, urn, [], {})
+        pprinter.pprint(status)
+    @args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='object hrn/urn', default=None)
+    @args('-r', '--rspec-version', dest='rspec_version', metavar='<rspec_version>', 
+          default='GENI', help='version/format of the resulting rspec response')  
+    def resources(self, xrn=None, rspec_version='GENI'):
+        """Display the available resources at an aggregate 
+or the resources allocated by a slice"""  
+        options = {'geni_rspec_version': rspec_version}
+        if xrn:
+            options['geni_slice_urn'] = xrn
+        resources = self.api.manager.ListResources(self.api, [], options)
+        print resources
+        
+    @args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='slice hrn/urn (mandatory)')
+    @args('-r', '--rspec', dest='rspec', metavar='<rspec>', help='rspec file (mandatory)')  
+    @args('-u', '--user', dest='user', metavar='<user>', help='hrn/urn of slice user (mandatory)')  
+    @args('-k', '--key', dest='key', metavar='<key>', help="path to user's public key file (mandatory)")  
+    def create(self, xrn, rspec, user, key):
+        """Allocate slivers"""
+        xrn = Xrn(xrn, 'slice')
+        slice_urn=xrn.get_urn()
+        rspec_string = open(rspec).read()
+        user_xrn = Xrn(user, 'user')
+        user_urn = user_xrn.get_urn()
+        user_key_string = open(key).read()
+        users = [{'urn': user_urn, 'keys': [user_key_string]}]
+        options={}
+        self.api.manager.CreateSliver(self, slice_urn, [], rspec_string, users, options) 
+
+    @args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='slice hrn/urn (mandatory)')
+    def delete(self, xrn):
+        """Delete slivers""" 
+        self.api.manager.DeleteSliver(self.api, xrn, [], {})
+    @args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='slice hrn/urn (mandatory)')
+    def start(self, xrn):
+        """Start slivers"""
+        self.api.manager.start_slice(self.api, xrn, [])
+
+    @args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='slice hrn/urn (mandatory)')
+    def stop(self, xrn):
+        """Stop slivers"""
+        self.api.manager.stop_slice(self.api, xrn, [])      
+
+    @args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='slice hrn/urn (mandatory)')
+    def reset(self, xrn):
+        """Reset sliver"""
+        self.api.manager.reset_slice(self.api, xrn)
+
+
+#    @args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='object hrn/urn', default=None)
+#    @args('-r', '--rspec', dest='rspec', metavar='<rspec>', help='request rspec', default=None)
+#    def ticket(self, xrn, rspec):
+#        pass
+
+
+
+class SliceManagerCommands(AggregateCommands):
+    
+    def __init__(self, *args, **kwds):
+        self.api= Generic.the_flavour().make_api(interface='slicemgr')
+
+
+class SfaAdmin:
+
+    CATEGORIES = {'certificate': CertCommands,
+                  'registry': RegistryCommands,
+                  '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
+
+    def summary_usage (self, category=None):
+        print "Usage:", self.script_name + " category action [<options>]"
+        if category and category in SfaAdmin.CATEGORIES: 
+            categories=[category]
+        else:
+            categories=SfaAdmin.CATEGORIES
+        for c in categories:
+            cls=SfaAdmin.CATEGORIES[c]
+            print "==================== category=%s"%c
+            names=cls.__dict__.keys()
+            names.sort()
+            for name in names:
+                method=cls.__dict__[name]
+                if name.startswith('_'): continue
+                margin=15
+                format="%%-%ds"%margin
+                print "%-15s"%name,
+                doc=getattr(method,'__doc__',None)
+                if not doc: print "<missing __doc__>"
+                lines=[line.strip() for line in doc.split("\n")]
+                line1=lines.pop(0)
+                print line1
+                for extra_line in lines: print margin*" ",extra_line
+        sys.exit(2)
+
+    def main(self):
+        argv = copy.deepcopy(sys.argv)
+        self.script_name = argv.pop(0)
+        # ensure category is specified    
+        if len(argv) < 1:
+            self.summary_usage()
+
+        # ensure category is valid
+        category_str = argv.pop(0)
+        category=self.find_category (category_str)
+        if not category:
+            self.summary_usage()
+
+        usage = "%%prog %s action [options]" % (category)
+        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()
+        if len(argv) < 1:
+            action = '__call__'
+        else:
+            action = argv.pop(0)
+    
+        if hasattr(command_instance, action):
+            command = getattr(command_instance, action)
+        else:
+            self.summary_usage(category)
+
+        # ensure options are valid
+        options = getattr(command, 'options', [])
+        usage = "%%prog %s %s [options]" % (category, action)
+        parser = OptionParser(usage=usage)
+        for arg, kwd in options:
+            parser.add_option(*arg, **kwd)
+        (opts, cmd_args) = parser.parse_args(argv)
+        cmd_kwds = vars(opts)
+
+        # dont overrride meth
+        for k, v in cmd_kwds.items():
+            if v is None:
+                del cmd_kwds[k]
+
+        # execute command
+        try:
+    #        print "invoking %s *=%s **=%s"%(command.__name__,cmd_args, cmd_kwds)
+            command(*cmd_args, **cmd_kwds)
+            sys.exit(0)
+        except TypeError:
+            print "Possible wrong number of arguments supplied"
+            print command.__doc__
+            parser.print_help()
+            #raise
+        except Exception:
+            print "Command failed, please check log for more info"
+            raise
index 852d743..ce6930b 100755 (executable)
@@ -1,424 +1,6 @@
-#!/usr/bin/python
-import os
-import sys
-import copy
-from pprint import pformat, PrettyPrinter
-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
-
-pprinter = PrettyPrinter(indent=4)
-
-def optparse_listvalue_callback(option, opt, value, parser):
-    setattr(parser.values, option.dest, value.split(','))
-
-def args(*args, **kwargs):
-    def _decorator(func):
-        func.__dict__.setdefault('options', []).insert(0, (args, kwargs))
-        return func
-    return _decorator
-
-class Commands(object):
-    def _get_commands(self):
-        available_methods = []
-        for attrib in dir(self):
-            if callable(getattr(self, attrib)) and not attrib.startswith('_'):
-                available_methods.append(attrib)
-        return available_methods         
-
-
-class RegistryCommands(Commands):
-    def __init__(self, *args, **kwds):
-        self.api= Generic.the_flavour().make_api(interface='registry')
-    def version(self):
-        """Display the Registry version""" 
-        version = self.api.manager.GetVersion(self.api, {})
-        pprinter.pprint(version)
-
-    @args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='authority to list (hrn/urn - mandatory)') 
-    @args('-t', '--type', dest='type', metavar='<type>', help='object type', default=None) 
-    def list(self, xrn, type=None):
-        """List names registered at a given authority - possibly filtered by type"""
-        xrn = Xrn(xrn, type) 
-        records = self.api.manager.List(self.api, xrn.get_hrn())
-        for record in records:
-            if not type or record['type'] == type:
-                print "%s (%s)" % (record['hrn'], record['type'])
-
-
-    @args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='object hrn/urn (mandatory)') 
-    @args('-t', '--type', dest='type', metavar='<type>', help='object type', default=None) 
-    @args('-o', '--outfile', dest='outfile', metavar='<outfile>', help='save record to file') 
-    @args('-f', '--format', dest='format', metavar='<display>', 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"""
-        records = self.api.manager.Resolve(self.api, xrn, type, True)
-        for record in records:
-            sfa_record = Record(dict=record)
-            sfa_record.dump(format) 
-        if outfile:
-            save_records_to_file(outfile, records)  
-
-
-    def _record_dict(self, xrn=None, type=None, url=None, key=None, \
-                     description=None, slices='', researchers=''):              
-        record_dict = {}
-        if xrn:
-            if type:
-                xrn = Xrn(xrn, type)
-            else:
-                xrn = Xrn(xrn)
-            record_dict['urn'] = xrn.get_urn()
-            record_dict['hrn'] = xrn.get_hrn()
-            record_dict['type'] = xrn.get_type()
-        if url:
-            record_dict['url'] = url
-        if key:
-            try:
-                pubkey = open(key, 'r').read()
-            except IOError:
-                pubkey = key
-            record_dict['keys'] = [pubkey]
-        if slices:
-            record_dict['slices'] = slices
-        if researchers:
-            record_dict['researchers'] = researchers
-        if description:
-            record_dict['description'] = description
-        return record_dict
-
-    @args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='object hrn/urn (mandatory)') 
-    @args('-t', '--type', dest='type', metavar='<type>', help='object type', default=None) 
-    @args('-u', '--url', dest='url', metavar='<url>', help='URL', default=None)
-    @args('-d', '--description', dest='description', metavar='<description>', 
-          help='Description', default=None)
-    @args('-k', '--key', dest='key', metavar='<key>', help='public key string or file', 
-          default=None)
-    @args('-s', '--slices', dest='slices', metavar='<slices>', help='slice xrns', 
-          default='', type="str", action='callback', callback=optparse_listvalue_callback)
-    @args('-r', '--researchers', dest='researchers', metavar='<researchers>', help='slice researchers', 
-          default='', type="str", action='callback', callback=optparse_listvalue_callback)
-    @args('-p', '--pis', dest='pis', metavar='<PIs>', 
-          help='Principal Investigators/Project Managers ', 
-          default='', type="str", action='callback', callback=optparse_listvalue_callback)
-    def register(self, xrn, type=None, url=None, description=None, key=None, slices='', 
-                 pis='', researchers=''):
-        """Create a new Registry recory"""
-        record_dict = self._record_dict(xrn=xrn, type=type, url=url, key=key, 
-                                        slices=slices, researchers=researchers)
-        self.api.manager.Register(self.api, record_dict)         
-
-
-    @args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='object hrn/urn (mandatory)')
-    @args('-t', '--type', dest='type', metavar='<type>', help='object type', default=None)
-    @args('-u', '--url', dest='url', metavar='<url>', help='URL', default=None)
-    @args('-d', '--description', dest='description', metavar='<description>',
-          help='Description', default=None)
-    @args('-k', '--key', dest='key', metavar='<key>', help='public key string or file',
-          default=None)
-    @args('-s', '--slices', dest='slices', metavar='<slices>', help='slice xrns',
-          default='', type="str", action='callback', callback=optparse_listvalue_callback)
-    @args('-r', '--researchers', dest='researchers', metavar='<researchers>', help='slice researchers',
-          default='', type="str", action='callback', callback=optparse_listvalue_callback)
-    @args('-p', '--pis', dest='pis', metavar='<PIs>',
-          help='Principal Investigators/Project Managers ',
-          default='', type="str", action='callback', callback=optparse_listvalue_callback)
-    def update(self, xrn, type=None, url=None, description=None, key=None, slices='', 
-               pis='', researchers=''):
-        """Update an existing Registry record""" 
-        record_dict = self._record_dict(xrn=xrn, type=type, url=url, description=description, 
-                                        key=key, slices=slices, researchers=researchers)
-        self.api.manager.Update(self.api, record_dict)
-        
-    @args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='object hrn/urn (mandatory)') 
-    @args('-t', '--type', dest='type', metavar='<type>', 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='<xrn>', help='object hrn/urn (mandatory)') 
-    @args('-t', '--type', dest='type', metavar='<type>', 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)
-        print cred
-   
-
-    def import_registry(self):
-        """Run the importer"""
-        from sfa.importer import Importer
-        importer = Importer()
-        importer.run()
-    
-    @args('-a', '--all', dest='all', metavar='<all>', action='store_true', default=False,
-          help='Remove all registry records and all files in %s area' % Hierarchy().basedir)
-    @args('-c', '--certs', dest='certs', metavar='<certs>', action='store_true', default=False,
-          help='Remove all cached certs/gids found in %s' % Hierarchy().basedir )
-    @args('-0', '--no-reinit', dest='reinit', metavar='<reinit>', 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"""
-        from sfa.storage.dbschema import DBSchema
-        from sfa.util.sfalogging import _SfaLogger
-        logger = _SfaLogger(logfile='/var/log/sfa_import.log', loggername='importlog')
-        logger.setLevelFromOptVerbose(self.api.config.SFA_API_LOGLEVEL)
-        logger.info("Purging SFA records from database")
-        dbschema=DBSchema()
-        dbschema.nuke()
-
-        # for convenience we re-create the schema here, so there's no need for an explicit
-        # service sfa restart
-        # however in some (upgrade) scenarios this might be wrong
-        if reinit:
-            logger.info("re-creating empty schema")
-            dbschema.init_or_upgrade()
-
-        # remove the server certificate and all gids found in /var/lib/sfa/authorities
-        if certs:
-            logger.info("Purging cached certificates")
-            for (dir, _, files) in os.walk('/var/lib/sfa/authorities'):
-                for file in files:
-                    if file.endswith('.gid') or file == 'server.cert':
-                        path=dir+os.sep+file
-                        os.unlink(path)
-
-        # just remove all files that do not match 'server.key' or 'server.cert'
-        if all:
-            logger.info("Purging registry filesystem cache")
-            preserved_files = [ 'server.key', 'server.cert']
-            for (dir,_,files) in os.walk(Hierarchy().basedir):
-                for file in files:
-                    if file in preserved_files: continue
-                    path=dir+os.sep+file
-                    os.unlink(path)
-        
-    
-class CertCommands(Commands):
-    
-    def import_gid(self, xrn):
-        pass
-
-    @args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='object hrn/urn (mandatory)')
-    @args('-t', '--type', dest='type', metavar='<type>', help='object type', default=None)
-    @args('-o', '--outfile', dest='outfile', metavar='<outfile>', 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)
-        if type: request = request.filter_by(type=type)
-        record=request.first()
-        if record:
-            gid = GID(string=record.gid)
-        else:
-            # check the authorities hierarchy
-            hierarchy = Hierarchy()
-            try:
-                auth_info = hierarchy.get_auth_info(hrn)
-                gid = auth_info.gid_object
-            except:
-                print "Record: %s not found" % hrn
-                sys.exit(1)
-        # save to file
-        if not outfile:
-            outfile = os.path.abspath('./%s.gid' % gid.get_hrn())
-        gid.save_to_file(outfile, save_parents=True)
-        
-    @args('-g', '--gidfile', dest='gid', metavar='<gid>', help='path of gid file to display (mandatory)') 
-    def display(self, gidfile):
-        """Print contents of a GID file"""
-        gid_path = os.path.abspath(gidfile)
-        if not gid_path or not os.path.isfile(gid_path):
-            print "No such gid file: %s" % gidfile
-            sys.exit(1)
-        gid = GID(filename=gid_path)
-        gid.dump(dump_parents=True)
-    
-
-class AggregateCommands(Commands):
-
-    def __init__(self, *args, **kwds):
-        self.api= Generic.the_flavour().make_api(interface='aggregate')
-   
-    def version(self):
-        """Display the Aggregate version"""
-        version = self.api.manager.GetVersion(self.api, {})
-        pprinter.pprint(version)
-
-    def slices(self):
-        """List the running slices at this Aggregate"""
-        print self.api.manager.ListSlices(self.api, [], {})
-
-    @args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='object hrn/urn (mandatory)') 
-    def status(self, xrn):
-        """Display the status of a slice or slivers"""
-        urn = Xrn(xrn, 'slice').get_urn()
-        status = self.api.manager.SliverStatus(self.api, urn, [], {})
-        pprinter.pprint(status)
-    @args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='object hrn/urn', default=None)
-    @args('-r', '--rspec-version', dest='rspec_version', metavar='<rspec_version>', 
-          default='GENI', help='version/format of the resulting rspec response')  
-    def resources(self, xrn=None, rspec_version='GENI'):
-        """Display the available resources at an aggregate or display the resources allocated
-           by a slice"""  
-        options = {'geni_rspec_version': rspec_version}
-        if xrn:
-            options['geni_slice_urn'] = xrn
-        resources = self.api.manager.ListResources(self.api, [], options)
-        print resources
-        
-    @args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='slice hrn/urn (mandatory)')
-    @args('-r', '--rspec', dest='rspec', metavar='<rspec>', help='rspec file (mandatory)')  
-    @args('-u', '--user', dest='user', metavar='<user>', help='hrn/urn of slice user (mandatory)')  
-    @args('-k', '--key', dest='key', metavar='<key>', help="path to user's public key file (mandatory)")  
-    def create(self, xrn, rspec, user, key):
-        """Allocate slivers"""
-        xrn = Xrn(xrn, 'slice')
-        slice_urn=xrn.get_urn()
-        rspec_string = open(rspec).read()
-        user_xrn = Xrn(user, 'user')
-        user_urn = user_xrn.get_urn()
-        user_key_string = open(key).read()
-        users = [{'urn': user_urn, 'keys': [user_key_string]}]
-        options={}
-        self.api.manager.CreateSliver(self, slice_urn, [], rspec_string, users, options) 
-
-    @args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='slice hrn/urn (mandatory)')
-    def delete(self, xrn):
-        """Delete slivers""" 
-        self.api.manager.DeleteSliver(self.api, xrn, [], {})
-    @args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='slice hrn/urn (mandatory)')
-    def start(self, xrn):
-        """Start slivers"""
-        self.api.manager.start_slice(self.api, xrn, [])
-
-    @args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='slice hrn/urn (mandatory)')
-    def stop(self, xrn):
-        """Stop slivers"""
-        self.api.manager.stop_slice(self.api, xrn, [])      
-
-    @args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='slice hrn/urn (mandatory)')
-    def reset(self, xrn):
-        """Reset sliver"""
-        self.api.manager.reset_slice(self.api, xrn)
-
-
-#    @args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='object hrn/urn', default=None)
-#    @args('-r', '--rspec', dest='rspec', metavar='<rspec>', help='request rspec', default=None)
-#    def ticket(self, xrn, rspec):
-#        pass
-
-
-
-class SliceManagerCommands(AggregateCommands):
-    
-    def __init__(self, *args, **kwds):
-        self.api= Generic.the_flavour().make_api(interface='slicemgr')
-
-
-CATEGORIES = {'cert': CertCommands,
-              'registry': RegistryCommands,
-              'aggregate': AggregateCommands,
-              'slicemgr': SliceManagerCommands}
-
-def summary_usage ():
-    for (k,cls) in CATEGORIES.items():
-        print "==================== %s"%k
-        names=cls.__dict__.keys()
-        names.sort()
-        for name in names:
-            method=cls.__dict__[name]
-            if name.startswith('_'): continue
-            print "%-15s"%name,
-            doc=getattr(method,'__doc__',None)
-            if doc: print doc
-            else: print "<missing __doc__>"
-
-def category_usage():
-    print "Available categories:"
-    for k in CATEGORIES.keys() + ['help']:
-        print "\t%s" % k
-
-def main():
-    argv = copy.deepcopy(sys.argv)
-    script_name = argv.pop(0)
-    # ensure category is specified    
-    if len(argv) < 1:
-        print script_name + " category action [<options>]"
-        category_usage()
-        sys.exit(2)
-
-    # ensure category is valid
-    category = argv.pop(0)
-    if category.find("help")>=0:
-        summary_usage()
-        sys.exit(2)
-
-    usage = "%%prog %s action [options]" % (category)
-    parser = OptionParser(usage=usage)
-    command_class =  CATEGORIES.get(category, None)
-    if not command_class:
-        print "no such category %s " % category
-        category_usage()
-        sys.exit(2)  
-    
-    # ensure command is valid      
-    command_instance = command_class()
-    actions = command_instance._get_commands()
-    if len(argv) < 1:
-        action = '__call__'
-    else:
-        action = argv.pop(0)
-    
-    if hasattr(command_instance, action):
-        command = getattr(command_instance, action)
-    else:
-        print script_name + " category action [<options>]"
-        print "Available actions for %s category:" % category
-        for k in actions:
-            print "\t%s" % k
-        sys.exit(2)
-
-    # ensure options are valid
-    options = getattr(command, 'options', [])
-    usage = "%%prog %s %s [options]" % (category, action)
-    parser = OptionParser(usage=usage)
-    for arg, kwd in options:
-        parser.add_option(*arg, **kwd)
-    (opts, cmd_args) = parser.parse_args(argv)
-    cmd_kwds = vars(opts)
-
-    # dont overrride meth
-    for k, v in cmd_kwds.items():
-        if v is None:
-            del cmd_kwds[k]
-
-    # execute commadn
-    try:
-#        print "invoking %s *=%s **=%s"%(command.__name__,cmd_args, cmd_kwds)
-        command(*cmd_args, **cmd_kwds)
-        sys.exit(0)
-    except TypeError:
-        print "Possible wrong number of arguments supplied"
-        print command.__doc__
-        parser.print_help()
-        #raise
-    except Exception:
-        print "Command failed, please check log for more info"
-        raise
+#!/usr/bin/env python
 
+from sfa.client.sfaadmin import SfaAdmin
 
 if __name__ == '__main__':
-    main()
+    SfaAdmin().main()