X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Ftrust%2Frights.py;h=0d329e5712adac72ae629e679c609952c3246bb0;hb=fd395e1944dcd49f10a4d5b27ce4983ad389fb96;hp=28e11b3531a34e7ad90141ee2424d3ac245a2c7c;hpb=115294b52c31fd1689d5433f78ac563027640a0e;p=sfa.git diff --git a/sfa/trust/rights.py b/sfa/trust/rights.py index 28e11b35..0d329e57 100644 --- a/sfa/trust/rights.py +++ b/sfa/trust/rights.py @@ -33,7 +33,6 @@ ## - ## # privilege_table is a list of priviliges and what operations are allowed # per privilege. @@ -46,16 +45,15 @@ privilege_table = {"authority": ["register", "remove", "update", "resolve", "lis "sa": ["getticket", "redeemslice", "redeemticket", "createslice", "createsliver", "deleteslice", "deletesliver", "updateslice", "getsliceresources", "getticket", "loanresources", "stopslice", "startslice", "renewsliver", "deleteslice", "deletesliver", "resetslice", "listslices", "listnodes", "getpolicy", "sliverstatus"], - "embed": ["getticket", "redeemslice", "redeemticket", "createslice", "createsliver", "renewsliver", "deleteslice", + "embed": ["getticket", "redeemslice", "redeemticket", "createslice", "createsliver", "renewsliver", "deleteslice", "deletesliver", "updateslice", "sliverstatus", "getsliceresources", "shutdown"], "bind": ["getticket", "loanresources", "redeemticket"], - "control": ["updateslice", "createslice", "createsliver", "renewsliver", "sliverstatus", "stopslice", "startslice", + "control": ["updateslice", "createslice", "createsliver", "renewsliver", "sliverstatus", "stopslice", "startslice", "deleteslice", "deletesliver", "resetslice", "getsliceresources", "getgids"], "info": ["listslices", "listnodes", "getpolicy"], "ma": ["setbootstate", "getbootstate", "reboot", "getgids", "gettrustedcerts"], - "operator": ["gettrustedcerts", "getgids"], - "*": ["createsliver", "deletesliver", "sliverstatus", "renewsliver", "shutdown"]} - + "operator": ["gettrustedcerts", "getgids"], + "*": ["createsliver", "deletesliver", "sliverstatus", "renewsliver", "shutdown"]} ## @@ -105,7 +103,6 @@ def determine_rights(type, name): # The Right class represents a single privilege. - class Right: ## # Create a new right. @@ -116,7 +113,7 @@ class Right: self.kind = kind self.delegate = delegate - def __repr__ (self): return ""%self.kind + def __repr__(self): return "" % self.kind ## # Test to see if this right object is allowed to perform an operation. @@ -161,6 +158,7 @@ class Right: ## # A Rights object represents a list of privileges. + class Rights: ## # Create a new rightlist object, containing no rights. @@ -172,7 +170,8 @@ class Rights: if string: self.load_from_string(string) - def __repr__ (self): return "[" + " ".join( ["%s"%r for r in self.rights]) + "]" + def __repr__(self): return "[" + \ + " ".join(["%s" % r for r in self.rights]) + "]" def is_empty(self): return self.rights == [] @@ -227,7 +226,7 @@ class Rights: # @param op_name is an operation to check, for example "listslices" def can_perform(self, op_name): - + for right in self.rights: if right.can_perform(op_name): return True @@ -252,7 +251,6 @@ class Rights: return False return True - ## # set the delegate bit to 'delegate' on # all privileges