X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FNodeNetworks.py;h=19229e6b2a0c77232b81df1f99b9dd8d3e346d47;hb=refs%2Fheads%2Fplanetlab-4_0-branch;hp=83cd6e1e3a355626d5e9d5dd00e260c3f53d7a60;hpb=0cde91a55d0148022ac83bc4219cdefc66a56510;p=plcapi.git

diff --git a/PLC/NodeNetworks.py b/PLC/NodeNetworks.py
index 83cd6e1e..19229e6b 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.12 2006/11/02 18:32:55 mlhuang Exp $
+# $Id: NodeNetworks.py 5574 2007-10-25 20:33:17Z thierry $
 #
 
 from types import StringTypes
@@ -48,6 +48,7 @@ class NodeNetwork(Row):
 
     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')"),
@@ -64,21 +65,24 @@ class NodeNetwork(Row):
         '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):
-        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):
@@ -96,7 +100,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
 
@@ -107,20 +111,29 @@ class NodeNetwork(Row):
     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:
             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
 
@@ -130,15 +143,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"
 
@@ -192,17 +206,21 @@ class NodeNetworks(Table):
     database.
     """
 
-    def __init__(self, api, nodenetwork_filter = None):
-        Table.__init__(self, api, NodeNetwork)
+    def __init__(self, api, nodenetwork_filter = None, columns = None):
+        Table.__init__(self, api, NodeNetwork, columns)
 
-        sql = "SELECT %s FROM nodenetworks WHERE True" % \
-              ", ".join(NodeNetwork.fields)
+        sql = "SELECT %s FROM view_nodenetworks WHERE True" % \
+              ", ".join(self.columns)
 
         if nodenetwork_filter is not None:
-            if isinstance(nodenetwork_filter, list):
+            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)
+            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)