X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fgeneric%2F__init__.py;h=99d15bc13840f69c3afc8bbf60aab092f4fbe8b3;hb=3e20cc0cfaac3d5168b269d866a5778fdd4f226e;hp=a4e7bdf99984fbf168284dc66d8a80536382ebce;hpb=431a6bf78c6232a44b178e2092451e733a71bba3;p=sfa.git

diff --git a/sfa/generic/__init__.py b/sfa/generic/__init__.py
index a4e7bdf9..99d15bc1 100644
--- a/sfa/generic/__init__.py
+++ b/sfa/generic/__init__.py
@@ -35,18 +35,22 @@ class Generic:
         #mixed = flavour.capitalize()
         module_path="sfa.generic.%s"%flavour
         classname="%s"%flavour
-        logger.info("Generic.the_flavour with flavour=%s"%flavour)
+        logger.debug("Generic.the_flavour with flavour=%s"%flavour)
         try:
             module = __import__ (module_path, globals(), locals(), [classname])
             return getattr(module, classname)(flavour,config)
         except:
             logger.log_exc("Cannot locate generic instance with flavour=%s"%flavour)
 
+    # provide default for importer_class
+    def importer_class (self): 
+        return None
+
     # in the simplest case these can be redefined to the class/module objects to be used
     # see pl.py for an example
     # some descendant of SfaApi
     def api_class (self) : pass
-    # in practical terms these are modules for now
+    # the python classes to use to build up the context
     def registry_class (self) : pass
     def slicemgr_class (self) : pass
     def aggregate_class (self) : pass
@@ -60,44 +64,54 @@ class Generic:
         if not 'interface' in kwargs:
             logger.critical("Generic.make_api: no interface found")
         api = self.api_class()(*args, **kwargs)
-        manager = self.make_manager(api.interface)
-        driver = self.make_driver (api.config)
+        # xxx can probably drop support for managers implemented as modules 
+        # which makes it a bit awkward
+        manager_class_or_module = self.make_manager(api.interface)
+        driver = self.make_driver (api.config, api.interface)
         ### arrange stuff together
         # add a manager wrapper
-        manager = ManagerWrapper(manager,api.interface)
-        api.manager=manager
+        manager_wrap = ManagerWrapper(manager_class_or_module,api.interface,api.config)
+        api.manager=manager_wrap
         # insert driver in manager
-        manager.driver=driver
+        logger.debug("Setting manager.driver, manager=%s"%manager_class_or_module)
+        # xxx this should go into the object and not the class !?!
+        manager_class_or_module.driver=driver
         # add it in api as well for convenience
         api.driver=driver
         return api
 
     def make_manager (self, interface):
         """
-        interface expected in ['registry', 'aggregate', 'slice', 'component']
+        interface expected in ['registry', 'aggregate', 'slicemgr', 'component']
         flavour is e.g. 'pl' or 'max' or whatever
         """
         flavour = self.flavour
         message="Generic.make_manager for interface=%s and flavour=%s"%(interface,flavour)
         
-        classname = "%s_class"%interface
+        classname = "%s_manager_class"%interface
         try:
-            module = getattr(self,classname)()
-            logger.info("%s : %s"%(message,module))
-            return module
+            module_or_class = getattr(self,classname)()
+            logger.debug("%s : %s"%(message,module_or_class))
+            # this gets passed to ManagerWrapper that will call the class constructor 
+            # if it's a class, or use the module as is if it's a module
+            # so bottom line is, don't try the constructor here
+            return module_or_class
         except:
             logger.log_exc_critical(message)
         
-    def make_driver (self, config):
+    # need interface to select the right driver
+    def make_driver (self, config, interface):
         flavour = self.flavour
-        message="Generic.make_driver for flavour=%s"%(flavour)
+        message="Generic.make_driver for flavour=%s and interface=%s"%(flavour,interface)
         
-        classname = "driver_class"
+        if interface == "component":
+            classname = "component_driver_class"
+        else:
+            classname = "driver_class"
         try:
             class_obj = getattr(self,classname)()
-            logger.info("%s : %s"%(message,class_obj))
+            logger.debug("%s : %s"%(message,class_obj))
             return class_obj(config)
         except:
             logger.log_exc_critical(message)
         
-