From 2fd47957a803a5986d04bad2b018183807f3ae68 Mon Sep 17 00:00:00 2001 From: Mark Huang Date: Thu, 11 Jan 2007 05:31:33 +0000 Subject: [PATCH] - add peer_node to join_tables - add peer_node_id - use Row.validate_timestamp directly --- PLC/Nodes.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/PLC/Nodes.py b/PLC/Nodes.py index 78bbfdc..9468c07 100644 --- a/PLC/Nodes.py +++ b/PLC/Nodes.py @@ -4,7 +4,7 @@ # Mark Huang # Copyright (C) 2006 The Trustees of Princeton University # -# $Id: Nodes.py,v 1.28 2006/12/05 16:45:03 thierry Exp $ +# $Id: Nodes.py,v 1.29 2007/01/09 16:13:36 mlhuang Exp $ # from types import StringTypes @@ -38,7 +38,7 @@ class Node(Row): table_name = 'nodes' primary_key = 'node_id' - join_tables = ['nodegroup_node', 'conf_file_node', 'nodenetworks', 'pcu_node', 'slice_node', 'slice_attribute', 'node_session'] + join_tables = ['nodegroup_node', 'conf_file_node', 'nodenetworks', 'pcu_node', 'slice_node', 'slice_attribute', 'node_session', 'peer_node'] fields = { 'node_id': Parameter(int, "Node identifier"), 'hostname': Parameter(str, "Fully qualified hostname", max = 255), @@ -59,7 +59,8 @@ 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), + 'peer_id': Parameter(int, "Peer to which this node belongs", nullok = True), + 'peer_node_id': Parameter(int, "Foreign node identifier at peer", nullok = True), } # for Cache @@ -91,11 +92,8 @@ class Node(Row): return boot_state - # timestamps - def validate_date_created (self, timestamp): - return self.validate_timestamp (timestamp) - def validate_last_updated (self, timestamp): - return self.validate_timestamp (timestamp) + validate_date_created = Row.validate_timestamp + validate_last_updated = Row.validate_timestamp def delete(self, commit = True): """ @@ -138,4 +136,3 @@ class Nodes(Table): sql += " AND (%s)" % node_filter.sql(api, "AND") self.selectall(sql) - -- 2.43.0