X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FNodeNetworks.py;h=8733f8d352b42f7fa34f1a89ef0d4edfd3e1be9b;hb=c292f0b768fcaa05218cf5ffdda5672e6ea9ffe6;hp=47cda57bc0e4063e96dd4e69bc4f0b32d9d24916;hpb=bc48d5148c2d0b65f90e393184a213dc202ecc70;p=plcapi.git

diff --git a/PLC/NodeNetworks.py b/PLC/NodeNetworks.py
index 47cda57..8733f8d 100644
--- a/PLC/NodeNetworks.py
+++ b/PLC/NodeNetworks.py
@@ -4,7 +4,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: NodeNetworks.py,v 1.11 2006/10/25 14:29:13 mlhuang Exp $
+# $Id: NodeNetworks.py,v 1.15 2006/11/09 19:43:55 mlhuang Exp $
 #
 
 from types import StringTypes
@@ -13,6 +13,7 @@ import struct
 
 from PLC.Faults import *
 from PLC.Parameter import Parameter
+from PLC.Filter import Filter
 from PLC.Debug import profile
 from PLC.Table import Row, Table
 from PLC.NetworkTypes import NetworkType, NetworkTypes
@@ -66,18 +67,20 @@ class NodeNetwork(Row):
         }
 
     def validate_method(self, method):
-        if method not in NetworkMethods(self.api):
-            raise PLCInvalidArgument, "Invalid addressing 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):
-        if type not in NetworkTypes(self.api):
-            raise PLCInvalidArgument, "Invalid address 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 " + ip
+            raise PLCInvalidArgument, "Invalid IP address %s"%ip
         return ip
 
     def validate_mac(self, mac):
@@ -95,7 +98,7 @@ class NodeNetwork(Row):
                 bytes[i] = "%02x" % byte
             mac = ":".join(bytes)
         except:
-            raise PLCInvalidArgument, "Invalid MAC address"
+            raise PLCInvalidArgument, "Invalid MAC address %s"%mac
 
         return mac
 
@@ -112,14 +115,14 @@ class NodeNetwork(Row):
             return hostname
 
         if not PLC.Nodes.valid_hostname(hostname):
-            raise PLCInvalidArgument, "Invalid 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"
+            raise PLCInvalidArgument, "No such node %d"%node_id
 
         return node_id
 
@@ -129,15 +132,16 @@ class NodeNetwork(Row):
         """
 
         if is_primary:
-            nodes = PLC.Nodes.Nodes(self.api, [self['node_id']]).values()
+            nodes = PLC.Nodes.Nodes(self.api, [self['node_id']])
             if not nodes:
-                raise PLCInvalidArgument, "No such node"
+                raise PLCInvalidArgument, "No such node %d"%node_id
             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 \
+                for nodenetwork in conflicts:
+                    if ('nodenetwork_id' not in self or \
+                        self['nodenetwork_id'] != nodenetwork['nodenetwork_id']) and \
                        nodenetwork['is_primary']:
                         raise PLCInvalidArgument, "Can only set one primary interface per node"
 
@@ -191,26 +195,17 @@ class NodeNetworks(Table):
     database.
     """
 
-    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_ip_list:
-            # Separate the list into integers and strings
-            nodenetwork_ids = filter(lambda nodenetwork_id: isinstance(nodenetwork_id, (int, long)),
-                                     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 ips:
-                sql += " OR ip IN (%s)" % ", ".join(api.db.quote(ips)).lower()
-            sql += ")"
-
-        rows = self.api.db.selectall(sql)
-
-        for row in rows:
-            self[row['nodenetwork_id']] = NodeNetwork(api, row)
+    def __init__(self, api, nodenetwork_filter = None, columns = None):
+        Table.__init__(self, api, NodeNetwork, columns)
+
+        sql = "SELECT %s FROM nodenetworks WHERE True" % \
+              ", ".join(self.columns)
+
+        if nodenetwork_filter is not None:
+            if isinstance(nodenetwork_filter, (list, tuple, set)):
+                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)
+
+        self.selectall(sql)