- Renamed (changed Remove to Delete)

diff --git a/PLC/Methods/DeleteNodeFromNodeGroup.py b/PLC/Methods/DeleteNodeFromNodeGroup.py
new file mode 100644 (file)
index 0000000..aa80631
--- /dev/null
+++ b/PLC/Methods/DeleteNodeFromNodeGroup.py
@@ -0,0 +1,46 @@
+from PLC.Faults import *
+from PLC.Method import Method
+from PLC.Parameter import Parameter, Mixed
+from PLC.NodeGroups import NodeGroup, NodeGroups
+from PLC.Nodes import Node, Nodes
+from PLC.Auth import PasswordAuth
+
+class DeleteNodeFromNodeGroup(Method):
+    """
+    Removes a node from the specified node group. 
+
+    Returns 1 if successful, faults otherwise.
+    """
+
+    roles = ['admin']
+
+    accepts = [
+        PasswordAuth(),
+        Mixed(NodeGroup.fields['nodegroup_id'],
+             NodeGroup.fields['name']),
+       Mixed(Node.fields['node_id'],
+             Node.fields['hostname'])
+        ]
+
+    returns = Parameter(int, '1 if successful')
+
+    def call(self, auth, nodegroup_id_or_name, node_id_or_hostname):
+        # Get node info
+       nodes = Nodes(self.api, [node_id_or_hostname])
+       if not nodes:
+               raise PLCInvalidArgument, "No such node"
+
+       node = nodes.values()[0]
+
+       # Get nodegroup info
+        nodegroups = NodeGroups(self.api, [nodegroup_id_or_name])
+        if not nodegroups:
+            raise PLCInvalidArgument, "No such nodegroup"
+
+        nodegroup = nodegroups.values()[0]
+
+       # Remove node from nodegroup
+        if node['node_id'] in nodegroup['node_ids']:
+            nodegroup.remove_node(node)
+
+        return 1