fix for potential ValueError

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

diff --git a/sfa/planetlab/plslices.py b/sfa/planetlab/plslices.py
index 351335e..fedb64b 100644 (file)
--- a/sfa/planetlab/plslices.py
+++ b/sfa/planetlab/plslices.py
@@ -1,3 +1,4 @@
+import time
 from types import StringTypes
 from collections import defaultdict
 
@@ -7,7 +8,7 @@ from sfa.util.xrn import Xrn, get_leaf, get_authority, urn_to_hrn
 from sfa.rspecs.rspec import RSpec
 from sfa.planetlab.vlink import VLink
 from sfa.planetlab.topology import Topology
-from sfa.planetlab.plxrn import PlXrn, hrn_to_pl_slicename
+from sfa.planetlab.plxrn import PlXrn, hrn_to_pl_slicename, xrn_to_hostname
 from sfa.storage.model import SliverAllocation
 from sfa.storage.alchemy import dbsession
 
@@ -232,22 +233,6 @@ class PlSlices:
         nodes = self.driver.shell.GetNodes(slice['node_ids'], ['node_id', 'hostname', 'interface_ids'])
         current_slivers = [node['hostname'] for node in nodes]
 
-        requested_slivers = []
-        tags = []
-        for node in slivers:
-            hostname = None
-            if node.get('component_name'):
-                hostname = node.get('component_name').strip()
-            elif node.get('component_id'):
-                hostname = xrn_to_hostname(node.get('component_id').strip())
-            if node.get('client_id'):
-                tags.append({'slicename': slice['name'], 
-                             'tagname': 'client_id',
-                             'value': node['client_id'],
-                             'node': hostname})
-            if hostname:
-                requested_slivers.append(hostname)
-        
         # remove nodes not in rspec
         deleted_nodes = list(set(current_slivers).difference(slivers.keys()))
 
@@ -330,21 +315,22 @@ 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()
-            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]]
-            ipaddr = if1['ip']
-            topo_rspec = VLink.get_topo_rspec(link, ipaddr)
-            # set topo_rspec tag
-            slice_tags.append({'name': 'topo_rspec', 'value': str([topo_rspec]), 'node_id': node_id})
-            # set vini_topo tag
-            slice_tags.append({'name': 'vini_topo', 'value': 'manual', 'node_id': node_id})
-            #self.driver.shell.AddSliceTag(slice['name'], 'topo_rspec', str([topo_rspec]), node_id) 
+            if ifname1:
+                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]]
+                ipaddr = if1['ip']
+                topo_rspec = VLink.get_topo_rspec(link, ipaddr)
+                # set topo_rspec tag
+                slice_tags.append({'name': 'topo_rspec', 'value': str([topo_rspec]), 'node_id': node_id})
+                # set vini_topo tag
+                slice_tags.append({'name': 'vini_topo', 'value': 'manual', 'node_id': node_id})
+                #self.driver.shell.AddSliceTag(slice['name'], 'topo_rspec', str([topo_rspec]), node_id) 
 
         self.verify_slice_attributes(slice, slice_tags, {'append': True}, admin=True)
                         
@@ -564,7 +550,7 @@ class PlSlices:
                 'email': added_user_id,
                 'peer_person_id': None,
                 'keys': [],
-                'key_ids': added_user.get('key_ids', []),
+                #'key_ids': added_user.get('key_ids', []),
             }
             person['person_id'] = self.driver.shell.AddPerson(person)
             if peer: