git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'nocomponent' into geni-v3
[sfa.git]
/
sfa
/
methods
/
Allocate.py
diff --git
a/sfa/methods/Allocate.py
b/sfa/methods/Allocate.py
index
cd3d889
..
fb5771a
100644
(file)
--- a/
sfa/methods/Allocate.py
+++ b/
sfa/methods/Allocate.py
@@
-45,7
+45,7
@@
class Allocate(Method):
See also http://svn.planet-lab.org/wiki/SFASliceTags
"""
See also http://svn.planet-lab.org/wiki/SFASliceTags
"""
- interfaces = ['aggregate'
, 'slicemgr'
]
+ interfaces = ['aggregate']
accepts = [
Parameter(str, "Slice URN"),
Parameter(type([dict]), "List of credentials"),
accepts = [
Parameter(str, "Slice URN"),
Parameter(type([dict]), "List of credentials"),
@@
-78,8
+78,6
@@
class Allocate(Method):
# flter rspec through sfatables
if self.api.interface in ['aggregate']:
chain_name = 'INCOMING'
# flter rspec through sfatables
if self.api.interface in ['aggregate']:
chain_name = 'INCOMING'
- elif self.api.interface in ['slicemgr']:
- chain_name = 'FORWARD-INCOMING'
logger.debug("Allocate: sfatables on chain %s" % chain_name)
actual_caller_hrn = the_credential.actual_caller_hrn()
logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s" %
logger.debug("Allocate: sfatables on chain %s" % chain_name)
actual_caller_hrn = the_credential.actual_caller_hrn()
logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s" %