remove PLC.Debug.log, use PLC.Logger.logger instead

[plcapi.git] / PLC / NodeGroups.py

diff --git a/PLC/NodeGroups.py b/PLC/NodeGroups.py
index 90bd5f9..bbbb6b3 100644 (file)
--- a/PLC/NodeGroups.py
+++ b/PLC/NodeGroups.py
@@ -4,13 +4,11 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #

-# $Id: NodeGroups.py,v 1.18 2006/11/09 03:07:42 mlhuang Exp $
-#

 
 from types import StringTypes
 
 from PLC.Faults import *
 
 from types import StringTypes
 
 from PLC.Faults import *

-from PLC.Parameter import Parameter
+from PLC.Parameter import Parameter, Mixed

 from PLC.Filter import Filter
 from PLC.Debug import profile
 from PLC.Table import Row, Table
 from PLC.Filter import Filter
 from PLC.Debug import profile
 from PLC.Table import Row, Table


@@ -25,78 +23,58 @@ class NodeGroup(Row):
 
     table_name = 'nodegroups'
     primary_key = 'nodegroup_id'
 
     table_name = 'nodegroups'
     primary_key = 'nodegroup_id'

-    join_tables = ['nodegroup_node', 'conf_file_nodegroup']
+    join_tables = ['conf_file_nodegroup']
+    primary_field = 'nodegroup_id'

     fields = {
         'nodegroup_id': Parameter(int, "Node group identifier"),
     fields = {
         'nodegroup_id': Parameter(int, "Node group identifier"),

-        'name': Parameter(str, "Node group name", max = 50),
-        'description': Parameter(str, "Node group description", max = 200, nullok = True),
-        'node_ids': Parameter([int], "List of nodes in this node group"),
+        'groupname': Parameter(str, "Node group name", max = 50),
+        '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"),
         '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 = {

         }
 
     def validate_name(self, name):
         }
 
     def validate_name(self, name):

-       # Make sure name is not blank
+        # Make sure name is not blank

         if not len(name):
         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_id in conflicts:
-            if 'nodegroup_id' not in self or self['nodegroup_id'] != nodegroup_id:
-               raise PLCInvalidArgument, "Node group name already in use"
-
-       return name
-
-    def add_node(self, node, commit = True):
-        """
-        Add node to existing nodegroup.
-        """
+            raise PLCInvalidArgument, "Invalid node group name"

 
 

-        assert 'nodegroup_id' in self
-        assert isinstance(node, Node)
-        assert 'node_id' in node
-
-        node_id = node['node_id']
-        nodegroup_id = self['nodegroup_id']
-
-        if node_id not in self['node_ids']:
-            assert nodegroup_id not in node['nodegroup_ids']
+        # 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"

 
 

-            self.api.db.do("INSERT INTO nodegroup_node (nodegroup_id, node_id)" \
-                           " VALUES(%(nodegroup_id)d, %(node_id)d)",
-                           locals())
+        return name

 
 

-            if commit:
-                self.api.db.commit()
-
-            self['node_ids'].append(node_id)
-            node['nodegroup_ids'].append(nodegroup_id)
-
-    def remove_node(self, node, commit = True):
+    def associate_conf_files(self, auth, field, value):

         """
         """

-        Remove node from existing nodegroup.
+        Add conf_files found in value list (AddConfFileToNodeGroup)
+        Delets conf_files not found in value list (DeleteConfFileFromNodeGroup)

         """
 
         """
 

+        assert 'conf_file_ids' in self

         assert 'nodegroup_id' in self
         assert 'nodegroup_id' in self

-        assert isinstance(node, Node)
-        assert 'node_id' in node
-
-        node_id = node['node_id']
-        nodegroup_id = self['nodegroup_id']
+        assert isinstance(value, list)

 
 

-        if node_id in self['node_ids']:
-            assert nodegroup_id in node['nodegroup_ids']
+        conf_file_ids = self.separate_types(value)[0]

 
 

-            self.api.db.do("DELETE FROM nodegroup_node" \
-                           " WHERE nodegroup_id = %(nodegroup_id)d" \
-                           " AND node_id = %(node_id)d",
-                           locals())
+        if self['conf_file_ids'] != conf_file_ids:
+            from PLC.Methods.AddConfFileToNodeGroup import AddConfFileToNodeGroup
+            from PLC.Methods.DeleteConfFileFromNodeGroup import DeleteConfFileFromNodeGroup
+            new_conf_files = set(conf_file_ids).difference(self['conf_file_ids'])
+            stale_conf_files = set(self['conf_file_ids']).difference(conf_file_ids)

 
 

-            if commit:
-                self.api.db.commit()
+            for new_conf_file in new_conf_files:
+                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),
+                                                     auth, stale_conf_file, self['nodegroup_id'])

 
 

-            self['node_ids'].remove(node_id)
-            node['nodegroup_ids'].remove(nodegroup_id)

 
 class NodeGroups(Table):
     """
 
 class NodeGroups(Table):
     """


@@ -115,10 +93,18 @@ class NodeGroups(Table):
                 # 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)
                 # 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)

-                nodegroup_filter = Filter(NodeGroup.fields, {'nodegroup_id': ints, 'name': strs})
-                sql += " AND (%s)" % nodegroup_filter.sql(api, "OR")
+                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)
             elif isinstance(nodegroup_filter, dict):
                 nodegroup_filter = Filter(NodeGroup.fields, nodegroup_filter)

-                sql += " AND (%s)" % nodegroup_filter.sql(api, "AND")
+                sql += " AND (%s) %s" % nodegroup_filter.sql(api, "AND")
+            elif isinstance(nodegroup_filter, (int, long)):
+                nodegroup_filter = Filter(NodeGroup.fields, {'nodegroup_id': nodegroup_filter})
+                sql += " AND (%s) %s" % nodegroup_filter.sql(api, "AND")
+            elif isinstance(nodegroup_filter, StringTypes):
+                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)
 
         self.selectall(sql)