Merge remote-tracking branch 'origin/pycurl' into planetlab-4_0-branch

[plcapi.git] / PLC / NetworkMethods.py

diff --git a/PLC/NetworkMethods.py b/PLC/NetworkMethods.py
index e141429..d6b6a63 100644 (file)
--- a/PLC/NetworkMethods.py
+++ b/PLC/NetworkMethods.py
@@ -4,7 +4,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: NetworkMethods.py,v 1.2 2006/10/06 18:19:41 mlhuang Exp $
+# $Id: NetworkMethods.py 5574 2007-10-25 20:33:17Z thierry $
 #
 
 from PLC.Faults import *
@@ -19,20 +19,14 @@ class NetworkMethod(Row):
 
     table_name = 'network_methods'
     primary_key = 'method'
+    join_tables = ['nodenetworks']
     fields = {
         'method': Parameter(str, "Network method", max = 20),
         }
 
-    def __init__(self, api, fields = {}):
-        Row.__init__(self, fields)
-        self.api = api
-
     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
@@ -42,32 +36,18 @@ class NetworkMethod(Row):
 
        return name
 
-    def delete(self, commit = True):
-        assert 'method' in self
-
-        # Clean up miscellaneous join tables
-        for table in ['nodenetworks', 'network_methods']:
-            self.api.db.do("DELETE FROM " + table + \
-                           " WHERE method = %(method)s",
-                           self)
-
-        if commit:
-            self.api.db.commit()
-        
 class NetworkMethods(Table):
     """
     Representation of the network_methods table in the database.
     """
 
-    def __init__(self, api, names = None):
+    def __init__(self, api, methods = None):
+        Table.__init__(self, api, NetworkMethod)
+
         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))
-
-        rows = api.db.selectall(sql)
+        if methods:
+            sql += " WHERE method IN (%s)" % ", ".join(map(api.db.quote, methods))
 
-        for row in rows:
-            self[row['method']] = NetworkMethod(api, row)
+        self.selectall(sql)