Merge branch 'upstreammaster'

[sfa.git] / sfa / client / sfiListNodes.py

diff --git a/sfa/client/sfiListNodes.py b/sfa/client/sfiListNodes.py
index 0c629c8..3de1657 100755 (executable)
--- a/sfa/client/sfiListNodes.py
+++ b/sfa/client/sfiListNodes.py
@@ -1,9 +1,9 @@
 #! /usr/bin/env python
 
 import sys
-#from sfa.util.rspecHelper import RSpec, Commands
 from sfa.client.sfi_commands import Commands
-from sfa.rspecs.rspec_parser import parse_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. " + 
@@ -12,13 +12,17 @@ command = Commands(usage="%prog [options]",
 command.prep()
 
 if command.opts.infile:
-    rspec = parse_rspec(command.opts.infile)
-    nodes = rspec.get_nodes()
+    rspec = RSpec(command.opts.infile)
+    nodes = rspec.version.get_nodes()
     if command.opts.outfile:
         sys.stdout = open(command.opts.outfile, 'w')
     
     for node in nodes:
-        print node
+        hostname = None
+        if node.get('component_id'):
+            hostname = xrn_to_hostname(node['component_id'])
+        if hostname:
+            print hostname