update geni up calls

diff --git a/PLC/Methods/AddNode.py b/PLC/Methods/AddNode.py
index 3119afd..89e4049 100644 (file)
--- a/PLC/Methods/AddNode.py
+++ b/PLC/Methods/AddNode.py
@@ -59,14 +59,18 @@ class AddNode(Method):
         node['site_id'] = site['site_id']
         node.sync()
 
-       self.event_objects = {'Site': [site['site_id']],
-                            'Node': [node['node_id']]} 
-       self.message = "Node %s created" % node['node_id']
-
-       try:
-            import gimport
+        self.event_objects = {'Site': [site['site_id']],
+                              'Node': [node['node_id']]}       
+        self.message = "Node %s created" % node['node_id']
+
+        try:
+            from geni import gimport
+            if gimport.level1_auth:
+                authority = gimport.level1_auth
+            else:
+                authority = gimport.root_auth
             login_base = gimport.cleanup_string(site['login_base'])
-            parent_hrn = gimport.level1_auth + "." + login_base
+            parent_hrn = authority + "." + login_base
             gimport.import_node(parent_hrn, node)
         except ImportError, e:
             print e.message

diff --git a/PLC/Methods/AddPersonToSite.py b/PLC/Methods/AddPersonToSite.py
index b348d12..85a426e 100644 (file)
--- a/PLC/Methods/AddPersonToSite.py
+++ b/PLC/Methods/AddPersonToSite.py
@@ -48,18 +48,22 @@ class AddPersonToSite(Method):
         if site['site_id'] not in person['site_ids']:
             site.add_person(person)
 
-       # Logging variables
-       self.event_objects = {'Site': [site['site_id']],
-                             'Person': [person['person_id']]}
-       self.message = 'Person %d added to site %d' % \
-               (person['person_id'], site['site_id'])
+           # Logging variables
+        self.event_objects = {'Site': [site['site_id']],
+                              'Person': [person['person_id']]}
+        self.message = 'Person %d added to site %d' % \
+                       (person['person_id'], site['site_id'])
 
-       # Sync with geni db
+           # Sync with geni db
         try:
-           import gimport
-           login_base = gimport.cleanup_string(site['login_base'])
-           parent_hrn = gimport.level1_auth + "." + login_base
-           gimport.import_person(parent_hrn, person)
+            from geni import gimport
+            if gimport.level1_auth:
+                authority = gimport.level1_auth
+            else:
+                authority = gimport.root_auth
+            login_base = gimport.cleanup_string(site['login_base'])
+            parent_hrn = authority + "." + login_base
+            gimport.import_person(parent_hrn, person)
         except ImportError, e:
             print e.message
         except Exception, e:

diff --git a/PLC/Methods/AddSite.py b/PLC/Methods/AddSite.py
index 62a2bd7..bd9b560 100644 (file)
--- a/PLC/Methods/AddSite.py
+++ b/PLC/Methods/AddSite.py
@@ -34,16 +34,20 @@ class AddSite(Method):
         site = Site(self.api, site_fields)
         site.sync()
        
-       # Logging variables 
-       self.event_objects = {'Site': [site['site_id']]}
+        # Logging variables 
+        self.event_objects = {'Site': [site['site_id']]}
         self.message = 'Site %d created' % site['site_id']
 
-       # Sync with geni db
+        # Sync with geni db
         try:
-            import gimport
-            gimport.import_site(gimport.level1_auth, site)
+            from geni import gimport
+            if gimport.level1_auth:
+                authority = gimport.level1_auth
+            else:
+                authority = gimport.root_auth
+            gimport.import_site(authority, site)
         except ImportError, e:
             print e.message
         except Exception, e:
             print "Error importing site person record into geni db: %s" % e.message    
-       return site['site_id']
+           return site['site_id']

diff --git a/PLC/Methods/AddSlice.py b/PLC/Methods/AddSlice.py
index acf47c0..58ffb12 100644 (file)
--- a/PLC/Methods/AddSlice.py
+++ b/PLC/Methods/AddSlice.py
@@ -67,20 +67,24 @@ class AddSlice(Method):
                                                                                                          len(site['slice_ids']),
                                                                                                          site['max_slices'])
 
-       if not site['enabled']:
-           raise PLCInvalidArgument, "Site %s is disabled can cannot create slices" % (site['name'])
+        if not site['enabled']:
+            raise PLCInvalidArgument, "Site %s is disabled can cannot create slices" % (site['name'])
         
         slice = Slice(self.api, slice_fields)
         slice['creator_person_id'] = self.caller['person_id']
         slice['site_id'] = site['site_id']
         slice.sync()
 
-       self.event_objects = {'Slice': [slice['slice_id']]}
+        self.event_objects = {'Slice': [slice['slice_id']]}
        
-       try:
-            import gimport
+        try:
+            from geni import gimport
+            if gimport.level1_auth:
+                authority = gimport.level1_auth
+            else:
+                authority = gimport.root_auth
             login_base = gimport.cleanup_string(site['login_base'])
-            parent_hrn = gimport.level1_auth + "." + login_base
+            parent_hrn = authority + "." + login_base
             gimport.import_slice(parent_hrn, slice)
         except ImportError, e:
             print e.message