From: root <root@cassidy.cs.princeton.edu>
Date: Wed, 9 Mar 2011 06:45:17 +0000 (-0500)
Subject: Merge commit 'origin/master'
X-Git-Tag: plcapi-5.0-33~22
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=05cc869ac1b972416a371d02ded9f47bcaab8067;hp=8ebeada1eebab2cd38615b8b13134189d9c42003;p=plcapi.git

Merge commit 'origin/master'
---

diff --git a/PLC/Methods/GetSliceSshKeys.py b/PLC/Methods/GetSliceSshKeys.py
index e151713..393d94f 100644
--- a/PLC/Methods/GetSliceSshKeys.py
+++ b/PLC/Methods/GetSliceSshKeys.py
@@ -4,6 +4,7 @@ from PLC.Filter import Filter
 from PLC.Auth import Auth
 from PLC.Nodes import Node, Nodes
 from PLC.SliceTags import SliceTag, SliceTags
+from PLC.Slices import Slice, Slices 
 
 class GetSliceSshKeys(Method):
     """
@@ -45,6 +46,6 @@ class GetSliceSshKeys(Method):
         # fetch nodes
         nodes=Nodes(api,node_ids)
         # hash on node_id
-        nodes_hash=dict([n['node_id'],n['hostname'] for n in nodes])
+        nodes_hash=dict( [ (n['node_id'],n['hostname']) for n in nodes])
         # return values hashed on hostname
         return dict([ (nodes_hash[nodes_hash[st['node_id']]],st['value']) for st in slice_tags])