- remove extraneous admin check

diff --git a/PLC/Methods/AdmAddNodeToNodeGroup.py b/PLC/Methods/AdmAddNodeToNodeGroup.py
index 8148cc3..00a5298 100644 (file)
--- a/PLC/Methods/AdmAddNodeToNodeGroup.py
+++ b/PLC/Methods/AdmAddNodeToNodeGroup.py
@@ -39,13 +39,6 @@ class AdmAddNodeToNodeGroup(Method):
 
         nodegroup = nodegroups.values()[0]
        
-       # Authenticated function
-        assert self.caller is not None
-
-        # make sure we are 'admin'
-        if 'admin' not in self.caller['roles']:
-                raise PLCPermissionDenied, "Not allowed to add node groups"
-
        # add node to nodegroup
         if node['node_id'] not in nodegroup['node_ids']:
             nodegroup.add_node(node)

diff --git a/PLC/Methods/AdmRemoveNodeFromNodeGroup.py b/PLC/Methods/AdmRemoveNodeFromNodeGroup.py
index d081365..9f91ea0 100644 (file)
--- a/PLC/Methods/AdmRemoveNodeFromNodeGroup.py
+++ b/PLC/Methods/AdmRemoveNodeFromNodeGroup.py
@@ -29,6 +29,7 @@ class AdmRemoveNodeFromNodeGroup(Method):
        nodes = Nodes(self.api, [node_id_or_hostname])
        if not nodes:
                raise PLCInvalidArgument, "No such node"
+
        node = nodes.values()[0]
 
        # Get nodegroup info
@@ -38,14 +39,7 @@ class AdmRemoveNodeFromNodeGroup(Method):
 
         nodegroup = nodegroups.values()[0]
 
-       # Authenticated function
-        assert self.caller is not None
-
-        # make sure we are 'admin'
-        if 'admin' not in self.caller['roles']:
-                raise PLCPermissionDenied, "Not allowed to remove node from nodegroup"
-
-       # add node to nodegroup
+       # Remove node from nodegroup
         if node['node_id'] in nodegroup['node_ids']:
             nodegroup.remove_node(node)