from __future__ import with_statement
-from sfa.util.faults import *
-from sfa.util.namespace import *
-from sfa.util.rspec import RSpec
-from sfa.server.registry import Registries
+
+import sys
+import os
import boto
from boto.ec2.regioninfo import RegionInfo
from lxml import etree as ET
from sqlobject import *
-import sys
-import os
+from sfa.util.faults import *
+from sfa.util.xrn import urn_to_hrn
+from sfa.util.rspec import RSpec
+from sfa.server.registry import Registries
##
# The data structure used to represent a cloud.
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', '')
+ 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:
"""
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]