#! /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
command = Commands(usage="%prog [options] node1 node2...",
description="Delete slivers from the RSpec. " +
command.add_nodefile_option()
command.prep()
-for node in command.nodes:
- try:
- command.rspec.remove_sliver(node)
- except:
- print >> sys.stderr, "FAILED: %s" % node
+if command.opts.infile:
+ rspec = parse_rspec(command.opts.infile)
+ nodes = []
+ if command.opts.nodefile:
+ f = open(command.opts.nodefile, "r")
+ nodes = f.read().split()
+ f.close()
+
+ try:
+ rspec.remove_slivers(nodes)
+ except:
+ print >> sys.stderr, "FAILED: %s"
-print command.rspec
+ print rspec.toxml()