From: Tony Mack <tmack@cs.princeton.edu>
Date: Thu, 5 Aug 2010 12:39:30 +0000 (+0000)
Subject: CreateSliver returns the allocated rspec
X-Git-Tag: sfa-1.0-0~88
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=26395fbfbd96cd12a5040268e2e652f3ab9a5e8d;p=sfa.git

CreateSliver returns the allocated rspec
---

diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py
index 85d8c131..96bf4bfd 100755
--- a/sfa/client/sfi.py
+++ b/sfa/client/sfi.py
@@ -767,7 +767,9 @@ class Sfi:
             server = self.get_server(opts.aggregate, opts.port, self.key_file, \
                                      self.cert_file, self.options.debug)
 
-        return server.create_slice(slice_cred, slice_hrn, rspec)
+        result =  server.create_slice(slice_cred, slice_hrn, rspec)
+        print result
+        return result
 
     # get a ticket for the specified slice
     def get_ticket(self, opts, args):
diff --git a/sfa/managers/slice_manager_pl.py b/sfa/managers/slice_manager_pl.py
index e305e4d6..88e2f5ae 100644
--- a/sfa/managers/slice_manager_pl.py
+++ b/sfa/managers/slice_manager_pl.py
@@ -69,8 +69,9 @@ def create_slice(api, xrn, creds, rspec, users):
             # Just send entire RSpec to each aggregate
             threads.run(server.CreateSliver, xrn, cred, rspec, users)
             
-    threads.get_results() 
-    return 1
+    results = threads.get_results() 
+    merged_rspec = merge_rspecs(results)
+    return merged_rspec
 
 def renew_slice(api, xrn, creds, expiration_time):
     # XX
diff --git a/sfa/methods/CreateSliver.py b/sfa/methods/CreateSliver.py
index bcca6b35..6752c8d6 100644
--- a/sfa/methods/CreateSliver.py
+++ b/sfa/methods/CreateSliver.py
@@ -49,8 +49,6 @@ class CreateSliver(Method):
             chain_name = 'FORWARD-OUTGOING'
         rspec = run_sfatables(chain_name, hrn, origin_hrn, rspec)
         allocated = manager.create_slice(self.api, slice_xrn, valid_creds, rspec, users)
-        if allocated:
-            return rspec
 
-        return ''
+        return rspec