From: lloretgalleg <illoret@indra.es>
Date: Fri, 19 Feb 2021 12:06:52 +0000 (+0000)
Subject: Fix bug 1446: NS ends in state BUILDING
X-Git-Tag: branch-sol006v331-start~12
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FRO.git;a=commitdiff_plain;h=884862293ce112b057813f5811ac4f6adbb5f8c2

Fix bug 1446: NS ends in state BUILDING

Change-Id: Ideb6f0ac72637aca78d1b8906581409e153c4c7d
Signed-off-by: lloretgalleg <illoret@indra.es>
---

diff --git a/NG-RO/osm_ng_ro/ns_thread.py b/NG-RO/osm_ng_ro/ns_thread.py
index 2efdbc00..94af5a17 100644
--- a/NG-RO/osm_ng_ro/ns_thread.py
+++ b/NG-RO/osm_ng_ro/ns_thread.py
@@ -1758,6 +1758,11 @@ class NsWorker(threading.Thread):
                                     next_check_at = min(
                                         next_check_at, dependency_ro_task["to_check_at"]
                                     )
+                                    # must allow dependent task to be processed first
+                                    # to do this set time after last_task_processed
+                                    next_check_at = max(
+                                        self.time_last_task_processed, next_check_at
+                                    )
                                     break
                                 elif dependency_task["status"] == "FAILED":
                                     error_text = "Cannot {} {} because depends on failed {} {} id={}): {}".format(