X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fgeneric%2Fopenstack.py;h=bd88e90e198c643ee6c073f65b75f22dc86da72d;hb=04a3f20dc71bf8b3f96b1e3172623aa346a638a7;hp=5c99d2357708c1046b13623bb24abeff7a20fccd;hpb=e0700ed85b01e1a345565826640a30017ea08a1c;p=sfa.git

diff --git a/sfa/generic/openstack.py b/sfa/generic/openstack.py
index 5c99d235..bd88e90e 100644
--- a/sfa/generic/openstack.py
+++ b/sfa/generic/openstack.py
@@ -1,35 +1,29 @@
 from sfa.generic import Generic
 
 import sfa.server.sfaapi
-import sfa.openstack.openstack_driver
+import sfa.openstack.nova_driver
 import sfa.managers.registry_manager_openstack
+import sfa.managers.aggregate_manager
 import sfa.managers.slice_manager
-import sfa.managers.aggregate_manager_openstack
 
-class openstack (Generic):
-    
-    # use the standard api class
-    def api_class (self):
-        return sfa.server.sfaapi.SfaApi
+# use pl as a model so we only redefine what's different
+from sfa.generic.pl import pl
 
-    # the manager classes for the server-side services
-    def registry_manager_class (self) : 
-        return sfa.managers.registry_manager_openstack.RegistryManager
-    def slicemgr_manager_class (self) : 
-        return sfa.managers.slice_manager.SliceManager
-    def aggregate_manager_class (self) :
-        return sfa.managers.aggregate_manager_openstack.AggregateManager
 
-    # driver class for server-side services, talk to the whole testbed
-    def driver_class (self):
-        return sfa.openstack.openstack_driver.OpenstackDriver
+class openstack (pl):
 
-    # for the component mode, to be run on board planetlab nodes
-    # manager class
-    def component_manager_class (self):
-        return sfa.managers.component_manager_pl
-    # driver_class
-    def component_driver_class (self):
-        return sfa.plc.plcomponentdriver.PlComponentDriver
+    # the importer class
+    def importer_class(self):
+        import sfa.importer.openstackimporter
+        return sfa.importer.openstackimporter.OpenstackImporter
 
+    # the manager classes for the server-side services
+    def registry_manager_class(self):
+        return sfa.managers.registry_manager_openstack.RegistryManager
+
+    def aggregate_manager_class(self):
+        return sfa.managers.aggregate_manager.AggregateManager
 
+    # driver class for server-side services, talk to the whole testbed
+    def driver_class(self):
+        return sfa.openstack.nova_driver.NovaDriver