# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
-# $Id$
-#
from types import StringTypes
import socket
table_name = 'interfaces'
primary_key = 'interface_id'
- join_tables = ['interface_setting']
+ join_tables = ['interface_tag', 'ip_addresses', 'routes']
fields = {
'interface_id': Parameter(int, "Node interface identifier"),
'method': Parameter(str, "Addressing method (e.g., 'static' or 'dhcp')"),
- 'type': Parameter(str, "Address type (e.g., 'ipv4')"),
- 'ip': Parameter(str, "IP address", nullok = True),
'mac': Parameter(str, "MAC address", nullok = True),
- 'gateway': Parameter(str, "IP address of primary gateway", nullok = True),
- 'network': Parameter(str, "Subnet address", nullok = True),
- 'broadcast': Parameter(str, "Network broadcast address", nullok = True),
- 'netmask': Parameter(str, "Subnet mask", nullok = True),
- 'dns1': Parameter(str, "IP address of primary DNS server", nullok = True),
- 'dns2': Parameter(str, "IP address of secondary DNS server", nullok = True),
'bwlimit': Parameter(int, "Bandwidth limit", min = 0, nullok = True),
'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"),
- 'interface_setting_ids' : Parameter([int], "List of interface settings"),
+ 'if_name': Parameter(str, "Interface name", nullok = True),
+ 'interface_tag_ids' : Parameter([int], "List of interface settings"),
+ 'ip_address_ids': Parameter([int], "List of addresses"),
+ 'last_updated': Parameter(int, "Date and time when node entry was created", ro = True),
}
+ view_tags_name = "view_interface_tags"
+ tags = {}
+
def validate_method(self, method):
network_methods = [row['method'] for row in NetworkMethods(self.api)]
if method not in network_methods:
raise PLCInvalidArgument, "Invalid addressing method %s"%method
- return method
-
- def validate_type(self, type):
- network_types = [row['type'] for row in NetworkTypes(self.api)]
- if type not in network_types:
- raise PLCInvalidArgument, "Invalid address type %s"%type
- return type
-
- def validate_ip(self, ip):
- if ip and not valid_ip(ip):
- raise PLCInvalidArgument, "Invalid IP address %s"%ip
- return ip
+ return method
def validate_mac(self, mac):
if not mac:
return mac
- validate_gateway = validate_ip
- validate_network = validate_ip
- validate_broadcast = validate_ip
- validate_netmask = validate_ip
- validate_dns1 = validate_ip
- validate_dns2 = validate_ip
-
def validate_bwlimit(self, bwlimit):
- if not bwlimit:
- return bwlimit
+ if not bwlimit:
+ return bwlimit
+
+ if bwlimit < 1:
+ raise PLCInvalidArgument, 'Minimum bw is 1 Mbps'
- if bwlimit < 500000:
- raise PLCInvalidArgument, 'Minimum bw is 500 kbs'
+ if bwlimit >= 1000000:
+ raise PLCInvalidArgument, 'Maximum bw must be less than 1000000'
- return bwlimit
+ return bwlimit
def validate_hostname(self, hostname):
# Optional
assert 'method' in self
method = self['method']
- if method == "proxy" or method == "tap":
- if 'mac' in self and self['mac']:
- raise PLCInvalidArgument, "For %s method, mac should not be specified" % method
- if 'ip' not in self or not self['ip']:
- raise PLCInvalidArgument, "For %s method, ip is required" % method
- if method == "tap" and ('gateway' not in self or not self['gateway']):
- raise PLCInvalidArgument, "For tap method, gateway is required and should be " \
- "the IP address of the node that proxies for this address"
- # Should check that the proxy address is reachable, but
- # there's no way to tell if the only primary interface is
- # DHCP!
-
- elif method == "static":
- if 'is_primary' in self and self['is_primary'] is True:
- for key in ['gateway', 'dns1']:
- if key not in self or not self[key]:
- raise PLCInvalidArgument, "For static method primary network, %s is required" % key
- globals()[key] = self[key]
- for key in ['ip', 'network', 'broadcast', 'netmask']:
- 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(ip, network, netmask):
- raise PLCInvalidArgument, "IP address %s is inconsistent with network %s/%s" % \
- (ip, network, netmask)
- if not in_same_network(broadcast, network, netmask):
- raise PLCInvalidArgument, "Broadcast address %s is inconsistent with network %s/%s" % \
- (broadcast, network, 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)
-
- elif method == "ipmi":
- if 'ip' not in self or not self['ip']:
- raise PLCInvalidArgument, "For ipmi method, ip is required"
+ validate_last_updated = Row.validate_timestamp
+
+ def update_timestamp(self, col_name, commit = True):
+ """
+ Update col_name field with current time
+ """
+
+ assert 'interface_id' in self
+ assert self.table_name
+
+ self.api.db.do("UPDATE %s SET %s = CURRENT_TIMESTAMP " % (self.table_name, col_name) + \
+ " where interface_id = %d" % (self['interface_id']) )
+ self.sync(commit)
+
+ def update_last_updated(self, commit = True):
+ self.update_timestamp('last_updated', commit)
+
+ def delete(self,commit=True):
+ ### need to cleanup ilinks
+ self.api.db.do("DELETE FROM ilink WHERE src_interface_id=%d OR dst_interface_id=%d" % \
+ (self['interface_id'],self['interface_id']))
+
+ Row.delete(self)
class Interfaces(Table):
"""
def __init__(self, api, interface_filter = None, columns = None):
Table.__init__(self, api, Interface, columns)
- sql = "SELECT %s FROM view_interfaces WHERE True" % \
- ", ".join(self.columns)
+ # the view that we're selecting upon: start with view_nodes
+ view = "view_interfaces"
+ # as many left joins as requested tags
+ for tagname in self.tag_columns:
+ view= "%s left join %s using (%s)"%(view,Interface.tagvalue_view_name(tagname),
+ Interface.primary_key)
+
+ sql = "SELECT %s FROM %s WHERE True" % \
+ (", ".join(self.columns.keys()+self.tag_columns.keys()),view)
if interface_filter is not None:
+ # TODO: Deleted the ability here to filter by ipaddress; Need to make
+ # sure that wasn't used anywhere.
if isinstance(interface_filter, (list, tuple, set)):
- interface_filter = Filter(Interface.fields, {'interface_id': interface_filter})
+ # Separate the list into integers and strings
+ ints = filter(lambda x: isinstance(x, (int, long)), interface_filter)
+ interface_filter = Filter(Interface.fields, {'interface_id': ints})
+ sql += " AND (%s) %s" % interface_filter.sql(api, "OR")
elif isinstance(interface_filter, dict):
- interface_filter = Filter(Interface.fields, interface_filter)
+ allowed_fields=dict(Interface.fields.items()+Interface.tags.items())
+ interface_filter = Filter(allowed_fields, interface_filter)
+ sql += " AND (%s) %s" % interface_filter.sql(api)
elif isinstance(interface_filter, int):
interface_filter = Filter(Interface.fields, {'interface_id': [interface_filter]})
+ sql += " AND (%s) %s" % interface_filter.sql(api)
else:
- raise PLCInvalidArgument, "Wrong node network filter %r"%interface_filter
- sql += " AND (%s) %s" % interface_filter.sql(api)
+ raise PLCInvalidArgument, "Wrong interface filter %r"%interface_filter
self.selectall(sql)
git://git.onelab.eu / plcapi.git / blobdiff