bugfixes

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

diff --git a/sfa/client/sfiAddSliver.py b/sfa/client/sfiAddSliver.py
index a96c678..84ffa8b 100755 (executable)
--- a/sfa/client/sfiAddSliver.py
+++ b/sfa/client/sfiAddSliver.py
@@ -1,9 +1,13 @@
 #! /usr/bin/env python
 
 import sys
+
+from sfa.util.sfalogging import logger
 from sfa.client.sfi_commands import Commands
-from sfa.rspecs.rspec_parser import parse_rspec
+from sfa.rspecs.rspec import RSpec
+from sfa.rspecs.version_manager import VersionManager
 
+logger.enable_console()
 command = Commands(usage="%prog [options] node1 node2...",
                    description="Add slivers to the RSpec. " +
                    "This command reads in an RSpec and outputs a modified " +
@@ -24,17 +28,18 @@ if command.opts.outfile:
     outfile=file(command.opts.outfile,"w")
 else:
     outfile=sys.stdout
-
-rspec = parse_rspec(infile)
-rspec.type = 'request'
+ad_rspec = RSpec(infile)
 nodes = file(command.opts.nodefile).read().split()
+version_manager = VersionManager()
 try:
-    if rspec.version['type'].lower() == 'protogeni':
-        rspec.xml.set('type', 'request')
-    slivers = [{'hostname': node} for node in nodes]
-    rspec.add_slivers(slivers)
+    type = ad_rspec.version.type
+    version_num = ad_rspec.version.version
+    request_version = version_manager._get_version(type, version_num, 'request')    
+    request_rspec = RSpec(version=request_version)
+    request_rspec.version.merge(ad_rspec)
+    request_rspec.version.add_slivers(nodes)
 except:
-    print >> sys.stderr, "FAILED: %s" % nodes
+    logger.log_exc("sfiAddSliver failed with nodes %s" % nodes)
     sys.exit(1)
-print >>outfile, rspec.toxml(cleanup=True)
+print >>outfile, request_rspec.toxml()
 sys.exit(0)