# 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$
+# $URL$
#
from PLC.Faults import *
table_name = 'network_methods'
primary_key = 'method'
- join_tables = ['nodenetworks']
+ join_tables = ['interfaces']
fields = {
'method': Parameter(str, "Network method", max = 20),
}
def validate_method(self, name):
- # Make sure name is not blank
+ # 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):
"""
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)