AMs also expose their hrn in GetVersion

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

diff --git a/sfa/managers/aggregate_manager_vini.py b/sfa/managers/aggregate_manager_vini.py
index 2ec4999..227281a 100644 (file)
--- a/sfa/managers/aggregate_manager_vini.py
+++ b/sfa/managers/aggregate_manager_vini.py
@@ -1,13 +1,11 @@
-### $Id: slices.py 15842 2009-11-22 09:56:13Z anil $
-### $URL: https://svn.planet-lab.org/svn/sfa/trunk/sfa/plc/slices.py $
-
 import datetime
 import time
 import traceback
 import sys
 
 from types import StringTypes
-from sfa.util.namespace import *
+from sfa.util.xrn import urn_to_hrn, Xrn
+from sfa.util.plxrn import hrn_to_pl_slicename
 from sfa.util.rspec import *
 from sfa.util.specdict import *
 from sfa.util.faults import *
@@ -22,27 +20,20 @@ from sfa.managers.vini.vini_network import *
 from sfa.plc.api import SfaAPI
 from sfa.plc.slices import *
 from sfa.managers.aggregate_manager_pl import __get_registry_objects, __get_hostnames
+from sfa.util.version import version_core
 
 # VINI aggregate is almost identical to PLC aggregate for many operations, 
 # so lets just import the methods form the PLC manager
-
 from sfa.managers.aggregate_manager_pl import (
-start_slice, stop_slice, renew_slice, reset_slice, get_slices, get_ticket)
-
-
-def get_version():
-    version = {}
-    version['geni_api'] = 1
-    version['sfa'] = 1
-    return version
+start_slice, stop_slice, renew_slice, reset_slice, get_slices, get_ticket, slice_status)
 
-def slice_status(api, slice_xrn, creds):
-    result = {}
-    result['geni_urn'] = slice_xrn
-    result['geni_status'] = 'unknown'
-    result['geni_resources'] = {}
-    return result
 
+def GetVersion(api):
+    xrn=Xrn(api.hrn)
+    return version_core({'interface':'aggregate',
+                         'testbed':'myplc.vini',
+                         'hrn':xrn.get_hrn(),
+                         })
 
 def delete_slice(api, xrn, creds):
     hrn, type = urn_to_hrn(xrn)
@@ -62,7 +53,7 @@ def create_slice(api, xrn, creds, xml, users):
 
     hrn, type = urn_to_hrn(xrn)
     peer = None
-    reg_objects = __get_registry_objects(slice_xrn, creds, users)
+    reg_objects = __get_registry_objects(xrn, creds, users)
     slices = Slices(api)
     peer = slices.get_peer(hrn)
     sfa_peer = slices.get_sfa_peer(hrn)
@@ -99,7 +90,7 @@ def create_slice(api, xrn, creds, xml, users):
 
 def get_rspec(api, creds, options):
     # get slice's hrn from options
-    xrn = options.get('geni_slice_urn', None)
+    xrn = options.get('geni_slice_urn', '')
     hrn, type = urn_to_hrn(xrn)
     
     # look in cache first