We use the regular table.py now. NT.

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

diff --git a/sfa/managers/registry_manager_slab.py b/sfa/managers/registry_manager_slab.py
index f3957a2..287a73e 100644 (file)
--- a/sfa/managers/registry_manager_slab.py
+++ b/sfa/managers/registry_manager_slab.py
@@ -6,7 +6,7 @@ from sfa.util.faults import RecordNotFound, AccountNotEnabled, PermissionError,
     UnknownSfaType, ExistingRecord
 from sfa.util.prefixTree import prefixTree
 from sfa.util.record import SfaRecord
-from sfa.senslab.table_slab import SfaTable
+from sfa.util.table import SfaTable
 from sfa.util.xrn import Xrn, get_leaf, get_authority, hrn_to_urn, urn_to_hrn
 from sfa.util.version import version_core
 
@@ -15,10 +15,14 @@ from sfa.trust.credential import Credential
 from sfa.trust.certificate import Certificate, Keypair, convert_public_key
 from sfa.trust.gid import create_uuid
 
+#myapi=SfaAPI()
 # The GENI GetVersion call
 def GetVersion(api):
-    peers =dict ([ (peername,v._ServerProxy__host) for (peername,v) in api.registries.iteritems() 
-                   if peername != api.hrn])
+    
+    # Bugfix TP 09/11/2011
+    #peers =dict ([ (peername,v._ServerProxy__host) for (peername,v) in api.registries.iteritems()
+    peers =dict ([ (peername,v.get_url()) for (peername,v) in api.registries.iteritems()
+        if peername != api.hrn])
     xrn=Xrn(api.hrn)
     return version_core({'interface':'registry',
                          'hrn':xrn.get_hrn(),
@@ -160,6 +164,7 @@ def resolve(api, xrns, type=None, full=True):
                    
     if full:
        print >>sys.stderr, '\r\n \r\n REGISTRY:_FULL', api     
+  
         api.driver.fill_record_info(local_records)
     
     # convert local record objects to dicts
@@ -211,6 +216,7 @@ def list(api, xrn, origin_hrn=None):
 
 def register(api, record):
 
+ 
     #hrn, type = record['hrn'], record['type']
     hrn = str(record['hrn']).strip("['']")
     type = str( record['type']).strip("['']")
@@ -237,6 +243,9 @@ def register(api, record):
     #api.auth.verify_object_permission(hrn)
     api.auth.verify_object_permission( record['hrn'])
     auth_info = api.auth.get_auth_info(record['authority'])
+  
+    
+
     pub_key = None
     # make sure record has a gid
     if 'gid' not in record:
@@ -312,6 +321,7 @@ def register(api, record):
         # time by sfa and doesont already exist in plc
         if not persons or not persons[0]['site_ids']:
             login_base = get_leaf(record['authority'])
+
             api.driver.AddPersonToSite(pointer, login_base)
 
         # What roles should this user have?