in create_slice() and delete_slice() set the right gid_object_caller on the credentia...
authorTony Mack <tmack@cs.princeton.edu>
Thu, 31 Dec 2009 00:00:34 +0000 (00:00 +0000)
committerTony Mack <tmack@cs.princeton.edu>
Thu, 31 Dec 2009 00:00:34 +0000 (00:00 +0000)
sfa/managers/aggregate_manager_pl.py
sfa/managers/slice_manager_pl.py
sfa/plc/nodes.py

index f42453d..9e17a51 100644 (file)
@@ -123,9 +123,9 @@ def get_slices(api):
     return slices['hrn']
      
  
-def get_rspec(api, hrn=None, origin_hrn=None):
+def get_rspec(api, hrn=None, origin_gid_caller=None):
     from sfa.plc.nodes import Nodes
-    nodes = Nodes(api, origin_hrn=origin_hrn)
+    nodes = Nodes(api, origin_gid_caller=origin_gid_caller)
     if hrn:
         rspec = nodes.get_rspec(hrn)
     else:
index 698acf6..dda726a 100644 (file)
@@ -256,9 +256,9 @@ def get_slices(api):
     slices.refresh()
     return slices['hrn']
      
-def get_rspec(api, hrn=None, origin_hrn=None):
+def get_rspec(api, hrn=None, origin_gid_caller=None):
     from sfa.plc.nodes import Nodes
-    nodes = Nodes(api, origin_hrn=origin_hrn)
+    nodes = Nodes(api, origin_gid_caller=origin_gid_caller)
     if hrn:
         rspec = nodes.get_rspec(hrn)
     else:
index 9710040..cfa17b3 100644 (file)
@@ -20,7 +20,7 @@ from sfa.server.aggregate import Aggregates
 
 class Nodes(SimpleStorage):
 
-    def __init__(self, api, ttl = 1, origin_hrn=None):
+    def __init__(self, api, ttl = 1, origin_gid_caller=None):
         self.api = api
         self.ttl = ttl
         self.threshold = None
@@ -31,7 +31,9 @@ class Nodes(SimpleStorage):
         SimpleStorage.__init__(self, self.nodes_file)
         self.policy = Policy(api)
         self.load()
-        self.origin_hrn=origin_hrn
+        self.origin_hrn = None
+        if origin_gid_caller:
+            self.origin_hrn=origin_gid_caller.get_hrn()
 
 
     def refresh(self):