added create_network(), delete_network(), create_subnet(), delete_subnet(), process_t...

[plcapi.git] / PLC / ConfFiles.py

diff --git a/PLC/ConfFiles.py b/PLC/ConfFiles.py
index a81edf3..4944cdc 100644 (file)
--- a/PLC/ConfFiles.py
+++ b/PLC/ConfFiles.py
@@ -4,39 +4,36 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: ConfFiles.py,v 1.1 2006/10/20 17:44:09 mlhuang Exp $
-#
 
 from PLC.Faults import *
 from PLC.Parameter import Parameter
-from PLC.Table import Row, Table
 from PLC.Nodes import Node, Nodes
 from PLC.NodeGroups import NodeGroup, NodeGroups
+from PLC.Storage.AlchemyObject import AlchemyObj
 
-class ConfFile(Row):
+class ConfFile(AlchemyObj):
     """
     Representation of a row in the conf_files table. To use,
     instantiate with a dict of values.
     """
 
-    table_name = 'conf_files'
-    primary_key = 'conf_file_id'
+    tablename = 'conf_files'
     join_tables = ['conf_file_node', 'conf_file_nodegroup']
     fields = {
-        'conf_file_id': Parameter(int, "Configuration file identifier"),
+        'conf_file_id': Parameter(int, "Configuration file identifier", primary_key=True),
         'enabled': Parameter(bool, "Configuration file is active"),
         'source': Parameter(str, "Relative path on the boot server where file can be downloaded", max = 255),
         'dest': Parameter(str, "Absolute path where file should be installed", max = 255),
         '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"),
-        '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", joined=True),
+        'nodegroup_ids': Parameter(int, "List of node groups linked to this file", joined=True),
         }
 
     def add_node(self, node, commit = True):
@@ -48,7 +45,7 @@ class ConfFile(Row):
         assert isinstance(node, Node)
         assert 'node_id' in node
 
-        conf_file_id = self['pcu_id']
+        conf_file_id = self['conf_file_id']
         node_id = node['node_id']
 
         if node_id not in self['node_ids']:
@@ -95,7 +92,7 @@ class ConfFile(Row):
         assert isinstance(nodegroup, NodeGroup)
         assert 'nodegroup_id' in nodegroup
 
-        conf_file_id = self['pcu_id']
+        conf_file_id = self['conf_file_id']
         nodegroup_id = nodegroup['nodegroup_id']
 
         if nodegroup_id not in self['nodegroup_ids']:
@@ -133,29 +130,29 @@ class ConfFile(Row):
             self['nodegroup_ids'].remove(nodegroup_id)
             nodegroup['conf_file_ids'].remove(conf_file_id)
 
-class ConfFiles(Table):
+    def sync(self, commit=True, validate=True):
+        AlchemyObj.sync(self, commit, validate)
+        if 'conf_file_id' not in self:
+            AlchemyObj.insert(self, dict(self))
+        else:
+            AlchemyObj.update(self, {'conf_file_id': self['conf_file_id']}, dict(self))
+
+    def delete(self, commit=True):
+        assert 'conf_file_id' in self
+        AlchemyObj.delete(self, dict(self))
+
+class ConfFiles(list):
     """
     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)
-
-        for row in rows:
-            self[row['conf_file_id']] = ConfFile(api, row)
-
+    def __init__(self, api, conf_file_filter = None, columns = None):
+        if not conf_file_filter:
+            conf_files = ConfFile().select()
+        elif isinstance(conf_file_filter, (list, tuple, set, int, long)):
+            conf_files = ConfFile().select(filter={'conf_file_id': conf_file_filter})
+        elif isinstance(conf_file_filter, dict):
+            conf_files = ConfFile().select(filter=conf_file_filter)
 
-        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(','))
+        for conf_file in conf_files:
+            self.append(conf_file)