# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
-# $Id: NetworkTypes.py,v 1.2 2006/10/06 18:19:41 mlhuang Exp $
+# $Id: NetworkTypes.py,v 1.3 2006/10/24 20:02:22 mlhuang Exp $
#
from PLC.Faults import *
table_name = 'network_types'
primary_key = 'type'
+ join_tables = ['nodenetworks']
fields = {
'type': Parameter(str, "Network type", max = 20),
}
- def __init__(self, api, fields = {}):
- Row.__init__(self, fields)
- self.api = api
-
def validate_type(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 type must be specified"
# Make sure network type does not alredy exist
return name
- def delete(self, commit = True):
- assert 'type' in self
-
- # Clean up miscellaneous join tables
- for table in ['nodenetworks', 'network_types']:
- self.api.db.do("DELETE FROM " + table + \
- " WHERE type = %(type)s",
- self)
-
- if commit:
- self.api.db.commit()
-
class NetworkTypes(Table):
"""
Representation of the network_types table in the database.
"""
- def __init__(self, api, names = None):
+ def __init__(self, api, types = None):
+ Table.__init__(self, api, NetworkType)
+
sql = "SELECT %s FROM network_types" % \
", ".join(NetworkType.fields)
- if names:
- # Separate the list into integers and strings
- sql += " WHERE type IN (%s)" % ", ".join(api.db.quote(names))
-
- rows = api.db.selectall(sql)
+ if types:
+ sql += " WHERE type IN (%s)" % ", ".join(map(api.db.quote, types))
- for row in rows:
- self[row['type']] = NetworkType(api, row)
+ self.selectall(sql)