Created special slab_get_authority to import slab nodes in sfa db.

Modified import script to prevent stalling on import.

diff --git a/sfa/importer/slabimporter.py b/sfa/importer/slabimporter.py
index 75b7725..d38f454 100644 (file)
--- a/sfa/importer/slabimporter.py
+++ b/sfa/importer/slabimporter.py
@@ -145,9 +145,12 @@ class SlabImporter:
                         pkey = Keypair(create=True)
                         urn = hrn_to_urn(escaped_hrn, 'node') 
                         node_gid = self.auth_hierarchy.create_gid(urn, create_uuid(), pkey)
+                        def slab_get_authority(hrn):
+                            return hrn.split(".")[0]
+                            
                         node_record = RegNode (hrn=hrn, gid=node_gid, 
                                                 pointer = '-1',
-                                                authority=get_authority(hrn)) 
+                                                authority=slab_get_authority(hrn)) 
                         node_record.just_created()
                         dbsession.add(node_record)
                         dbsession.commit()

diff --git a/sfa/rspecs/elements/versions/sfav1Lease.py b/sfa/rspecs/elements/versions/sfav1Lease.py
index 6275121..69676ed 100644 (file)
--- a/sfa/rspecs/elements/versions/sfav1Lease.py
+++ b/sfa/rspecs/elements/versions/sfav1Lease.py
@@ -22,7 +22,6 @@ class SFAv1Lease:
 
     @staticmethod
     def add_leases(xml, leases):
-        logger.debug("SFAV1LEASE \t add_lease ")
         network_elems = xml.xpath('//network')
         if len(network_elems) > 0:
             network_elem = network_elems[0]
@@ -56,7 +55,6 @@ class SFAv1Lease:
             lease_fields = ['slice_id', 'start_time', 'duration']
             lease_elem = network_elem.add_instance('lease', lease[0], lease_fields)
             lease_elems.append(lease_elem)
-            logger.debug("SFAV1LEASE \t add_lease lease %s" %(lease))
 
             # add nodes of this lease
             for node in lease:

diff --git a/sfa/senslab/config/bash_nukem b/sfa/senslab/config/bash_nukem
index 28aa558..2aaeec1 100755 (executable)
--- a/sfa/senslab/config/bash_nukem
+++ b/sfa/senslab/config/bash_nukem
@@ -28,6 +28,9 @@ else
     exit 
 fi
 
+# First restart sfa (prevents stalling when connecting
+# to the DB and dropping tables)
+sudo service sfa restart
 # Nuke the database 
 sudo sfaadmin.py registry nuke