From 59851b283b8cb6f92895090ba23e71be48f1a990 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Fri, 30 Jul 2010 20:52:58 +0000 Subject: [PATCH] remove distinction between sfa aggregate and geni_aggregate --- sfa/methods/GetVersion.py | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/sfa/methods/GetVersion.py b/sfa/methods/GetVersion.py index e1ca8b3b..fc21028c 100644 --- 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_manager() + + return manager.get_version() -- 2.47.0