better support for reporting available api versions

[sfa.git] / sfa / managers / aggregate_manager.py

diff --git a/sfa/managers/aggregate_manager.py b/sfa/managers/aggregate_manager.py
index b7106e6..4d773fc 100644 (file)
--- a/sfa/managers/aggregate_manager.py
+++ b/sfa/managers/aggregate_manager.py
@@ -1,6 +1,8 @@
+import socket
 from sfa.util.version import version_core
 from sfa.util.xrn import Xrn
 from sfa.util.callids import Callids
+from sfa.server.api_versions import ApiVersions
 
 class AggregateManager:
 
@@ -9,14 +11,15 @@ class AggregateManager:
     # essentially a union of the core version, the generic version (this code) and
     # whatever the driver needs to expose
     def GetVersion(self, api, options):
-    
         xrn=Xrn(api.hrn)
         version = version_core()
+        geni_api_versions = ApiVersions().get_versions()
+        geni_api_versions.append({'2': 'http://%s:%s' % (api.config.SFA_AGGREGATE_HOST, api.config.SFA_AGGREGATE_PORT)})
         version_generic = {
             'interface':'aggregate',
             'sfa': 2,
             'geni_api': 2,
-            'geni_api_versions': {'2': '%s:%s' % (api.config.SFA_SM_HOST, api.config.SFA_SM_PORT)}, 
+            'geni_api_versions': geni_api_versions, 
             'hrn':xrn.get_hrn(),
             'urn':xrn.get_urn(),
             }
@@ -43,14 +46,13 @@ class AggregateManager:
             xrn = Xrn(slice_xrn)
             slice_urn=xrn.get_urn()
             slice_hrn=xrn.get_hrn()
-
         return self.driver.list_resources (slice_urn, slice_hrn, creds, options)
     
     def SliverStatus (self, api, xrn, creds, options):
         call_id = options.get('call_id')
         if Callids().already_handled(call_id): return {}
     
-        xrn = Xrn(xrn)
+        xrn = Xrn(xrn,'slice')
         slice_urn=xrn.get_urn()
         slice_hrn=xrn.get_hrn()
         return self.driver.sliver_status (slice_urn, slice_hrn)
@@ -63,7 +65,7 @@ class AggregateManager:
         call_id = options.get('call_id')
         if Callids().already_handled(call_id): return ""
     
-        xrn = Xrn(xrn)
+        xrn = Xrn(xrn, 'slice')
         slice_urn=xrn.get_urn()
         slice_hrn=xrn.get_hrn()
 
@@ -73,7 +75,7 @@ class AggregateManager:
         call_id = options.get('call_id')
         if Callids().already_handled(call_id): return True
 
-        xrn = Xrn(xrn)
+        xrn = Xrn(xrn, 'slice')
         slice_urn=xrn.get_urn()
         slice_hrn=xrn.get_hrn()
         return self.driver.delete_sliver (slice_urn, slice_hrn, creds, options)
@@ -82,7 +84,7 @@ class AggregateManager:
         call_id = options.get('call_id')
         if Callids().already_handled(call_id): return True
         
-        xrn = Xrn(xrn)
+        xrn = Xrn(xrn, 'slice')
         slice_urn=xrn.get_urn()
         slice_hrn=xrn.get_hrn()
         return self.driver.renew_sliver (slice_urn, slice_hrn, creds, expiration_time, options)
@@ -112,5 +114,7 @@ class AggregateManager:
         slice_urn=xrn.get_urn()
         slice_hrn=xrn.get_hrn()
 
+        # xxx sounds like GetTicket is dead, but if that gets resurrected we might wish
+        # to pass 'users' over to the driver as well
         return self.driver.get_ticket (slice_urn, slice_hrn, creds, rspec, options)