- add VerifyPerson() back

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

diff --git a/PLC/Methods/AddConfFileToNodeGroup.py b/PLC/Methods/AddConfFileToNodeGroup.py
index af4d574..9212f70 100644 (file)
--- a/PLC/Methods/AddConfFileToNodeGroup.py
+++ b/PLC/Methods/AddConfFileToNodeGroup.py
@@ -3,7 +3,7 @@ from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.ConfFiles import ConfFile, ConfFiles
 from PLC.NodeGroups import NodeGroup, NodeGroups
 from PLC.Parameter import Parameter, Mixed
 from PLC.ConfFiles import ConfFile, ConfFiles
 from PLC.NodeGroups import NodeGroup, NodeGroups

-from PLC.Auth import PasswordAuth
+from PLC.Auth import Auth

 
 class AddConfFileToNodeGroup(Method):
     """
 
 class AddConfFileToNodeGroup(Method):
     """


@@ -17,7 +17,7 @@ class AddConfFileToNodeGroup(Method):
     roles = ['admin']
 
     accepts = [
     roles = ['admin']
 
     accepts = [

-        PasswordAuth(),
+        Auth(),

         ConfFile.fields['conf_file_id'],
         Mixed(NodeGroup.fields['nodegroup_id'],
               NodeGroup.fields['name'])
         ConfFile.fields['conf_file_id'],
         Mixed(NodeGroup.fields['nodegroup_id'],
               NodeGroup.fields['name'])


@@ -25,22 +25,19 @@ class AddConfFileToNodeGroup(Method):
 
     returns = Parameter(int, '1 if successful')
 
 
     returns = Parameter(int, '1 if successful')
 

-    event_type = 'AddTo'
-    object_type = 'ConfFile'
-    object_ids = []

 
     def call(self, auth, conf_file_id, nodegroup_id_or_name):
        # Get configuration file
         conf_files = ConfFiles(self.api, [conf_file_id])
         if not conf_files:
             raise PLCInvalidArgument, "No such configuration file"
 
     def call(self, auth, conf_file_id, nodegroup_id_or_name):
        # Get configuration file
         conf_files = ConfFiles(self.api, [conf_file_id])
         if not conf_files:
             raise PLCInvalidArgument, "No such configuration file"

-        conf_file = conf_files.values()[0]
+        conf_file = conf_files[0]

 
         # Get node
        nodegroups = NodeGroups(self.api, [nodegroup_id_or_name])
        if not nodegroups:
             raise PLCInvalidArgument, "No such node group"
 
         # Get node
        nodegroups = NodeGroups(self.api, [nodegroup_id_or_name])
        if not nodegroups:
             raise PLCInvalidArgument, "No such node group"

-       nodegroup = nodegroups.values()[0]
+       nodegroup = nodegroups[0]

        
        # Link configuration file to node
         if nodegroup['nodegroup_id'] not in conf_file['nodegroup_ids']:
        
        # Link configuration file to node
         if nodegroup['nodegroup_id'] not in conf_file['nodegroup_ids']: