fix typo

diff --git a/sfa/methods/create_slice.py b/sfa/methods/create_slice.py
index 299c783..527072e 100644 (file)
--- a/sfa/methods/create_slice.py
+++ b/sfa/methods/create_slice.py
@@ -75,7 +75,7 @@ class create_slice(Method):
             manager_module = manger_base + ".agregate_manager_%s" % mgr_type
             manager = __import__(manager_module, manager_base)
             manager.create_slice(self.api, hrn, rspec)
-        elif self.api.interface in ['slicemngr']:
+        elif self.api.interface in ['slicemgr']:
             mgr_type = self.api.config.SFA_SM_TYPE
             manager_module = manger_base + ".slice_manager_%s" % mgr_type
             manager = __import__(manager_module, manager_base)

diff --git a/sfa/methods/delete_slice.py b/sfa/methods/delete_slice.py
index 764a91f..4b1fb68 100644 (file)
--- a/sfa/methods/delete_slice.py
+++ b/sfa/methods/delete_slice.py
@@ -56,7 +56,7 @@ class delete_slice(Method):
             manager_module = manger_base + ".agregate_manager_%s" % mgr_type
             manager = __import__(manager_module, manager_base)
             manager.delete_slice(self.api, hrn)
-        elif self.api.interface in ['slicemngr']:        
+        elif self.api.interface in ['slicemgr']:        
             mgr_type = self.api.config.SFA_SM_TYPE
             manager_module = manger_base + ".slice_manager_%s" % mgr_type
             manager = __import__(manager_module, manager_base)

diff --git a/sfa/methods/get_slices.py b/sfa/methods/get_slices.py
index 03b9d0f..cd6b1cd 100644 (file)
--- a/sfa/methods/get_slices.py
+++ b/sfa/methods/get_slices.py
@@ -31,14 +31,11 @@ class get_slices(Method):
     def call(self, cred, request_hash=None):
         self.api.auth.authenticateCred(cred, [cred], request_hash) 
         self.api.auth.check(cred, 'listslices')
-        if caller_cred==None:
-            caller_cred=cred
        
         #log the call
-        self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, Credential(string=caller_cred).get_gid_caller().get_hrn(), None, self.name))
+        self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, Credential(string=cred).get_gid_caller().get_hrn(), None, self.name))
 
         slices = []
-        return [1]   
         # send the call to the right manager 
         manager_base = 'sfa.managers'
         if self.api.interface in ['component']:
@@ -51,7 +48,7 @@ class get_slices(Method):
             manager_module = manger_base + ".agregate_manager_%s" % mgr_type
             manager = __import__(manager_module, manager_base)
             slices = manager.get_slices(self.api)
-        elif self.api.interface in ['slicemngr']:
+        elif self.api.interface in ['slicemgr']:
             mgr_type = self.api.config.SFA_SM_TYPE
             manager_module = manger_base + ".slice_manager_%s" % mgr_type
             manager = __import__(manager_module, manager_base)

diff --git a/sfa/methods/reset_slice.py b/sfa/methods/reset_slice.py
index 4941f5b..6d0b6ab 100644 (file)
--- a/sfa/methods/reset_slice.py
+++ b/sfa/methods/reset_slice.py
@@ -48,7 +48,7 @@ class reset_slice(Method):
             manager_module = manger_base + ".agregate_manager_%s" % mgr_type
             manager = __import__(manager_module, manager_base)
             manager.reset_slice(self.api, hrn)
-        elif self.api.interface in ['slicemngr']:
+        elif self.api.interface in ['slicemgr']:
             mgr_type = self.api.config.SFA_SM_TYPE
             manager_module = manger_base + ".slice_manager_%s" % mgr_type
             manager = __import__(manager_module, manager_base)

diff --git a/sfa/methods/start_slice.py b/sfa/methods/start_slice.py
index 65affb0..f14de25 100644 (file)
--- a/sfa/methods/start_slice.py
+++ b/sfa/methods/start_slice.py
@@ -49,7 +49,7 @@ class start_slice(Method):
             manager_module = manger_base + ".agregate_manager_%s" % mgr_type
             manager = __import__(manager_module, manager_base)
             manager.start_slice(self.api, hrn)
