From 253a0cf17a7cc14072222df2feb77e0a88b3ad30 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Mon, 25 Apr 2011 15:51:09 -0400 Subject: [PATCH] now uses new RSpec libraries --- sfa/client/sfiListNodes.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/sfa/client/sfiListNodes.py b/sfa/client/sfiListNodes.py index df14fe38..0c629c8d 100755 --- 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.util.rspecHelper import RSpec, Commands +from sfa.client.sfi_commands import Commands +from sfa.rspecs.rspec_parser import parse_rspec command = Commands(usage="%prog [options]", description="List all nodes in the RSpec. " + @@ -9,9 +11,15 @@ 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 = parse_rspec(command.opts.infile) + nodes = rspec.get_nodes() + if command.opts.outfile: + sys.stdout = open(command.opts.outfile, 'w') + + for node in nodes: + print node + -- 2.43.0