# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
-# $Id: NodeNetworks.py,v 1.4 2006/09/25 14:55:43 mlhuang Exp $
+# $Id: NodeNetworks.py,v 1.10 2006/10/24 20:02:22 mlhuang Exp $
#
from types import StringTypes
from PLC.Parameter import Parameter
from PLC.Debug import profile
from PLC.Table import Row, Table
+from PLC.NetworkTypes import NetworkType, NetworkTypes
+from PLC.NetworkMethods import NetworkMethod, NetworkMethods
import PLC.Nodes
+def valid_ip(ip):
+ try:
+ ip = socket.inet_ntoa(socket.inet_aton(ip))
+ return True
+ except socket.error:
+ return False
+
def in_same_network(address1, address2, netmask):
"""
Returns True if two IPv4 addresses are in the same network. Faults
'netmask': Parameter(str, "Subnet mask"),
'dns1': Parameter(str, "IP address of primary DNS server"),
'dns2': Parameter(str, "IP address of secondary DNS server"),
- # XXX Should be an int (bps)
- 'bwlimit': Parameter(str, "Bandwidth limit"),
+ 'bwlimit': Parameter(int, "Bandwidth limit", min = 0),
'hostname': Parameter(str, "(Optional) Hostname"),
- 'node_id': Parameter(int, "Node associated with this interface (if any)"),
+ 'node_id': Parameter(int, "Node associated with this interface"),
'is_primary': Parameter(bool, "Is the primary interface for this node"),
}
- methods = ['static', 'dhcp', 'proxy', 'tap', 'ipmi', 'unknown']
-
- types = ['ipv4']
-
- bwlimits = ['-1',
- '100kbit', '250kbit', '500kbit',
- '1mbit', '2mbit', '5mbit',
- '10mbit', '20mbit', '50mbit',
- '100mbit']
-
- def __init__(self, api, fields = {}):
- Row.__init__(self, fields)
- self.api = api
-
def validate_method(self, method):
- if method not in self.methods:
+ if method not in NetworkMethods(self.api):
raise PLCInvalidArgument, "Invalid addressing method"
return method
def validate_type(self, type):
- if type not in self.types:
+ if type not in NetworkTypes(self.api):
raise PLCInvalidArgument, "Invalid address type"
return type
def validate_ip(self, ip):
- if ip:
- try:
- ip = socket.inet_ntoa(socket.inet_aton(ip))
- except socket.error:
- raise PLCInvalidArgument, "Invalid IP address " + ip
-
+ if ip and not valid_ip(ip):
+ raise PLCInvalidArgument, "Invalid IP address " + ip
return ip
def validate_mac(self, mac):
validate_dns1 = validate_ip
validate_dns2 = validate_ip
- def validate_bwlimit(self, bwlimit):
- if bwlimit not in self.bwlimits:
- raise PLCInvalidArgument, "Invalid bandwidth limit"
- return bwlimit
-
def validate_hostname(self, hostname):
# Optional
if not hostname:
return hostname
- # Validate hostname, and check for conflicts with a node hostname
- return PLC.Nodes.Node.validate_hostname(self, hostname)
+ if not PLC.Nodes.valid_hostname(hostname):
+ raise PLCInvalidArgument, "Invalid hostname"
+
+ return hostname
+
+ def validate_node_id(self, node_id):
+ nodes = PLC.Nodes.Nodes(self.api, [node_id])
+ if not nodes:
+ raise PLCInvalidArgument, "No such node"
+
+ return node_id
+
+ def validate_is_primary(self, is_primary):
+ """
+ Set this interface to be the primary one.
+ """
+
+ if is_primary:
+ nodes = PLC.Nodes.Nodes(self.api, [self['node_id']]).values()
+ if not nodes:
+ raise PLCInvalidArgument, "No such node"
+ node = nodes[0]
+
+ if node['nodenetwork_ids']:
+ conflicts = NodeNetworks(self.api, node['nodenetwork_ids'])
+ for nodenetwork_id, nodenetwork in conflicts.iteritems():
+ if ('nodenetwork_id' not in self or self['nodenetwork_id'] != nodenetwork_id) and \
+ nodenetwork['is_primary']:
+ raise PLCInvalidArgument, "Can only set one primary interface per node"
+
+ return is_primary
def validate(self):
"""
if 'ip' not in self or not self['ip']:
raise PLCInvalidArgument, "For ipmi method, ip is required"
- def delete(self, commit = True):
- """
- Delete existing nodenetwork.
- """
-
- assert 'nodenetwork_id' in self
-
- # Delete ourself
- self.api.db.do("DELETE FROM nodenetworks" \
- " WHERE nodenetwork_id = %d" % \
- self['nodenetwork_id'])
-
- if commit:
- self.api.db.commit()
-
class NodeNetworks(Table):
"""
Representation of row(s) from the nodenetworks table in the
database.
"""
- def __init__(self, api, nodenetwork_id_or_hostname_list = None):
+ def __init__(self, api, nodenetwork_id_or_ip_list = None):
self.api = api
sql = "SELECT %s FROM nodenetworks" % \
", ".join(NodeNetwork.fields)
- if nodenetwork_id_or_hostname_list:
+ if nodenetwork_id_or_ip_list:
# Separate the list into integers and strings
nodenetwork_ids = filter(lambda nodenetwork_id: isinstance(nodenetwork_id, (int, long)),
- nodenetwork_id_or_hostname_list)
- hostnames = filter(lambda hostname: isinstance(hostname, StringTypes),
- nodenetwork_id_or_hostname_list)
+ nodenetwork_id_or_ip_list)
+ ips = filter(lambda ip: isinstance(ip, StringTypes),
+ nodenetwork_id_or_ip_list)
sql += " WHERE (False"
if nodenetwork_ids:
sql += " OR nodenetwork_id IN (%s)" % ", ".join(map(str, nodenetwork_ids))
- if hostnames:
- sql += " OR hostname IN (%s)" % ", ".join(api.db.quote(hostnames)).lower()
+ if ips:
+ sql += " OR ip IN (%s)" % ", ".join(api.db.quote(ips)).lower()
sql += ")"
rows = self.api.db.selectall(sql)
git://git.onelab.eu / plcapi.git / blobdiff