commit e5482e5614e47a1eda238902eaa83e16a0f5475d
author Owen Lin <owenlin@chromium.org> Fri Sep 26 08:39:31 2014 +0000
committer Gabe Black <gabeblack@chromium.org> Fri Sep 26 09:48:25 2014 +0000
tree e282bb3479508ec3d17e6550c1a6dd21e522c86a
parent 6fff663b6cf2d3b4c211e4df77a6ff5e1d937ef5

Revert "[autotest] Endpoints for syncing jobs and hqes back to master"

This reverts commit 1b22ff2921c65b45e3727a8aaa852325f0f0cfb4.

BUG=418022

Change-Id: I30473d21d16911f620ee7f06917c13e6017f20fb
Reviewed-on: https://chromium-review.googlesource.com/219918
Reviewed-by: Owen Lin <owenlin@chromium.org>
Commit-Queue: Owen Lin <owenlin@chromium.org>
Tested-by: Owen Lin <owenlin@chromium.org>

frontend/afe/models.py

diff --git a/frontend/afe/models.py b/frontend/afe/models.py
index 0b03110..5eea6d8 100644
--- a/frontend/afe/models.py
+++ b/frontend/afe/models.py
@@ -16,10 +16,10 @@
 from autotest_lib.frontend.afe import model_logic, model_attributes
 from autotest_lib.frontend.afe import rdb_model_extensions
 from autotest_lib.frontend import settings, thread_local
-from autotest_lib.client.common_lib import enum, error, host_protections
-from autotest_lib.client.common_lib import global_config
+from autotest_lib.client.common_lib import enum, host_protections, global_config
 from autotest_lib.client.common_lib import host_queue_entry_states
-from autotest_lib.client.common_lib import control_data, priorities, decorators
+from autotest_lib.client.common_lib import control_data, priorities
+from autotest_lib.client.common_lib import decorators
 
 # job options and user preferences
 DEFAULT_REBOOT_BEFORE = model_attributes.RebootBefore.IF_DIRTY
@@ -1100,14 +1100,6 @@
         self.shard = Shard.deserialize(data)
 
 
-    def sanity_check_update_from_shard(self, shard, updated_serialized):
-        if not self.shard_id == shard.id:
-            raise error.UnallowedRecordsSentToMaster(
-                'Job id=%s is assigned to shard (%s). Cannot update it with %s '
-                'from shard %s.' % (self.id, self.shard_id, updated_serialized,
-                                    shard.id))
-
-
     # TIMEOUT is deprecated.
     DEFAULT_TIMEOUT = global_config.global_config.get_config_value(
         'AUTOTEST_WEB', 'job_timeout_default', default=24)
@@ -1434,14 +1426,6 @@
         self.meta_host = Label.deserialize(data)
 
 
-    def sanity_check_update_from_shard(self, shard, updated_serialized,
-                                       job_ids_sent):
-        if self.job_id not in job_ids_sent:
-            raise error.UnallowedRecordsSentToMaster(
-                'Sent HostQueueEntry without corresponding '
-                'job entry: %s' % updated_serialized)
-
-
     Status = host_queue_entry_states.Status
     ACTIVE_STATUSES = host_queue_entry_states.ACTIVE_STATUSES
     COMPLETE_STATUSES = host_queue_entry_states.COMPLETE_STATUSES