database: add profile column to afe_host_queue_entries_table

Store the profile as a string in the database. Signed-off-by: Nishanth Aravamudan <[email protected]>
yumingfei · Jun 28, 2012 · 1ec1559 · 1ec1559
1 parent dbcd286
commit 1ec1559
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/frontend/afe/models.py b/frontend/afe/models.py
@@ -1124,6 +1124,7 @@ class HostQueueEntry(dbmodels.Model, model_logic.ModelExtensions):
 
     job = dbmodels.ForeignKey(Job)
     host = dbmodels.ForeignKey(Host, blank=True, null=True)
+    profile = dbmodels.CharField(max_length=255, blank=True, default='')
     status = dbmodels.CharField(max_length=255)
     meta_host = dbmodels.ForeignKey(Label, blank=True, null=True,
                                     db_column='meta_host')

diff --git a/frontend/migrations/069_add_profile_afe_host_queue_entries.py b/frontend/migrations/069_add_profile_afe_host_queue_entries.py
@@ -0,0 +1,7 @@
+UP_SQL = """
+ALTER TABLE afe_host_queue_entries ADD COLUMN profile VARCHAR(255) AFTER host_id;
+"""
+
+DOWN_SQL = """
+ALTER TABLE afe_host_queue_entries DROP COLUMN profile;
+"""
diff --git a/scheduler/scheduler_models.py b/scheduler/scheduler_models.py
@@ -428,7 +428,7 @@ def cmp_for_sort(cls, a, b):
 
 class HostQueueEntry(DBObject):
     _table_name = 'afe_host_queue_entries'
-    _fields = ('id', 'job_id', 'host_id', 'status', 'meta_host',
+    _fields = ('id', 'job_id', 'host_id', 'profile', 'status', 'meta_host',
                'active', 'complete', 'deleted', 'execution_subdir',
                'atomic_group_id', 'aborted', 'started_on')
 

diff --git a/scheduler/scheduler_models_unittest.py b/scheduler/scheduler_models_unittest.py
@@ -158,7 +158,7 @@ def tag(self):
         self.god.stub_with(scheduler_models, 'Job', MockJob)
         hqe = scheduler_models.HostQueueEntry(
                 new_record=True,
-                row=[0, 1, 2, 'Queued', None, 0, 0, 0, '.', None, False, None])
+                row=[0, 1, 2, 'rhel6', 'Queued', None, 0, 0, 0, '.', None, False, None])
         hqe.save()
         new_id = hqe.id
         # Force a re-query and verify that the correct data was stored.
@@ -167,6 +167,7 @@ def tag(self):
         self.assertEqual(hqe.id, new_id)
         self.assertEqual(hqe.job_id, 1)
         self.assertEqual(hqe.host_id, 2)
+        self.assertEqual(hqe.profile, 'rhel6')
         self.assertEqual(hqe.status, 'Queued')
         self.assertEqual(hqe.meta_host, None)
         self.assertEqual(hqe.active, False)