projects
/
osm
/
RO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix osm-common and RO-plugin dependencies to use v9.0
[osm/RO.git]
/
NG-RO
/
osm_ng_ro
/
ns_thread.py
diff --git
a/NG-RO/osm_ng_ro/ns_thread.py
b/NG-RO/osm_ng_ro/ns_thread.py
index
f15831a
..
94af5a1
100644
(file)
--- a/
NG-RO/osm_ng_ro/ns_thread.py
+++ b/
NG-RO/osm_ng_ro/ns_thread.py
@@
-921,7
+921,7
@@
class VimInteractionSdnNet(VimInteractionBase):
else None,
"service_endpoint_encapsulation_info": {
"vlan": port.get("vlan"),
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"],
"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"]
)
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(
break
elif dependency_task["status"] == "FAILED":
error_text = "Cannot {} {} because depends on failed {} {} id={}): {}".format(