X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=NG-RO%2Fosm_ng_ro%2Fns_thread.py;h=578d50fa933585325e5a7264e06d2290840d7714;hb=2f117ecf3a05159060fa51b394e7646a24aaaf42;hp=f15831aab94fd04e083bb8e3409d75c5d545d6c0;hpb=2ad85177bbd65b42317c378fdb7affbfd97b54cf;p=osm%2FRO.git

diff --git a/NG-RO/osm_ng_ro/ns_thread.py b/NG-RO/osm_ng_ro/ns_thread.py
index f15831aa..578d50fa 100644
--- a/NG-RO/osm_ng_ro/ns_thread.py
+++ b/NG-RO/osm_ng_ro/ns_thread.py
@@ -596,7 +596,7 @@ class VimInteractionImage(VimInteractionBase):
                     )
                 elif len(vim_images) > 1:
                     raise NsWorkerException(
-                        "More than one network found with this criteria: '{}'".format(
+                        "More than one image found with this criteria: '{}'".format(
                             task["find_params"]
                         )
                     )
@@ -921,7 +921,7 @@ class VimInteractionSdnNet(VimInteractionBase):
                     else None,
                     "service_endpoint_encapsulation_info": {
                         "vlan": port.get("vlan"),
-                        "mac": port.get("mac_address"),
+                        "mac": port.get("mac-address"),
                         "device_id": pmap.get("device_id") or port["compute_node"],
                         "device_interface_id": pmap.get("device_interface_id")
                         or port["pci"],
@@ -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(