Merge branch 'master' of ssh://git.planet-lab.org/git/sfa

[sfa.git] / sfa / methods / GetVersion.py

diff --git a/sfa/methods/GetVersion.py b/sfa/methods/GetVersion.py
index e1ca8b3..8552daf 100644 (file)
--- a/sfa/methods/GetVersion.py
+++ b/sfa/methods/GetVersion.py
@@ -9,25 +9,13 @@ class GetVersion(Method):
     Returns this GENI Aggregate Manager's Version Information
     @return version
     """
-    interfaces = ['geni_am','registry']
+    interfaces = ['registry','aggregate', 'slicemgr', 'component']
     accepts = []
     returns = Parameter(dict, "Version information")
 
     def call(self):
         self.api.logger.info("interface: %s\tmethod-name: %s" % (self.api.interface, self.name))
-
-        manager_base = 'sfa.managers'
-
-        if self.api.interface in ['geni_am']:
-            mgr_type = self.api.config.SFA_GENI_AGGREGATE_TYPE
-            manager_module = manager_base + ".geni_am_%s" % mgr_type
-            manager = __import__(manager_module, fromlist=[manager_base])
-            return manager.GetVersion()
-        if self.api.interface in ['registry']:
-            mgr_type = self.api.config.SFA_REGISTRY_TYPE
-            manager_module = manager_base + ".slice_manager_%s" % mgr_type
-            manager = __import__(manager_module, fromlist=[manager_base])
-            return manager.GetVersion()
-        
-        return {}
+        manager = self.api.get_interface_manager()
+    
+        return manager.get_version()