Boot: Add initrd field.

Change-Id: I501ee18ecfc0d490b7ad65bd7c0a441de0fc56e5

6 files changed, 18 insertions, 2 deletions

diff --git a/app/handlers/common.py b/app/handlers/common.py
index 3f7e37e..17fe5cb 100644
--- a/app/handlers/common.py
+++ b/app/handlers/common.py
@@ -83,6 +83,7 @@ BOOT_VALID_KEYS = {
             models.GIT_URL_KEY,
             models.ID_KEY,
             models.INITRD_ADDR_KEY,
+            models.INITRD_KEY,
             models.JOB_KEY,
             models.KERNEL_IMAGE_KEY,
             models.KERNEL_KEY,
diff --git a/app/models/__init__.py b/app/models/__init__.py
index 9bfc3ec..adcc453 100644
--- a/app/models/__init__.py
+++ b/app/models/__init__.py
@@ -71,6 +71,7 @@ GIT_DESCRIBE_KEY = 'git_describe'
 GIT_URL_KEY = 'git_url'
 ID_KEY = '_id'
 INITRD_ADDR_KEY = 'initrd_addr'
+INITRD_KEY = 'initrd'
 IP_ADDRESS_KEY = 'ip_address'
 JOB_ID_KEY = 'job_id'
 JOB_KEY = 'job'
diff --git a/app/models/boot.py b/app/models/boot.py
index a9d425d..3f4981c 100644
--- a/app/models/boot.py
+++ b/app/models/boot.py
@@ -80,6 +80,7 @@ class BootDocument(modb.BaseDocument):
         self.git_commit = None
         self.git_describe = None
         self.git_url = None
+        self.initrd = None
         self.initrd_addr = None
         self.job_id = None
         self.kernel_image = None
@@ -206,6 +207,7 @@ class BootDocument(modb.BaseDocument):
             models.GIT_DESCRIBE_KEY: self.git_describe,
             models.GIT_URL_KEY: self.git_url,
             models.INITRD_ADDR_KEY: self.initrd_addr,
+            models.INITRD_KEY: self.initrd,
             models.JOB_ID_KEY: self.job_id,
             models.JOB_KEY: self.job,
             models.KERNEL_IMAGE_KEY: self.kernel_image,
@@ -218,7 +220,7 @@ class BootDocument(modb.BaseDocument):
             models.STATUS_KEY: self.status,
             models.TIME_KEY: self.time,
             models.VERSION_KEY: self.version,
-            models.WARNINGS_KEY: self.warnings,
+            models.WARNINGS_KEY: self.warnings
         }
 
         if self.id:
diff --git a/app/models/tests/test_boot_model.py b/app/models/tests/test_boot_model.py
index 077e023..8794ec0 100644
--- a/app/models/tests/test_boot_model.py
+++ b/app/models/tests/test_boot_model.py
@@ -48,6 +48,7 @@ class TestBootModel(unittest.TestCase):
         boot_doc.defconfig_full = "defconfig"
         boot_doc.file_server_url = "file-server"
         boot_doc.file_server_resource = "file-resource"
+        boot_doc.initrd = "initrd"
 
         expected = {
             '_id': 'id',
@@ -85,7 +86,8 @@ class TestBootModel(unittest.TestCase):
             "fastboot_cmd": "fastboot",
             "defconfig_full": "defconfig",
             "file_server_url": "file-server",
-            "file_server_resource": "file-resource"
+            "file_server_resource": "file-resource",
+            "initrd": "initrd"
         }
 
         self.assertDictEqual(expected, boot_doc.to_dict())
diff --git a/app/utils/scripts/convert-models.py b/app/utils/scripts/convert-models.py
index 3de1b25..27756e5 100644
--- a/app/utils/scripts/convert-models.py
+++ b/app/utils/scripts/convert-models.py
@@ -427,6 +427,8 @@ def convert_boot_collection(db, lab_name, limit=0):
                     arch + "-" + defconfig_full + "/"
                 )
 
+            boot_doc.initrd = meta_pop("initrd", None)
+
             boot_doc.file_server_url = meta_pop("file_server_url", None)
 
             boot_doc.metadata = metadata
diff --git a/doc/schema-boot.rst b/doc/schema-boot.rst
index 1100261..611f108 100644
--- a/doc/schema-boot.rst
+++ b/doc/schema-boot.rst
@@ -135,6 +135,10 @@ necessary to use its ``_id`` value.
                 "type": "string",
                 "description": "Initrd address used"
             },
+            "initrd": {
+                "type": "string",
+                "description": "Initrd path"
+            },
             "load_addr": {
                 "type": "string",
                 "description": "Load address used"
@@ -306,6 +310,10 @@ have when sent to the server.
                 "type": "string",
                 "description": "Initrd address used"
             },
+            "initrd": {
+                "type": "string",
+                "description": "Initrd path"
+            },
             "kernel_image": {
                 "type": "string",
                 "description": "The kernel image used to boot"