plshell: explicitly cast to string PL Username and AuthString

[sfa.git] / sfa / planetlab / plslices.py

diff --git a/sfa/planetlab/plslices.py b/sfa/planetlab/plslices.py
index 20077b2..8f24792 100644 (file)
--- a/sfa/planetlab/plslices.py
+++ b/sfa/planetlab/plslices.py
@@ -421,7 +421,7 @@ class PlSlices:
 
 
     def verify_slice(self, slice_hrn, slice_record, peer, sfa_peer, expiration, options={}):
-       top_auth_hrn = top_auth(slice_hrn)
+        top_auth_hrn = top_auth(slice_hrn)
         site_hrn = '.'.join(slice_hrn.split('.')[:-1])
         slice_part = slice_hrn.split('.')[-1]
         if top_auth_hrn == self.driver.hrn:
@@ -452,7 +452,7 @@ class PlSlices:
         else:
             slice = slice_exists[0]
             #Update expiration if necessary
-            if slice['expires'] != expires:
+            if slice.get('expires', None) != expires:
                 self.driver.shell.UpdateSlice( int(slice['slice_id']), {'expires' : expires})
 
         return self.driver.shell.GetSlices(int(slice['slice_id']))[0]
@@ -510,11 +510,12 @@ class PlSlices:
                            'first_name': person_hrn,
                            'last_name': person_hrn,
                            'email': users_by_hrn[person_hrn].get('email', "%s@geni.net"%person_hrn.split('.')[-1]),
-                           'enabled': True
                           }
 
                  person_id = self.driver.shell.AddPerson(person)
                  self.driver.shell.AddRoleToPerson('user', int(person_id))
+                 # enable the account 
+                 self.driver.shell.UpdatePerson(int(person_id), {'enabled': True})
                  self.driver.shell.SetPersonHrn(int(person_id), person_hrn)
                  self.driver.shell.SetPersonSfaCreated(int(person_id), 'True')
                  self.driver.shell.AddPersonToSite(int(person_id), site['site_id'])