X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FNodes.py;h=f83c740a5380ea2c3dfd65bed539b90faf598a5c;hb=f1dff45a95e6323595b05cbd97899734cd2991d6;hp=bf460ca4b2c73cb1f28c95b8d5a96189cbddb54f;hpb=2696eec3582eb1b1092d0a98c863a040f6aa2af4;p=plcapi.git

diff --git a/PLC/Nodes.py b/PLC/Nodes.py
index bf460ca..f83c740 100644
--- a/PLC/Nodes.py
+++ b/PLC/Nodes.py
@@ -4,7 +4,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: Nodes.py,v 1.20 2006/11/09 19:43:55 mlhuang Exp $
+# $Id: Nodes.py,v 1.25 2006/11/28 10:25:03 thierry Exp $
 #
 
 from types import StringTypes
@@ -43,7 +43,6 @@ class Node(Row):
         'node_id': Parameter(int, "Node identifier"),
         'hostname': Parameter(str, "Fully qualified hostname", max = 255),
         'site_id': Parameter(int, "Site at which this node is located"),
-        'peer_id': Parameter(int, "Peer at which this node is managed", nullok = True),
         'boot_state': Parameter(str, "Boot state", max = 20),
         'model': Parameter(str, "Make and model of the actual machine", max = 255, nullok = True),
         'boot_nonce': Parameter(str, "(Admin only) Random value generated by the node at last boot", max = 128),
@@ -60,13 +59,16 @@ class Node(Row):
         'slice_ids': Parameter([int], "List of slices on this node"),
         'pcu_ids': Parameter([int], "List of PCUs that control this node"),
         'ports': Parameter([int], "List of PCU ports that this node is connected to"),
+        'peer_id': Parameter(int, "Peer at which this node is managed", nullok = True),
         }
 
-    # foreign attributes management
-    # the key to track remote objects
-    foreign_key = 'hostname'
-    # the fields that get verbatim copied from foreign objects
+    # for Cache
+    class_key = 'hostname'
     foreign_fields = ['boot_state','model','version','date_created','last_updated']
+    foreign_xrefs = [
+	# in this case, we dont need the 'table' but Cache will look it up, so...
+        {'field' : 'site_id' , 'class' : 'Site' , 'table' : 'unused-on-direct-refs' } ,
+	]
 
     def validate_hostname(self, hostname):
         if not valid_hostname(hostname):
@@ -109,7 +111,7 @@ class Nodes(Table):
     database.
     """
 
-    def __init__(self, api, node_filter = None, columns = None, scope = 'all'):
+    def __init__(self, api, node_filter = None, columns = None):
         Table.__init__(self, api, Node, columns)
 
         sql = "SELECT %s FROM view_nodes WHERE deleted IS False" % \
@@ -126,10 +128,5 @@ class Nodes(Table):
                 node_filter = Filter(Node.fields, node_filter)
                 sql += " AND (%s)" % node_filter.sql(api, "AND")
 
-        if scope == 'local':
-            sql += " AND (peer_id is NULL) "
-        elif scope == 'foreign':
-            sql += " AND (peer_id is NOT NULL) "
-
         self.selectall(sql)