removed another bunch of references to geni

[sfa.git] / sfa / rspecs / aggregates / rspec_manager_openflow.py

diff --git a/sfa/rspecs/aggregates/rspec_manager_openflow.py b/sfa/rspecs/aggregates/rspec_manager_openflow.py
index 314f21a..a745b6e 100755 (executable)
--- a/sfa/rspecs/aggregates/rspec_manager_openflow.py
+++ b/sfa/rspecs/aggregates/rspec_manager_openflow.py
@@ -1,6 +1,6 @@
 from sfa.util.faults import *
-from sfa.util.misc import *
-from sfa.util.rspec import Rspec
+from sfa.util.namespace import *
+from sfa.util.rspec import RSpec
 from sfa.server.registry import Registries
 from sfa.util.config import Config
 from sfa.plc.nodes import *
@@ -14,7 +14,7 @@ import sys
 import socket
 import struct
 
-# Message IDs for all the GENI light calls
+# Message IDs for all the SFA light calls
 # This will be used by the aggrMgr controller
 SFA_GET_RESOURCES = 101
 SFA_CREATE_SLICE = 102
@@ -147,11 +147,17 @@ def get_rspec(cred, hrn=None):
         print "IO error"
     return None
 
+"""
+Returns the request context required by sfatables. At some point, this mechanism should be changed
+to refer to "contexts", which is the information that sfatables is requesting. But for now, we just
+return the basic information needed in a dict.
+"""
 def fetch_context(slice_hrn, user_hrn, contexts):
-    return None
+    base_context = {'sfa':{'user':{'hrn':user_hrn}}}
+    return base_context
 
 def main():
-    r = Rspec()
+    r = RSpec()
     r.parseFile(sys.argv[1])
     rspec = r.toDict()
     create_slice(None,'plc',rspec)