Weird bug when only cleaning slabimporter.py.

[sfa.git] / sfa / importer / slabimporter.py

diff --git a/sfa/importer/slabimporter.py b/sfa/importer/slabimporter.py
index 0c772db..a4181d5 100644 (file)
--- a/sfa/importer/slabimporter.py
+++ b/sfa/importer/slabimporter.py
@@ -1,13 +1,9 @@
-import os
 import sys
-import datetime
-import time
 
 from sfa.util.config import Config
-from sfa.util.xrn import Xrn, get_leaf, get_authority, hrn_to_urn
-from sfa.util.plxrn import PlXrn, slicename_to_hrn, email_to_hrn, hrn_to_pl_slicename
+from sfa.util.xrn import get_authority, hrn_to_urn
+from sfa.planetlab.plxrn import PlXrn
 
-from sfa.senslab.LDAPapi import LDAPapi
 from sfa.senslab.slabdriver import SlabDriver
 from sfa.senslab.slabpostgres import SliceSenslab, slab_dbsession
 
@@ -16,7 +12,7 @@ from sfa.trust.gid import create_uuid
 
 from sfa.storage.alchemy import dbsession
 from sfa.storage.model import RegRecord, RegAuthority, RegSlice, RegNode, RegUser, RegKey
-from sfa.storage.dbschema import DBSchema
+
 
 
 
@@ -32,7 +28,7 @@ class SlabImporter:
 
        
     def hostname_to_hrn(self,root_auth,login_base,hostname):
-        return PlXrn(auth=root_auth,hostname=login_base+'_'+hostname).get_hrn()   
+        return PlXrn(auth=root_auth,hostname = hostname).get_hrn()   
     
     def slicename_to_hrn(self, person_hrn):
         return  (person_hrn +'_slice')
@@ -143,7 +139,7 @@ class SlabImporter:
                         urn = hrn_to_urn(hrn, 'node') 
                         node_gid = self.auth_hierarchy.create_gid(urn, create_uuid(), pkey)
                         node_record = RegNode (hrn=hrn, gid=node_gid, 
-                                                pointer =node['node_id'],
+                                                pointer = '-1',
                                                 authority=get_authority(hrn))
                         node_record.just_created()
                         dbsession.add(node_record)
@@ -171,8 +167,6 @@ class SlabImporter:
     
                 user_record = self.find_record_by_type_hrn( 'user', person_hrn)
                 slice_record = self.find_record_by_type_hrn ('slice', slice_hrn)
-                print>>sys.stderr, "\r\n \r\n SLAB IMPORTER FROM LDAP LIST PERSON IMPORT user_record %s " %(user_record)
-                
                 
                 # return a tuple pubkey (a plc key object) and pkey (a Keypair object)
                 def init_person_key (person, slab_key):