From: Tony Mack Date: Fri, 11 Nov 2011 04:55:55 +0000 (-0500) Subject: nodes are Node objects X-Git-Tag: sfa-1.1-3~36 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=16515b832efae02be62109f780e1008ce9994fc6;p=sfa.git nodes are Node objects --- diff --git a/sfa/client/sfiListNodes.py b/sfa/client/sfiListNodes.py index f9e794b8..29fc80d0 100755 --- a/sfa/client/sfiListNodes.py +++ b/sfa/client/sfiListNodes.py @@ -2,7 +2,8 @@ import sys from sfa.client.sfi_commands import Commands -from sfa.rspecs.rspec import RSpec +from sfa.rspecs.rspec import RSpec +from sfa.util.plxrn import xrn_to_hostname command = Commands(usage="%prog [options]", description="List all nodes in the RSpec. " + @@ -17,7 +18,13 @@ if command.opts.infile: sys.stdout = open(command.opts.outfile, 'w') for node in nodes: - print node + hostname = None + if node.get('component_name'): + hostname = node['component_name'] + elif node.get('component_id'): + hostname = xrn_to_hostname(node['component_id']) + if hostname: + print hostname