git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2df9eb8
)
now uses new RSpec libraries
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Thu, 28 Apr 2011 19:57:20 +0000
(15:57 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Thu, 28 Apr 2011 19:57:20 +0000
(15:57 -0400)
sfa/client/sfiAddSliver.py
patch
|
blob
|
history
diff --git
a/sfa/client/sfiAddSliver.py
b/sfa/client/sfiAddSliver.py
index
be1c51c
..
387f9df
100755
(executable)
--- a/
sfa/client/sfiAddSliver.py
+++ b/
sfa/client/sfiAddSliver.py
@@
-1,7
+1,8
@@
#! /usr/bin/env python
import sys
#! /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="Add slivers to the RSpec. " +
command = Commands(usage="%prog [options] node1 node2...",
description="Add slivers to the RSpec. " +
@@
-10,13
+11,20
@@
command = Commands(usage="%prog [options] node1 node2...",
command.add_nodefile_option()
command.prep()
command.add_nodefile_option()
command.prep()
-for node in command.nodes:
+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:
try:
-
command.rspec.add_sliver(node
)
+
rspec.add_slivers(nodes
)
except:
print >> sys.stderr, "FAILED: %s" % node
except:
print >> sys.stderr, "FAILED: %s" % node
-print command.rspec
+ print rspec.toxml()