From 6a7e3820c3ccd2d5b890ed0655c1d2e0bd67c45e Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Wed, 26 Nov 2014 11:18:20 +0100 Subject: Add support for new keys. * Add support for file_server_url and file_server_resource. * Add support to boot models. Change-Id: I15a396fc8a15fa0c81c3cfcbb2f79706ed0cae6e --- app/models/__init__.py | 6 ++++-- app/models/boot.py | 4 ++++ app/models/tests/test_boot_model.py | 6 +++++- 3 files changed, 13 insertions(+), 3 deletions(-) (limited to 'app/models') diff --git a/app/models/__init__.py b/app/models/__init__.py index 6ff8094..e4ebfe2 100644 --- a/app/models/__init__.py +++ b/app/models/__init__.py @@ -21,6 +21,8 @@ ACCEPTED_KEYS = 'accepted' ADDRESS_KEY = "address" AGGREGATE_KEY = 'aggregate' ARCHITECTURE_KEY = 'arch' +ARM64_ARCHITECTURE_KEY = 'arm64' +ARM_ARCHITECTURE_KEY = 'arm' BOARD_KEY = 'board' BOOT_ID_KEY = 'boot_id' BOOT_LOAD_ADDR_KEY = 'loadaddr' @@ -61,6 +63,8 @@ EXPIRES_KEY = 'expires_on' FASTBOOT_CMD_KEY = 'fastboot_cmd' FASTBOOT_KEY = 'fastboot' FIELD_KEY = 'field' +FILE_SERVER_RESOURCE_KEY = 'file_server_resource' +FILE_SERVER_URL_KEY = 'file_server_url' GIT_BRANCH_KEY = 'git_branch' GIT_COMMIT_KEY = 'git_commit' GIT_DESCRIBE_KEY = 'git_describe' @@ -101,8 +105,6 @@ UPDATED_KEY = 'updated_on' USERNAME_KEY = 'username' VERSION_KEY = 'version' WARNINGS_KEY = 'warnings' -ARM_ARCHITECTURE_KEY = 'arm' -ARM64_ARCHITECTURE_KEY = 'arm64' x86_ARCHITECTURE_KEY = 'x86' # Token special fields. diff --git a/app/models/boot.py b/app/models/boot.py index abf8c88..a9d425d 100644 --- a/app/models/boot.py +++ b/app/models/boot.py @@ -74,6 +74,8 @@ class BootDocument(modb.BaseDocument): self.endianness = None self.fastboot = False self.fastboot_cmd = None + self.file_server_resource = None + self.file_server_url = None self.git_branch = None self.git_commit = None self.git_describe = None @@ -197,6 +199,8 @@ class BootDocument(modb.BaseDocument): models.ENDIANNESS_KEY: self.endianness, models.FASTBOOT_CMD_KEY: self.fastboot_cmd, models.FASTBOOT_KEY: self.fastboot, + models.FILE_SERVER_RESOURCE_KEY: self.file_server_resource, + models.FILE_SERVER_URL_KEY: self.file_server_url, models.GIT_BRANCH_KEY: self.git_branch, models.GIT_COMMIT_KEY: self.git_commit, models.GIT_DESCRIBE_KEY: self.git_describe, diff --git a/app/models/tests/test_boot_model.py b/app/models/tests/test_boot_model.py index 66ec8b1..077e023 100644 --- a/app/models/tests/test_boot_model.py +++ b/app/models/tests/test_boot_model.py @@ -46,6 +46,8 @@ class TestBootModel(unittest.TestCase): boot_doc.git_url = "git-url" boot_doc.fastboot_cmd = "fastboot" boot_doc.defconfig_full = "defconfig" + boot_doc.file_server_url = "file-server" + boot_doc.file_server_resource = "file-resource" expected = { '_id': 'id', @@ -81,7 +83,9 @@ class TestBootModel(unittest.TestCase): "git_url": "git-url", "arch": "arm", "fastboot_cmd": "fastboot", - "defconfig_full": 'defconfig' + "defconfig_full": "defconfig", + "file_server_url": "file-server", + "file_server_resource": "file-resource" } self.assertDictEqual(expected, boot_doc.to_dict()) -- cgit v1.2.3