X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FNetworkMethods.py;h=7133fa406e271de12263c5813efcaa7e24724b67;hb=28fe8179bbf9cef0ab89edb25b0563e54c9becf0;hp=4311aec1f75387c9f18bb285224e440026086c51;hpb=ed7fa1ebf97ec2f88f18f8fa538e46c6ae9525c4;p=plcapi.git

diff --git a/PLC/NetworkMethods.py b/PLC/NetworkMethods.py
index 4311aec..7133fa4 100644
--- 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/20 17:46:02 mlhuang Exp $
+# $Id$
 #
 
 from PLC.Faults import *
@@ -19,7 +19,7 @@ class NetworkMethod(Row):
 
     table_name = 'network_methods'
     primary_key = 'method'
-    join_tables = ['nodenetworks']
+    join_tables = ['interfaces']
     fields = {
         'method': Parameter(str, "Network method", max = 20),
         }
@@ -41,15 +41,13 @@ 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)