Merge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa into senslab2

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

diff --git a/sfa/client/sfiListNodes.py b/sfa/client/sfiListNodes.py
index df14fe3..3de1657 100755 (executable)
--- a/sfa/client/sfiListNodes.py
+++ b/sfa/client/sfiListNodes.py
@@ -1,7 +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 import RSpec
+from sfa.util.plxrn import xrn_to_hostname 
 
 command = Commands(usage="%prog [options]",
                    description="List all nodes in the RSpec. " + 
@@ -9,9 +11,19 @@ command = Commands(usage="%prog [options]",
                    "possible to create a slice.")
 command.prep()
 
-nodes = command.rspec.get_node_list()
-for node in nodes:
-    print node
+if command.opts.infile:
+    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:
+        hostname = None
+        if node.get('component_id'):
+            hostname = xrn_to_hostname(node['component_id'])
+        if hostname:
+            print hostname 
+