From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Sun, 20 Nov 2011 22:23:05 +0000 (-0500)
Subject: import script will create top level auth keys if they dont exist
X-Git-Tag: sfa-2.0-0~14^2~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=530dee59f3804085473f13eb9fffd34b6480fc01;p=sfa.git

import script will create top level auth keys if they dont exist
---

diff --git a/sfa/importer/sfa-import-plc.py b/sfa/importer/sfa-import-plc.py
index 6873f48a..15a5bc6d 100755
--- a/sfa/importer/sfa-import-plc.py
+++ b/sfa/importer/sfa-import-plc.py
@@ -80,9 +80,7 @@ def main():
        table.create()
 
     # create root authority 
-    sfaImporter.create_top_level_auth_records(root_auth)
-    if not root_auth == interface_hrn:
-        sfaImporter.create_top_level_auth_records(interface_hrn)
+    sfaImporter.create_top_level_auth_records(interface_hrn)
 
     # create s user record for the slice manager
     sfaImporter.create_sm_client_record()
diff --git a/sfa/importer/sfaImport.py b/sfa/importer/sfaImport.py
index 4c5b5c7e..568fce84 100644
--- a/sfa/importer/sfaImport.py
+++ b/sfa/importer/sfaImport.py
@@ -75,6 +75,8 @@ class sfaImport:
         if not parent_hrn == hrn:
             self.create_top_level_auth_records(parent_hrn)
 
+        # enxure key and cert exists:
+        self.AuthHierarchy.create_top_level_auth(hrn)    
         # create the db record if it doesnt already exist    
         auth_info = self.AuthHierarchy.get_auth_info(hrn)
         table = SfaTable()