From: Tony Mack <tmack@cs.princeton.edu>
Date: Thu, 12 Feb 2009 19:12:38 +0000 (+0000)
Subject: make imports more fault tolerant
X-Git-Tag: sfa-0.9-0@14641~634
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4778b712a9cb2d837a8d3237372377668da59572;hp=6597d2f6f1fec7a912ecab0ee89862f8a7c14af1;p=sfa.git

make imports more fault tolerant
---

diff --git a/geni/gimport.py b/geni/gimport.py
index 3250c076..0d8e19d7 100755
--- a/geni/gimport.py
+++ b/geni/gimport.py
@@ -268,17 +268,24 @@ def import_site(parent_hrn, site):
     for person_id in site['person_ids']:
         persons = shell.GetPersons(pl_auth, [person_id])
         if persons:
-            import_person(hrn, persons[0])
-
+            try: 
+                import_person(hrn, persons[0])
+            except:
+                report.trace("Failed to import: %s" % persons[0])
     for slice_id in site['slice_ids']:
         slices = shell.GetSlices(pl_auth, [slice_id])
         if slices:
-            import_slice(hrn, slices[0])
-
+            try:
+                import_slice(hrn, slices[0])
+            except:
+                report.trace("Failed to import: %s" % slices[0])
     for node_id in site['node_ids']:
         nodes = shell.GetNodes(pl_auth, [node_id])
         if nodes:
-            import_node(hrn, nodes[0])
+            try:
+                import_node(hrn, nodes[0])
+            except:
+                report.trace("Failed to import: %s" % nodes[0])
 
 def create_top_level_auth_records(hrn):
     parent_hrn = get_authority(hrn)