avoid as much as possible accessing logger through class instances, whenever that...

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

diff --git a/sfa/methods/GetVersion.py b/sfa/methods/GetVersion.py
index 8c215c4..01136cc 100644 (file)
--- a/sfa/methods/GetVersion.py
+++ b/sfa/methods/GetVersion.py
@@ -1,5 +1,7 @@
 from sfa.util.method import Method
-from sfa.util.parameter import Parameter
+from sfa.util.sfalogging import logger
+
+from sfa.storage.parameter import Parameter
 
 
 class GetVersion(Method):
@@ -7,10 +9,16 @@ class GetVersion(Method):
     Returns this GENI Aggregate Manager's Version Information
     @return version
     """
-    interfaces = ['registry','aggregate', 'slicemgr', 'component']
-    accepts = []
+    interfaces = ['registry', 'aggregate', 'slicemgr', 'component']
+    accepts = [
+        Parameter(dict, "Options")
+    ]
     returns = Parameter(dict, "Version information")
 
-    def call(self):
-        self.api.logger.info("interface: %s\tmethod-name: %s" % (self.api.interface, self.name))
-        return self.api.manager.GetVersion(self.api)
+    # API v2 specifies options is optional, so..
+    def call(self, options=None):
+        if options is None:
+            options = {}
+        logger.info("interface: %s\tmethod-name: %s" %
+                    (self.api.interface, self.name))
+        return self.api.manager.GetVersion(self.api, options)