[Et-mgmt-commits-list] [SCM] virt-factory branch, master now at v0.0.3-7-g3098385

[Michael DeHaan]

Hello,

This is an automated email from the git hooks/update script, it was
generated because a ref change was pushed to the repository.

Updating branch, master,
       via  3098385728b00376a1a7b0aca1d961f280c95feb (commit)
      from  0a73cb9799a24982c173e97b274b03b91f84e1e0 (commit)

- Log -----------------------------------------------------------------
commit 3098385728b00376a1a7b0aca1d961f280c95feb
Author: Michael DeHaan <mdehaan at mdehaan.rdu.redhat.com>
Date:   Tue Jul 3 13:09:21 2007 -0400

    Add another couple of columns needed for node status.
-----------------------------------------------------------------------

Diffstat:
 service/db/schema/upgrade/0002.py |   15 +++++++++++----
 service/server/db.py              |    6 ++++--
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/service/db/schema/upgrade/0002.py b/service/db/schema/upgrade/0002.py
index 4d50bf0..fe5a0b6 100644
--- a/service/db/schema/upgrade/0002.py
+++ b/service/db/schema/upgrade/0002.py
@@ -14,12 +14,19 @@ table = dict([(t.name, t) for t in tables])
 def get_columns():
 
     machines_table = sqlalchemy.Table('machines',meta) 
-    state_column = Column('state',String(255),nullable=True)
-
     deployments_table = sqlalchemy.Table('deployments',meta) 
+    
+    state_column = Column('state',String(255),nullable=True)
+    hb_column    = Column('last_heartbeat',Integer,nullable=True)
     auto_start_column = Column('auto_start',Integer,nullable=True)
-    return { state_column: machines_table,
-             auto_start_column: deployments_table }
+    hb_column2   = Column('last_heartbeat',Integer,nullable=True)
+
+    return { 
+        state_column:      machines_table,
+        auto_start_column: deployments_table,
+        hb_column:         machines_table,
+        hb_column2:        deployments_table
+    }
 
 columns = get_columns()
 
diff --git a/service/server/db.py b/service/server/db.py
index 56a5945..67521c1 100644
--- a/service/server/db.py
+++ b/service/server/db.py
@@ -97,7 +97,8 @@ tables.append(Table('machines',
     Column('puppet_node_diff', TEXT),
     Column('netboot_enabled', Integer),
     Column('is_locked', Integer),
-    Column('state', String(255))
+    Column('state', String(255)),
+    Column('last_heartbeat', Integer)
 ))
  
 tables.append(Table('deployments',
@@ -119,7 +120,8 @@ tables.append(Table('deployments',
     Column('puppet_node_diff', TEXT),
     Column('netboot_enabled', Integer),
     Column('is_locked', Integer),
-    Column('auto_start', Integer)
+    Column('auto_start', Integer),
+    Column('last_heartbeat', Integer)
 ))
 
 tables.append(Table('regtokens',

hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
  0a73cb9799a24982c173e97b274b03b91f84e1e0 \
  3098385728b00376a1a7b0aca1d961f280c95feb