Merge remote-tracking branch 'origin/pycurl' into planetlab-4_0-branch

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

diff --git a/PLC/Methods/AdmAddNodeGroup.py b/PLC/Methods/AdmAddNodeGroup.py
index 328bb43..6bbb59e 100644 (file)
--- a/PLC/Methods/AdmAddNodeGroup.py
+++ b/PLC/Methods/AdmAddNodeGroup.py
@@ -2,29 +2,21 @@ from PLC.Faults import *
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.NodeGroups import NodeGroup, NodeGroups
-from PLC.Auth import PasswordAuth
+from PLC.Auth import Auth
+from PLC.Methods.AddNodeGroup import AddNodeGroup
 
-class AdmAddNodeGroup(Method):
+class AdmAddNodeGroup(AddNodeGroup):
     """
-    Adds a new node group. Any values specified in optional_vals are used,
-    otherwise defaults are used.
-
-    Returns the new nodegroup_id (> 0) if successful, faults otherwise.
+    Deprecated. See AddNodeGroup.
     """
 
-    roles = ['admin']
+    status = "deprecated"
 
     accepts = [
-        PasswordAuth(),
+        Auth(),
         NodeGroup.fields['name'],
         NodeGroup.fields['description']
         ]
 
-    returns = Parameter(int, 'New nodegroup_id (> 0) if successful')
-
     def call(self, auth, name, description):
-       # Create node group
-        nodegroup = NodeGroup(self.api, {'name': name, 'description': description})
-        nodegroup.sync()
-
-        return nodegroup['nodegroup_id']
+        return AddNodeGroup.call(self, auth, {'name': name, 'description': description})