fix value error

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

diff --git a/sfa/planetlab/plslices.py b/sfa/planetlab/plslices.py
index ef04997..be38155 100644 (file)
--- a/sfa/planetlab/plslices.py
+++ b/sfa/planetlab/plslices.py
@@ -4,11 +4,11 @@ from collections import defaultdict
 from sfa.util.sfatime import utcparse, datetime_to_epoch
 from sfa.util.sfalogging import logger
 from sfa.util.xrn import Xrn, get_leaf, get_authority, urn_to_hrn
-#from sfa.util.policy import Policy
-from sfa.util.plxrn import PlXrn
+
 from sfa.rspecs.rspec import RSpec
+
 from sfa.planetlab.vlink import VLink
-from sfa.util.plxrn import hrn_to_pl_slicename
+from sfa.planetlab.plxrn import PlXrn, hrn_to_pl_slicename
 
 MAXINT =  2L**31-1
 
@@ -159,6 +159,26 @@ class PlSlices:
 
         return sfa_peer
 
+    def verify_slice_leases(self, slice, requested_leases, kept_leases, peer):
+        
+        leases = self.driver.shell.GetLeases({'name':slice['name']}, ['lease_id'])
+        grain = self.driver.shell.GetLeaseGranularity()
+        current_leases = [lease['lease_id'] for lease in leases]
+        deleted_leases = list(set(current_leases).difference(kept_leases))
+
+        try:
+            if peer:
+                self.driver.shell.UnBindObjectFromPeer('slice', slice['slice_id'], peer['shortname'])
+            deleted=self.driver.shell.DeleteLeases(deleted_leases)
+            for lease in requested_leases:
+                added=self.driver.shell.AddLeases(lease['hostname'], slice['name'], int(lease['start_time']), int(lease['duration']) * grain + int(lease['start_time']))
+
+        except: 
+            logger.log_exc('Failed to add/remove slice leases')
+
+        return leases
+
+
     def verify_slice_nodes(self, slice, requested_slivers, peer):
         
         nodes = self.driver.shell.GetNodes(slice['node_ids'], ['node_id', 'hostname', 'interface_ids'])
@@ -226,7 +246,11 @@ class PlSlices:
         for link in requested_links:
             # get the ip address of the first node in the link
             ifname1 = Xrn(link['interface1']['component_id']).get_leaf()
-            (node_raw, device) = ifname1.split(':')
+            ifname_parts = ifname1.split(':')
+            node_raw = ifname_parts[0]
+            device = None
+            if len(ifname_parts) > 1:
+                device = ifname_parts[1] 
             node_id = int(node_raw.replace('node', ''))
             node = nodes_dict[node_id]
             if1 = interfaces_dict[node['interface_ids'][0]]
@@ -322,27 +346,22 @@ class PlSlices:
         slices = self.driver.shell.GetSlices([slicename]) 
         if not slices:
             slice = {'name': slicename,
-                     'url': slice_record.get('url', slice_hrn), 
-                     'description': slice_record.get('description', slice_hrn)}
+                     'url': 'No Url', 
+                     'description': 'No Description'}
             # add the slice                          
             slice['slice_id'] = self.driver.shell.AddSlice(slice)
             slice['node_ids'] = []
             slice['person_ids'] = []
-            if peer:
+            if peer and slice_record:
                 slice['peer_slice_id'] = slice_record.get('slice_id', None) 
-            # mark this slice as an sfa peer record
-#            if sfa_peer:
-#                peer_dict = {'type': 'slice', 'hrn': slice_hrn, 
-#                             'peer_authority': sfa_peer, 'pointer': slice['slice_id']}
-#                self.registry.register_peer_object(self.credential, peer_dict)
         else:
             slice = slices[0]
-            if peer:
+            if peer and slice_record:
                 slice['peer_slice_id'] = slice_record.get('slice_id', None)
                 # unbind from peer so we can modify if necessary. Will bind back later
                 self.driver.shell.UnBindObjectFromPeer('slice', slice['slice_id'], peer['shortname'])
                #Update existing record (e.g. expires field) it with the latest info.
-            if slice_record.get('expires'):
+            if slice_record and slice_record.get('expires'):
                 requested_expires = int(datetime_to_epoch(utcparse(slice_record['expires'])))
                 if requested_expires and slice['expires'] != requested_expires:
                     self.driver.shell.UpdateSlice( slice['slice_id'], {'expires' : requested_expires})
@@ -355,6 +374,7 @@ class PlSlices:
         users_by_site = defaultdict(list)
         users_dict = {} 
         for user in users:
+            user['urn'] = user['urn'].lower()
             hrn, type = urn_to_hrn(user['urn'])
             username = get_leaf(hrn)
             login_base = PlXrn(xrn=user['urn']).pl_login_base()
@@ -362,6 +382,7 @@ class PlSlices:
             user['site'] = login_base
 
             if 'email' in user:
+                user['email'] = user['email'].lower() 
                 users_by_email[user['email']] = user
                 users_dict[user['email']] = user
             else: