remove simplejson dependency

[plcapi.git] / PLC / ConfFiles.py

diff --git a/PLC/ConfFiles.py b/PLC/ConfFiles.py
index 7eedcd0..32a1b54 100644 (file)
--- a/PLC/ConfFiles.py
+++ b/PLC/ConfFiles.py
@@ -4,11 +4,10 @@
 # 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: ConfFiles.py,v 1.4 2006/10/24 20:02:22 mlhuang Exp $
-#

 
 from PLC.Faults import *
 from PLC.Parameter import Parameter
 
 from PLC.Faults import *
 from PLC.Parameter import Parameter

+from PLC.Filter import Filter

 from PLC.Table import Row, Table
 from PLC.Nodes import Node, Nodes
 from PLC.NodeGroups import NodeGroup, NodeGroups
 from PLC.Table import Row, Table
 from PLC.Nodes import Node, Nodes
 from PLC.NodeGroups import NodeGroup, NodeGroups


@@ -30,13 +29,13 @@ class ConfFile(Row):
         'file_permissions': Parameter(str, "chmod(1) permissions", max = 20),
         'file_owner': Parameter(str, "chown(1) owner", max = 50),
         'file_group': Parameter(str, "chgrp(1) owner", max = 50),
         'file_permissions': Parameter(str, "chmod(1) permissions", max = 20),
         'file_owner': Parameter(str, "chown(1) owner", max = 50),
         'file_group': Parameter(str, "chgrp(1) owner", max = 50),

-        'preinstall_cmd': Parameter(str, "Shell command to execute prior to installing", max = 1024),
-        'postinstall_cmd': Parameter(str, "Shell command to execute after installing", max = 1024),
-        'error_cmd': Parameter(str, "Shell command to execute if any error occurs", max = 1024),
+        'preinstall_cmd': Parameter(str, "Shell command to execute prior to installing", max = 1024, nullok = True),
+        'postinstall_cmd': Parameter(str, "Shell command to execute after installing", max = 1024, nullok = True),
+        'error_cmd': Parameter(str, "Shell command to execute if any error occurs", max = 1024, nullok = True),

         'ignore_cmd_errors': Parameter(bool, "Install file anyway even if an error occurs"),
         'always_update': Parameter(bool, "Always attempt to install file even if unchanged"),
         'ignore_cmd_errors': Parameter(bool, "Install file anyway even if an error occurs"),
         'always_update': Parameter(bool, "Always attempt to install file even if unchanged"),

-        'node_ids': Parameter(int, "List of nodes linked to this file", ro = True),
-        'nodegroup_ids': Parameter(int, "List of node groups linked to this file", ro = True),
+        'node_ids': Parameter(int, "List of nodes linked to this file"),
+        'nodegroup_ids': Parameter(int, "List of node groups linked to this file"),

         }
 
     def add_node(self, node, commit = True):
         }
 
     def add_node(self, node, commit = True):


@@ -138,24 +137,17 @@ class ConfFiles(Table):
     Representation of the conf_files table in the database.
     """
 
     Representation of the conf_files table in the database.
     """
 

-    def __init__(self, api, conf_file_ids = None):
-        sql = "SELECT %s FROM view_conf_files" % \
-              ", ".join(ConfFile.fields)
-        
-        if conf_file_ids:
-            # Separate the list into integers and strings
-            sql += " WHERE conf_file_id IN (%s)" % ", ".join(map(str, api.db.quote(conf_file_ids)))
-
-        rows = api.db.selectall(sql)
+    def __init__(self, api, conf_file_filter = None, columns = None):
+        Table.__init__(self, api, ConfFile, columns)

 
 

-        for row in rows:
-            self[row['conf_file_id']] = ConfFile(api, row)
+        sql = "SELECT %s FROM view_conf_files WHERE True" % \
+              ", ".join(self.columns)

 
 

+        if conf_file_filter is not None:
+            if isinstance(conf_file_filter, (list, tuple, set, int, long)):
+                conf_file_filter = Filter(ConfFile.fields, {'conf_file_id': conf_file_filter})
+            elif isinstance(conf_file_filter, dict):
+                conf_file_filter = Filter(ConfFile.fields, conf_file_filter)
+            sql += " AND (%s) %s" % conf_file_filter.sql(api)

 
 

-        for row in rows:
-            self[row['conf_file_id']] = conf_file = ConfFile(api, row)
-            for aggregate in ['node_ids', 'nodegroup_ids']:
-                if not conf_file.has_key(aggregate) or conf_file[aggregate] is None:
-                    conf_file[aggregate] = []
-                else:
-                    conf_file[aggregate] = map(int, conf_file[aggregate].split(','))
+        self.selectall(sql)