X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FNodeGroups.py;h=abef32c5e81ede87d5205e39d57e706abe790877;hb=6bef7b35eec76ff66332cb20f58eb7703c2116f9;hp=6ec7a4fc0972883bcbcb0d7951af7d86c20d67cf;hpb=7ba889dd89500f8c0695ef21bfda28291bb4f9da;p=plcapi.git

diff --git a/PLC/NodeGroups.py b/PLC/NodeGroups.py
index 6ec7a4f..abef32c 100644
--- a/PLC/NodeGroups.py
+++ b/PLC/NodeGroups.py
@@ -4,10 +4,6 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id$
-#
-
-from types import StringTypes
 
 from PLC.Faults import *
 from PLC.Parameter import Parameter, Mixed
@@ -30,26 +26,27 @@ class NodeGroup(Row):
     fields = {
         'nodegroup_id': Parameter(int, "Node group identifier"),
         'groupname': Parameter(str, "Node group name", max = 50),
-        'node_tag_type_id': Parameter (int, "Node tag type id"),
+        'tag_type_id': Parameter (int, "Node tag type id"),
         'value' : Parameter(str, "value that the nodegroup definition is based upon"),
+        'tagname' : Parameter(str, "Tag name that the nodegroup definition is based upon"),
+        'conf_file_ids': Parameter([int], "List of configuration files specific to this node group"),
+        'node_ids' : Parameter([int], "List of node_ids that belong to this nodegroup"),
         }
     related_fields = {
-        'name' : Parameter(str, "Tag name that the nodegroup definition is based upon"),
-        'conf_file_ids': Parameter([int], "List of configuration files specific to this node group"),
-	}
+        }
 
     def validate_name(self, name):
-	# Make sure name is not blank
+        # Make sure name is not blank
         if not len(name):
-                raise PLCInvalidArgument, "Invalid node group name"
-	
-	# Make sure node group does not alredy exist
-	conflicts = NodeGroups(self.api, [name])
-	for nodegroup in conflicts:
+            raise PLCInvalidArgument("Invalid node group name")
+
+        # Make sure node group does not alredy exist
+        conflicts = NodeGroups(self.api, [name])
+        for nodegroup in conflicts:
             if 'nodegroup_id' not in self or self['nodegroup_id'] != nodegroup['nodegroup_id']:
-               raise PLCInvalidArgument, "Node group name already in use"
+                raise PLCInvalidArgument("Node group name already in use")
 
-	return name
+        return name
 
     def associate_conf_files(self, auth, field, value):
         """
@@ -70,10 +67,10 @@ class NodeGroup(Row):
             stale_conf_files = set(self['conf_file_ids']).difference(conf_file_ids)
 
             for new_conf_file in new_conf_files:
-                AddConfFileToNodeGroup.__call__(AddConfFileToNodeGroup(self.api), 
+                AddConfFileToNodeGroup.__call__(AddConfFileToNodeGroup(self.api),
                                                 auth, new_conf_file, self['nodegroup_id'])
             for stale_conf_file in stale_conf_files:
-                DeleteConfFileFromNodeGroup.__call__(DeleteConfFileFromNodeGroup(self.api), 
+                DeleteConfFileFromNodeGroup.__call__(DeleteConfFileFromNodeGroup(self.api),
                                                      auth, stale_conf_file, self['nodegroup_id'])
 
 
@@ -92,12 +89,20 @@ class NodeGroups(Table):
         if nodegroup_filter is not None:
             if isinstance(nodegroup_filter, (list, tuple, set)):
                 # Separate the list into integers and strings
-                ints = filter(lambda x: isinstance(x, (int, long)), nodegroup_filter)
-                strs = filter(lambda x: isinstance(x, StringTypes), nodegroup_filter)
+                ints = [x for x in nodegroup_filter if isinstance(x, int)]
+                strs = [x for x in nodegroup_filter if isinstance(x, str)]
                 nodegroup_filter = Filter(NodeGroup.fields, {'nodegroup_id': ints, 'groupname': strs})
                 sql += " AND (%s) %s" % nodegroup_filter.sql(api, "OR")
             elif isinstance(nodegroup_filter, dict):
                 nodegroup_filter = Filter(NodeGroup.fields, nodegroup_filter)
                 sql += " AND (%s) %s" % nodegroup_filter.sql(api, "AND")
+            elif isinstance(nodegroup_filter, int):
+                nodegroup_filter = Filter(NodeGroup.fields, {'nodegroup_id': nodegroup_filter})
+                sql += " AND (%s) %s" % nodegroup_filter.sql(api, "AND")
+            elif isinstance(nodegroup_filter, str):
+                nodegroup_filter = Filter(NodeGroup.fields, {'groupname': nodegroup_filter})
+                sql += " AND (%s) %s" % nodegroup_filter.sql(api, "AND")
+            else:
+                raise PLCInvalidArgument("Wrong node group filter %r"%nodegroup_filter)
 
         self.selectall(sql)