X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FInterfaces.py;h=5b0f70e01244df5e196646164a698c15fcef5a96;hb=bc7bd41556e1fd137acf4df415e5dc0f6d5e02c4;hp=0e6c7287f9121be74a7ee01a7f2f41064b0828ac;hpb=21d187714285d9818fd94509b015ba069facb7ef;p=plcapi.git diff --git a/PLC/Interfaces.py b/PLC/Interfaces.py index 0e6c728..5b0f70e 100644 --- a/PLC/Interfaces.py +++ b/PLC/Interfaces.py @@ -5,7 +5,6 @@ # Copyright (C) 2006 The Trustees of Princeton University # -from types import StringTypes import socket import struct @@ -30,7 +29,7 @@ def valid_ipv6(ip): ip = socket.inet_ntop(socket.AF_INET6, socket.inet_pton(socket.AF_INET6, ip)) return True except socket.error: - return False + return False def valid_ip(ip): return valid_ipv4(ip) or valid_ipv6(ip) @@ -59,7 +58,7 @@ def in_same_network_ipv6(address1, address2, netmask): def in_same_network(address1, address2, netmask): return in_same_network_ipv4(address1, address2, netmask) or \ - in_same_network_ipv6(address1, address2, netmask) + in_same_network_ipv6(address1, address2, netmask) class Interface(Row): """ @@ -97,18 +96,18 @@ class Interface(Row): 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 + 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 + 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 + raise PLCInvalidArgument("Invalid IP address %s"%ip) return ip def validate_mac(self, mac): @@ -126,7 +125,7 @@ class Interface(Row): bytes[i] = "%02x" % byte mac = ":".join(bytes) except: - raise PLCInvalidArgument, "Invalid MAC address %s"%mac + raise PLCInvalidArgument("Invalid MAC address %s"%mac) return mac @@ -142,7 +141,7 @@ class Interface(Row): return bwlimit if bwlimit < 500000: - raise PLCInvalidArgument, 'Minimum bw is 500 kbs' + raise PLCInvalidArgument('Minimum bw is 500 kbs') return bwlimit @@ -152,14 +151,14 @@ class Interface(Row): return hostname if not PLC.Nodes.valid_hostname(hostname): - raise PLCInvalidArgument, "Invalid hostname %s"%hostname + raise PLCInvalidArgument("Invalid hostname %s"%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 %d"%node_id + raise PLCInvalidArgument("No such node %d"%node_id) return node_id @@ -171,7 +170,7 @@ class Interface(Row): if is_primary: nodes = PLC.Nodes.Nodes(self.api, [self['node_id']]) if not nodes: - raise PLCInvalidArgument, "No such node %d"%node_id + raise PLCInvalidArgument("No such node %d"%node_id) node = nodes[0] if node['interface_ids']: @@ -180,7 +179,7 @@ class Interface(Row): if ('interface_id' not in self or \ self['interface_id'] != interface['interface_id']) and \ interface['is_primary']: - raise PLCInvalidArgument, "Can only set one primary interface per node" + raise PLCInvalidArgument("Can only set one primary interface per node") return is_primary @@ -197,12 +196,12 @@ class Interface(Row): if method == "proxy" or method == "tap": if 'mac' in self and self['mac']: - raise PLCInvalidArgument, "For %s method, mac should not be specified" % method + 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 + 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" + 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! @@ -212,30 +211,30 @@ class Interface(Row): for key in ['gateway', 'dns1']: if key not in self or not self[key]: if 'is_primary' in self and self['is_primary'] is True: - raise PLCInvalidArgument, "For static method primary network, %s is required" % key + raise PLCInvalidArgument("For static method primary network, %s is required" % key) else: 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 + 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) + 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) + 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) + raise PLCInvalidArgument("Gateway %s is not reachable from %s/%s" % \ + (gateway, ip, netmask)) elif self['type'] == 'ipv6': for key in ['ip', 'gateway']: if key not in self or not self[key]: - raise PLCInvalidArgument, "For static ipv6 method, %s is required" % key + raise PLCInvalidArgument("For static ipv6 method, %s is required" % key) globals()[key] = self[key] elif method == "ipmi": if 'ip' not in self or not self['ip']: - raise PLCInvalidArgument, "For ipmi method, ip is required" + raise PLCInvalidArgument("For ipmi method, ip is required") validate_last_updated = Row.validate_timestamp @@ -258,7 +257,7 @@ class Interface(Row): ### 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): @@ -278,26 +277,26 @@ class Interfaces(Table): Interface.primary_key) sql = "SELECT %s FROM %s WHERE True" % \ - (", ".join(self.columns.keys()+self.tag_columns.keys()),view) + (", ".join(list(self.columns.keys())+list(self.tag_columns.keys())),view) if interface_filter is not None: if isinstance(interface_filter, (list, tuple, set)): # Separate the list into integers and strings - ints = filter(lambda x: isinstance(x, (int, long)), interface_filter) - strs = filter(lambda x: isinstance(x, StringTypes), interface_filter) + ints = [x for x in interface_filter if isinstance(x, int)] + strs = [x for x in interface_filter if isinstance(x, str)] interface_filter = Filter(Interface.fields, {'interface_id': ints, 'ip': strs}) sql += " AND (%s) %s" % interface_filter.sql(api, "OR") elif isinstance(interface_filter, dict): - allowed_fields=dict(Interface.fields.items()+Interface.tags.items()) + allowed_fields=dict(list(Interface.fields.items())+list(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) - elif isinstance (interface_filter, StringTypes): + elif isinstance (interface_filter, str): interface_filter = Filter(Interface.fields, {'ip':[interface_filter]}) sql += " AND (%s) %s" % interface_filter.sql(api, "AND") else: - raise PLCInvalidArgument, "Wrong interface filter %r"%interface_filter + raise PLCInvalidArgument("Wrong interface filter %r"%interface_filter) self.selectall(sql)