-        elif self.api.interface in ['slicemngr']:
+        elif self.api.interface in ['slicemgr']:
             mgr_type = self.api.config.SFA_SM_TYPE
             manager_module = manger_base + ".slice_manager_%s" % mgr_type
             manager = __import__(manager_module, manager_base)

diff --git a/sfa/methods/stop_slice.py b/sfa/methods/stop_slice.py
index 1cf4d03..77d55fa 100644 (file)
--- a/sfa/methods/stop_slice.py
+++ b/sfa/methods/stop_slice.py
@@ -49,7 +49,7 @@ class stop_slice(Method):
             manager_module = manger_base + ".agregate_manager_%s" % mgr_type
             manager = __import__(manager_module, manager_base)
             manager.stop_slice(self.api, hrn)
-        elif self.api.interface in ['slicemngr']:
+        elif self.api.interface in ['slicemgr']:
             mgr_type = self.api.config.SFA_SM_TYPE
             manager_module = manger_base + ".slice_manager_%s" % mgr_type
             manager = __import__(manager_module, manager_base)

diff --git a/sfa/plc/slices.py b/sfa/plc/slices.py
index 6eb6e9c..08aa107 100644 (file)
--- a/sfa/plc/slices.py
+++ b/sfa/plc/slices.py
@@ -214,8 +214,8 @@ class Slices(SimpleStorage):
             success = False
             # request hash is optional so lets try the call without it 
             try:
-               request_hash=None
-                slices = aggregates[aggregate].get_slices(credential, request_hash, self.caller_cred)
+                request_hash=None
+                slices = aggregates[aggregate].get_slices(credential, request_hash)
                 slice_hrns.extend(slices)
                 success = True
             except:
@@ -227,7 +227,7 @@ class Slices(SimpleStorage):
                 arg_list = [credential]
                 request_hash = self.api.key.compute_hash(arg_list)
                 try:
-                    slices = aggregates[aggregate].get_slices(credential, request_hash, self.caller_cred)
+                    slices = aggregates[aggregate].get_slices(credential, request_hash)
                     slice_hrns.extend(slices)
                     success = True
                 except:

diff --git a/sfa/trust/rights.py b/sfa/trust/rights.py
index bf4d583..ea74a03 100644 (file)
--- a/sfa/trust/rights.py
+++ b/sfa/trust/rights.py
@@ -14,7 +14,7 @@
 # privilege_table is a list of priviliges and what operations are allowed
 # per privilege.
 
-privilege_table = {"authority": ["register", "remove", "update", "resolve", "list", "getcredential"],
+privilege_table = {"authority": ["register", "remove", "update", "resolve", "list", "getcredential", "*"],
                    "refresh": ["remove", "update"],
                    "resolve": ["resolve", "list", "getcredential"],
                    "sa": ["getticket", "redeemslice", "redeemticket", "createslice", "deleteslice", "updateslice", 
@@ -22,9 +22,9 @@ privilege_table = {"authority": ["register", "remove", "update", "resolve", "lis
                           "deleteslice", "resetslice", "listslices", "listnodes", "getpolicy"],
                    "embed": ["getticket", "redeemslice", "redeemticket", "createslice", "deleteslice", "updateslice", "getsliceresources"],
                    "bind": ["getticket", "loanresources", "redeemticket"],
-                   "control": ["updateslice", "createslice", "stopslice", "startslice", "deleteslice", "resetslice", "getsliceresources", "getgids", "getkey"],
+                   "control": ["updateslice", "createslice", "stopslice", "startslice", "deleteslice", "resetslice", "getsliceresources", "getgids"],
                    "info": ["listslices", "listnodes", "getpolicy"],
-                   "ma": ["setbootstate", "getbootstate", "reboot", "getgids", "getkey"],
+                   "ma": ["setbootstate", "getbootstate", "reboot", "getgids", "gettrustedcerts"],
                    "operator": ["gettrustedcerts", ""]}