merging with geni-api branch

[sfa.git] / sfa / plc / sfaImport.py

diff --git a/sfa/plc/sfaImport.py b/sfa/plc/sfaImport.py
index a554cb6..b95bc5a 100644 (file)
--- a/sfa/plc/sfaImport.py
+++ b/sfa/plc/sfaImport.py
@@ -56,9 +56,6 @@ class sfaImport:
         self.TrustedRoots = TrustedRootList(Config.get_trustedroots_dir(self.config))
         self.plc_auth = self.config.get_plc_auth()
         self.root_auth = self.config.SFA_REGISTRY_ROOT_AUTH
-        self.level1_auth = self.config.SFA_REGISTRY_LEVEL1_AUTH
-        if not self.level1_auth or self.level1_auth in ['']:
-            self.level1_auth = None
         
         # connect to planetlab
         self.shell = None
@@ -72,24 +69,21 @@ class sfaImport:
 
     def create_top_level_auth_records(self, hrn):
         AuthHierarchy = self.AuthHierarchy
-        
-        # if auth records for this hrn dont exist, create it
-        if not AuthHierarchy.auth_exists(hrn):
+        urn = hrn_to_urn(hrn, 'authority')
+        # make sure parent exists
+        parent_hrn = get_authority(hrn)
+        if not parent_hrn:
+            parent_hrn = hrn
+        if not parent_hrn == hrn:
+            self.create_top_level_auth_records(parent_hrn)
+
+        # create the authority if it doesnt already exist 
+        if not AuthHierarchy.auth_exists(urn):
             trace("Import: creating top level authorites", self.logger)
-            AuthHierarchy.create_auth(hrn)
+            AuthHierarchy.create_auth(urn)
         
-
-        # get the auth info of the newly created root auth (parent)
-        # or level1_auth if it exists
-        if self.level1_auth:
-            auth_info = AuthHierarchy.get_auth_info(hrn)
-            parent_hrn = hrn
-        else:
-            parent_hrn = get_authority(hrn)
-            if not parent_hrn:
-                parent_hrn = hrn
-            auth_info = AuthHierarchy.get_auth_info(parent_hrn)
-            
+        # create the db record if it doesnt already exist    
+        auth_info = AuthHierarchy.get_auth_info(hrn)
         table = SfaTable()
         auth_record = table.find({'type': 'authority', 'hrn': hrn})
 
@@ -127,7 +121,8 @@ class sfaImport:
             pkey = Keypair(create=True)
 
         # create the gid
-        person_gid = AuthHierarchy.create_gid(hrn, create_uuid(), pkey)
+        urn = hrn_to_urn(hrn, 'user')
+        person_gid = AuthHierarchy.create_gid(urn, create_uuid(), pkey)
         table = SfaTable()
         person_record = SfaRecord(hrn=hrn, gid=person_gid, type="user", pointer=person['person_id'])
         person_record['authority'] = get_authority(person_record['hrn'])
@@ -153,7 +148,8 @@ class sfaImport:
         trace("Import: importing slice " + hrn, self.logger)
 
         pkey = Keypair(create=True)
-        slice_gid = AuthHierarchy.create_gid(hrn, create_uuid(), pkey)
+        urn = hrn_to_urn(hrn, 'slice')
+        slice_gid = AuthHierarchy.create_gid(urn, create_uuid(), pkey)
         slice_record = SfaRecord(hrn=hrn, gid=slice_gid, type="slice", pointer=slice['slice_id'])
         slice_record['authority'] = get_authority(slice_record['hrn'])
         table = SfaTable()
@@ -184,7 +180,8 @@ class sfaImport:
         table = SfaTable()
         node_record = table.find({'type': 'node', 'hrn': hrn})
         pkey = Keypair(create=True)
-        node_gid = AuthHierarchy.create_gid(hrn, create_uuid(), pkey)
+        urn = hrn_to_urn(hrn, 'node')
+        node_gid = AuthHierarchy.create_gid(urn, create_uuid(), pkey)
         node_record = SfaRecord(hrn=hrn, gid=node_gid, type="node", pointer=node['node_id'])
         node_record['authority'] = get_authority(node_record['hrn'])
         existing_records = table.find({'hrn': hrn, 'type': 'node', 'pointer': node['node_id']})
@@ -203,9 +200,9 @@ class sfaImport:
         plc_auth = self.plc_auth
         sitename = site['login_base']
         sitename = cleanup_string(sitename)
-
+        print 'importing site %s' % sitename
         hrn = parent_hrn + "." + sitename
-
+        urn = hrn_to_urn(hrn, 'authority')
         # Hardcode 'internet2' into the hrn for sites hosting
         # internet2 nodes. This is a special operation for some vini
         # sites only
@@ -220,10 +217,10 @@ class sfaImport:
         trace("Import: importing site " + hrn, self.logger)
 
         # create the authority
-        if not AuthHierarchy.auth_exists(hrn):
-            AuthHierarchy.create_auth(hrn)
+        if not AuthHierarchy.auth_exists(urn):
+            AuthHierarchy.create_auth(urn)
 
-        auth_info = AuthHierarchy.get_auth_info(hrn)
+        auth_info = AuthHierarchy.get_auth_info(urn)
 
         table = SfaTable()
         auth_record = SfaRecord(hrn=hrn, gid=auth_info.get_gid_object(), type="authority", pointer=site['site_id'])