drop support for API v1, hard-wired v2

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

diff --git a/sfa/methods/GetVersion.py b/sfa/methods/GetVersion.py
index 72fe806..cb682e4 100644 (file)
--- a/sfa/methods/GetVersion.py
+++ b/sfa/methods/GetVersion.py
@@ -1,5 +1,6 @@
 from sfa.util.method import Method
-from sfa.util.parameter import Parameter
+
+from sfa.storage.parameter import Parameter
 
 
 class GetVersion(Method):
@@ -8,10 +9,12 @@ class GetVersion(Method):
     @return version
     """
     interfaces = ['registry','aggregate', 'slicemgr', 'component']
-    accepts = []
+    accepts = [
+        Parameter(dict, "Options")
+        ]
     returns = Parameter(dict, "Version information")
 
-    def call(self):
+    # API v2 specifies options is optional, so..
+    def call(self, options={}):
         self.api.logger.info("interface: %s\tmethod-name: %s" % (self.api.interface, self.name))
-        manager = self.api.get_interface_manager()
-        return manager.GetVersion(self.api)
+        return self.api.manager.GetVersion(self.api, options)