protect GetSlivers against possible failure

[plcapi.git] / PLC / Methods / DeleteNodeGroup.py

diff --git a/PLC/Methods/DeleteNodeGroup.py b/PLC/Methods/DeleteNodeGroup.py
index cf6dd8a..680e718 100644 (file)
--- a/PLC/Methods/DeleteNodeGroup.py
+++ b/PLC/Methods/DeleteNodeGroup.py
@@ -1,7 +1,9 @@
+# $Id$
+# $URL$
 from PLC.Faults import *
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
-from PLC.Auth import PasswordAuth
+from PLC.Auth import Auth
 from PLC.NodeGroups import NodeGroup, NodeGroups
 
 class DeleteNodeGroup(Method):
@@ -16,21 +18,26 @@ class DeleteNodeGroup(Method):
     roles = ['admin']
 
     accepts = [
-        PasswordAuth(),
+        Auth(),
         Mixed(NodeGroup.fields['nodegroup_id'],
-             NodeGroup.fields['name'])
+              NodeGroup.fields['groupname'])
         ]
 
     returns = Parameter(int, '1 if successful')
 
+
     def call(self, auth, node_group_id_or_name):
         # Get account information
         nodegroups = NodeGroups(self.api, [node_group_id_or_name])
         if not nodegroups:
             raise PLCInvalidArgument, "No such node group"
 
-        nodegroup = nodegroups.values()[0]
+        nodegroup = nodegroups[0]
 
         nodegroup.delete()
 
+        # Logging variables
+        self.event_objects = {'NodeGroup': [nodegroup['nodegroup_id']]}
+        self.message  = 'Node group %d deleted' % nodegroup['nodegroup_id']
+
         return 1