From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Fri, 11 Jan 2013 07:05:17 +0000 (+0100)
Subject: Merge branch 'geni-v2' of ssh://git.onelab.eu/git/sfa into geni-v2
X-Git-Tag: sfa-2.1-23~26^2
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=8e965651869430c170112fc43fc09fe2de6ab060;hp=6410f0c26e239fb66f78a4fea0dd010a2c4bca03

Merge branch 'geni-v2' of ssh://git.onelab.eu/git/sfa into geni-v2
---

diff --git a/sfa/planetlab/plaggregate.py b/sfa/planetlab/plaggregate.py
index a16bf670..47c637bc 100644
--- a/sfa/planetlab/plaggregate.py
+++ b/sfa/planetlab/plaggregate.py
@@ -238,7 +238,8 @@ class PlAggregate:
                 rspec_node['interfaces'].append(interface)
                 if_count+=1
 
-            tags = [PLTag(node_tags[tag_id]) for tag_id in node['node_tag_ids']]
+            tags = [PLTag(node_tags[tag_id]) for tag_id in node['node_tag_ids']\
+                    if tag_id in node_tags]
             rspec_node['tags'] = tags
             if node['node_id'] in slivers:
                 # add sliver info