# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
-# $Id: NodeNetworks.py,v 1.15 2006/11/09 19:43:55 mlhuang Exp $
+# $Id$
#
from types import StringTypes
table_name = 'nodenetworks'
primary_key = 'nodenetwork_id'
+ join_tables = ['nodenetwork_setting']
fields = {
'nodenetwork_id': Parameter(int, "Node interface identifier"),
'method': Parameter(str, "Addressing method (e.g., 'static' or 'dhcp')"),
'hostname': Parameter(str, "(Optional) Hostname", nullok = True),
'node_id': Parameter(int, "Node associated with this interface"),
'is_primary': Parameter(bool, "Is the primary interface for this node"),
+ 'nodenetwork_setting_ids' : Parameter([int], "List of nodenetwork settings"),
}
def validate_method(self, method):
validate_dns1 = validate_ip
validate_dns2 = validate_ip
+ def validate_bwlimit(self, bwlimit):
+ if not bwlimit:
+ return bwlimit
+
+ if bwlimit < 500000:
+ raise PLCInvalidArgument, 'Minimum bw is 500 kbs'
+
+ return bwlimit
+
def validate_hostname(self, hostname):
# Optional
if not hostname:
# DHCP!
elif method == "static":
- for key in ['ip', 'gateway', 'network', 'broadcast', 'netmask', 'dns1']:
+ if 'gateway' not in self or self['gateway'] is None:
+ if 'is_primary' in self and self['is_primary'] is True:
+ raise PLCInvalidArgument, "For static method primary network, gateway is required"
+ for key in ['ip', 'network', 'broadcast', 'netmask', 'dns1']:
if key not in self or not self[key]:
raise PLCInvalidArgument, "For static method, %s is required" % key
globals()[key] = self[key]
if not in_same_network(broadcast, network, netmask):
raise PLCInvalidArgument, "Broadcast address %s is inconsistent with network %s/%s" % \
(broadcast, network, netmask)
- if not in_same_network(ip, gateway, netmask):
+ if 'gateway' in globals() and not in_same_network(ip, gateway, netmask):
raise PLCInvalidArgument, "Gateway %s is not reachable from %s/%s" % \
(gateway, ip, netmask)
def __init__(self, api, nodenetwork_filter = None, columns = None):
Table.__init__(self, api, NodeNetwork, columns)
- sql = "SELECT %s FROM nodenetworks WHERE True" % \
+ sql = "SELECT %s FROM view_nodenetworks WHERE True" % \
", ".join(self.columns)
if nodenetwork_filter is not None:
nodenetwork_filter = Filter(NodeNetwork.fields, {'nodenetwork_id': nodenetwork_filter})
elif isinstance(nodenetwork_filter, dict):
nodenetwork_filter = Filter(NodeNetwork.fields, nodenetwork_filter)
- sql += " AND (%s)" % nodenetwork_filter.sql(api)
+ elif isinstance(nodenetwork_filter, int):
+ nodenetwork_filter = Filter(NodeNetwork.fields, {'nodenetwork_id': [nodenetwork_filter]})
+ else:
+ raise PLCInvalidArgument, "Wrong node network filter %r"%nodenetwork_filter
+ sql += " AND (%s) %s" % nodenetwork_filter.sql(api)
self.selectall(sql)