From: Tony Mack <tmack@cs.princeton.edu>
Date: Tue, 16 Jan 2007 19:14:10 +0000 (+0000)
Subject: - return hostnames instead of node_ids
X-Git-Tag: pycurl-7_13_1~89
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ccf2e73ce274752dba1f9a7ad07b272831506cd9;p=plcapi.git

- return hostnames instead of node_ids
- return emails instead of person_ids
---

diff --git a/PLC/Methods/SliceInfo.py b/PLC/Methods/SliceInfo.py
index 3d04979..679995d 100644
--- a/PLC/Methods/SliceInfo.py
+++ b/PLC/Methods/SliceInfo.py
@@ -5,6 +5,8 @@ from PLC.Filter import Filter
 from PLC.Auth import Auth
 from PLC.Slices import Slice, Slices
 from PLC.Sites import Site, Sites
+from PLC.Persons import Person, Persons
+from PLC.Nodes import Node, Nodes
 
 class SliceInfo(Method):
     """
@@ -58,10 +60,14 @@ class SliceInfo(Method):
 	    index = slices.index(slice)
 	    node_ids = slices[index].pop('node_ids')
 	    person_ids = slices[index].pop('person_ids')
-	    if return_users:
-		slices[index]['users'] = person_ids
-	    if return_nodes:
-	        slices[index]['nodes'] = node_ids
+	    if return_users or return_users is None:
+		persons = Persons(self.api, person_ids)
+		emails = [person['email'] for person in persons]
+		slices[index]['users'] = emails
+	    if return_nodes or return_nodes is None:
+		nodes = Nodes(self.api, node_ids)
+		hostnames = [node['hostname'] for node in nodes]
+	        slices[index]['nodes'] = hostnames
 		
 	
         return slices