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
removed another bunch of references to geni
[sfa.git]
/
sfa
/
rspecs
/
aggregates
/
rspec_manager_vini.py
diff --git
a/sfa/rspecs/aggregates/rspec_manager_vini.py
b/sfa/rspecs/aggregates/rspec_manager_vini.py
index
4fb8882
..
20dc7fb
100644
(file)
--- a/
sfa/rspecs/aggregates/rspec_manager_vini.py
+++ b/
sfa/rspecs/aggregates/rspec_manager_vini.py
@@
-1,5
+1,5
@@
from sfa.util.faults import *
from sfa.util.faults import *
-from sfa.util.
misc
import *
+from sfa.util.
namespace
import *
from sfa.util.rspec import RSpec
from sfa.server.registry import Registries
from sfa.plc.nodes import *
from sfa.util.rspec import RSpec
from sfa.server.registry import Registries
from sfa.plc.nodes import *
@@
-13,7
+13,7
@@
SFA_VINI_WHITELIST = '/etc/sfa/vini.whitelist'
Copied from create_slice_aggregate() in sfa.plc.slices
"""
def create_slice_vini_aggregate(api, hrn, nodes):
Copied from create_slice_aggregate() in sfa.plc.slices
"""
def create_slice_vini_aggregate(api, hrn, nodes):
- # Get the slice record from
geni
+ # Get the slice record from
SFA
slice = {}
registries = Registries(api)
registry = registries[api.hrn]
slice = {}
registries = Registries(api)
registry = registries[api.hrn]
@@
-192,7
+192,8
@@
to refer to "contexts", which is the information that sfatables is requesting. B
return the basic information needed in a dict.
"""
def fetch_context(slice_hrn, user_hrn, contexts):
return the basic information needed in a dict.
"""
def fetch_context(slice_hrn, user_hrn, contexts):
- base_context = {'sfa':{'user':{'hrn':user_hrn}}}
+ base_context = {'sfa':{'user':{'hrn':user_hrn},
+ 'slice':{'hrn':slice_hrn}}}
return base_context
def main():
return base_context
def main():