From: Git User <support@planet-lab.org>
Date: Thu, 14 Nov 2013 07:34:43 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/geni-v3' into geni-v3
X-Git-Tag: sfa-3.1-1~42
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=7e1d7d63b6e65af7451c533fda704b14e327e48f;hp=b54e90d0c3868fa5afb89ff784cba0d5d36265ad

Merge remote-tracking branch 'origin/geni-v3' into geni-v3
---

diff --git a/sfa/planetlab/plslices.py b/sfa/planetlab/plslices.py
index 9231d7ad..b3c6813e 100644
--- a/sfa/planetlab/plslices.py
+++ b/sfa/planetlab/plslices.py
@@ -325,21 +325,23 @@ 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)