From: Tony Mack <tmack@cs.princeton.edu>
Date: Fri, 6 Aug 2010 15:58:45 +0000 (+0000)
Subject: updated accepted arguemts for create_slice and get_rspec calls
X-Git-Tag: sfa-1.0-0~84
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=1f27d9878936281b7ccd5bffc0d1fe70e010ab6b

updated accepted arguemts for create_slice and get_rspec calls
---

diff --git a/sfa/managers/aggregate_manager_eucalyptus.py b/sfa/managers/aggregate_manager_eucalyptus.py
index 82ddb578..06a1f703 100644
--- a/sfa/managers/aggregate_manager_eucalyptus.py
+++ b/sfa/managers/aggregate_manager_eucalyptus.py
@@ -333,9 +333,17 @@ class ZoneResultParser(object):
 
         return clusterList
 
-def get_rspec(api, xrn, origin_hrn):
+def get_rspec(api, creds, options): 
     global cloud
-    hrn = urn_to_hrn(xrn)[0]
+    # get slice's hrn from options
+    xrn = options.get('geni_slice_urn', None)
+    hrn, type = urn_to_hrn(xrn)
+
+    # get hrn of the original caller
+    origin_hrn = options.get('origin_hrn', None)
+    if not origin_hrn:
+        origin_hrn = Credential(string=creds[0]).get_gid_caller().get_hrn()
+
     conn = getEucaConnection()
 
     if not conn:
@@ -414,7 +422,7 @@ def get_rspec(api, xrn, origin_hrn):
 """
 Hook called via 'sfi.py create'
 """
-def create_slice(api, xrn, xml):
+def create_slice(api, xrn, creds, xml, users):
     global cloud
     hrn = urn_to_hrn(xrn)[0]