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

[plcapi.git] / PLC / BootStates.py

diff --git a/PLC/BootStates.py b/PLC/BootStates.py
index 6757ca1..0485aa2 100644 (file)
--- a/PLC/BootStates.py
+++ b/PLC/BootStates.py
@@ -4,55 +4,54 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: BootStates.py,v 1.4 2006/10/10 21:54:20 mlhuang Exp $
-#
 
 from PLC.Faults import *
 from PLC.Parameter import Parameter
-from PLC.Table import Row, Table
+from PLC.Storage.AlchemyObject import AlchemyObj
 
-class BootState(Row):
+class BootState(AlchemyObj):
     """
     Representation of a row in the boot_states table. To use,
     instantiate with a dict of values.
     """
 
-    table_name = 'boot_states'
-    primary_key = 'boot_state'
-    join_tables = ['nodes']
+    tablename = 'boot_states'
     fields = {
-        'boot_state': Parameter(str, "Boot state", max = 20),
+        'boot_state': Parameter(str, "Boot state", max = 20, primary_key=True),
         }
 
     def validate_boot_state(self, name):
-       # Remove leading and trailing spaces
-       name = name.strip()
-
-       # Make sure name is not blank after we removed the spaces
-        if not name:
+        # Make sure name is not blank
+        if not len(name):
             raise PLCInvalidArgument, "Boot state must be specified"
-       
-       # Make sure boot state does not alredy exist
-       conflicts = BootStates(self.api, [name])
+
+        # Make sure boot state does not alredy exist
+        conflicts = BootStates(self.api, name)
         if conflicts:
             raise PLCInvalidArgument, "Boot state name already in use"
 
-       return name
+        return name
 
-class BootStates(Table):
+    def sync(self, commit=True, validate=True):
+        AlchemyObj.sync(self, commit, validate)
+        AlchemyObj.insert(self, dict(self))
+
+    def delete(self, commit=True):
+        assert 'boot_state' in self
+        AlchemyObj.delete(self, dict(self))                
+
+class BootStates(list):
     """
     Representation of the boot_states table in the database.
     """
 
-    def __init__(self, api, names = None):
-        sql = "SELECT %s FROM boot_states" % \
-              ", ".join(BootState.fields)
-        
-        if names:
-            # Separate the list into integers and strings
-            sql += " WHERE boot_state IN (%s)" % ", ".join(api.db.quote(names))
-
-        rows = api.db.selectall(sql)
+    def __init__(self, api, filter = None):
+        if not filter:
+            boot_states = BootState().select()
+        elif isinstance(filter, StringTypes) or isinstance(filter, (list, tuple, set)):
+            boot_states = BootState().select(filter={'boot_state': filter})
+        else:
+            raise PLCInvalidArgument, "Wrong boot state filter %r" % filter
 
-        for row in rows:
-            self[row['boot_state']] = BootState(api, row)
+        for boot_state in boot_states:
+            self.append(boot_state)