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

[plcapi.git] / PLC / NetworkMethods.py

diff --git a/PLC/NetworkMethods.py b/PLC/NetworkMethods.py
index 0dbbe43..f1e21f7 100644 (file)
--- a/PLC/NetworkMethods.py
+++ b/PLC/NetworkMethods.py
@@ -1,58 +1,58 @@
 #
 # Functions for interacting with the network_methods table in the database
 #
-# Mark Huang <mlhuang@cs.princeton.edu>
-# Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: NetworkMethods.py,v 1.1 2006/10/10 20:23:49 mlhuang Exp $
-#
-
+from types import StringTypes
 from PLC.Faults import *
 from PLC.Parameter import Parameter
-from PLC.Table import Row, Table
+from PLC.Storage.AlchemyObject import AlchemyObj
 
-class NetworkMethod(Row):
+class NetworkMethod(AlchemyObj):
     """
     Representation of a row in the network_methods table. To use,
     instantiate with a dict of values.
     """
 
-    table_name = 'network_methods'
-    primary_key = 'method'
-    join_tables = ['nodenetworks']
+    tablename = 'network_methods'
+    join_tables = ['interfaces']
     fields = {
-        'method': Parameter(str, "Network method", max = 20),
+        'method': Parameter(str, "Network method", max = 20, primary_key=True),
         }
 
     def validate_method(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, "Network method must be specified"
-       
-       # Make sure network method does not alredy exist
-       conflicts = NetworkMethods(self.api, [name])
+
+        # Make sure network method does not alredy exist
+        conflicts = NetworkMethods(self.api, name)
         if conflicts:
             raise PLCInvalidArgument, "Network method name already in use"
 
-       return name
+        return name
 
-class NetworkMethods(Table):
+    def sync(self, commit = True, validate=True):
+        AlchemyObj.sync(self, commit, validate)
+        AlchemyObj.insert(self, dict(self))
+
+    def delete(self, commit=True):
+        assert 'method' in self
+        AlchemyObj.delete(self, dict(self))
+        
+
+class NetworkMethods(list):
     """
     Representation of the network_methods table in the database.
     """
 
-    def __init__(self, api, names = None):
-        sql = "SELECT %s FROM network_methods" % \
-              ", ".join(NetworkMethod.fields)
-        
-        if names:
-            # Separate the list into integers and strings
-            sql += " WHERE method IN (%s)" % ", ".join(api.db.quote(names))
+    def __init__(self, api, methods = None):
 
-        rows = api.db.selectall(sql)
+        if not methods:
+            network_methods = NetworkMethod().select()
+        elif isinstance(methods, StringTypes):
+            network_methods = NetworkMethod().select(filter={'method': methods})
+        else:
+            raise PLCInvalidArgument, "Wrong network method filter %r"%methods
 
-        for row in rows:
-            self[row['method']] = NetworkMethod(api, row)
+        self.extend(network_methods)
+