git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
16d2197
)
fix tabs
author
Tony Mack
<tmack@cs.princeton.edu>
Wed, 2 Dec 2009 02:35:15 +0000
(
02:35
+0000)
committer
Tony Mack
<tmack@cs.princeton.edu>
Wed, 2 Dec 2009 02:35:15 +0000
(
02:35
+0000)
sfa/methods/get_resources.py
patch
|
blob
|
history
diff --git
a/sfa/methods/get_resources.py
b/sfa/methods/get_resources.py
index
10cf5be
..
26872cd
100644
(file)
--- a/
sfa/methods/get_resources.py
+++ b/
sfa/methods/get_resources.py
@@
-67,11
+67,11
@@
class get_resources(Method):
rspec = rspec_manager.get_rspec(self.api, hrn)
# Filter the outgoing rspec using sfatables
rspec = rspec_manager.get_rspec(self.api, hrn)
# Filter the outgoing rspec using sfatables
- if self.api.interface=='slicemgr':
+
if self.api.interface=='slicemgr':
outgoing_rules = SFATablesRules('FORWARD-OUTGOING')
outgoing_rules = SFATablesRules('FORWARD-OUTGOING')
- else:
+
else:
outgoing_rules = SFATablesRules('OUTGOING')
outgoing_rules = SFATablesRules('OUTGOING')
- if outgoing_rules.sorted_rule_list:
+
if outgoing_rules.sorted_rule_list:
request_context = rspec_manager.fetch_context(
hrn,
Credential(string=caller_cred).get_gid_caller().get_hrn(),
request_context = rspec_manager.fetch_context(
hrn,
Credential(string=caller_cred).get_gid_caller().get_hrn(),
@@
-79,5
+79,5
@@
class get_resources(Method):
outgoing_rules.set_context(request_context)
filtered_rspec = outgoing_rules.apply(rspec)
return filtered_rspec
outgoing_rules.set_context(request_context)
filtered_rspec = outgoing_rules.apply(rspec)
return filtered_rspec
- else:
- return rspec
+
else:
+
return rspec