Parameter(str, "Credential string"),
Parameter(str, "Human readable name of slice to instantiate"),
Parameter(str, "Resource specification"),
+ Mixed(Parameter(str, "Request hash"),
+ Parameter(None, "Request hash not specified"))
]
returns = Parameter(int, "1 if successful")
- def call(self, cred, hrn, requested_rspec, caller_cred=None):
- if caller_cred==None:
- caller_cred=cred
- #log the call
- self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, Credential(string=caller_cred).get_gid_caller().get_hrn(), hrn, self.name))
-
- # Filter the incoming rspec using sfatables
- incoming_rules = SFATablesRules('OUTGOING')
+ def call(self, cred, hrn, requested_rspec, request_hash=None, caller_cred=None):
+ if caller_cred==None:
+ caller_cred=cred
+
+ # This cred will be an slice cred, not a user, so we cant use it to
+ # authenticate the caller's request_hash. Let just get the caller's gid
+ # from the cred and authenticate using that
+ client_gid = Credential(string=cred).get_gid_caller()
+ client_gid_str = client_gid.save_to_string(save_parents=True)
+ self.api.auth.authenticateGid(client_gid_str, [cred, hrn, requested_rspec], request_hash)
+ self.api.auth.check(cred, 'createslice')
+
+ #log the call
+ self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, Credential(string=caller_cred).get_gid_caller().get_hrn(), hrn, self.name))
+
+ sfa_aggregate_type = Config().get_aggregate_rspec_type()
+ rspec_manager = __import__("sfa.rspecs.aggregates.rspec_manager_"+sfa_aggregate_type, fromlist = ["sfa.rspecs.aggregates"])
+ #Filter the incoming rspec using sfatables
+ incoming_rules = SFATablesRules('INCOMING')
- incoming_rules.set_user_(caller_cred.callerGID.hrn) # This is a temporary kludge. Eventually, we'd like to fetch the context requested by the match/target
+ #incoming_rules.set_slice(hrn) # This is a temporary kludge. Eventually, we'd like to fetch the context requested by the match/target
+ contexts = incoming_rules.contexts
+ request_context = rspec_manager.fetch_context(hrn, Credential(string=caller_cred).get_gid_caller().get_hrn(), contexts)
+ incoming_rules.set_context(request_context)
rspec = incoming_rules.apply(requested_rspec)
-
- sfa_aggregate_type = Config().get_aggregate_rspec_type()
- self.api.auth.check(cred, 'createslice')
if (sfa_aggregate_type == 'pl'):
slices = Slices(self.api, caller_cred=caller_cred)
slices.create_slice(hrn, rspec)
else:
# To clean up after July 21 - SB
- rspec_manager = __import__("sfa.rspecs.aggregates.rspec_manager_"+sfa_aggregate_type, fromlist = ["sfa.rspecs.aggregates"])
rspec = rspec_manager.create_slice(self.api, hrn, rspec)
-
return 1