from copy import deepcopy
from http import HTTPStatus
from os import mkdir
-from pkg_resources import iter_entry_points
+from importlib_metadata import entry_points
from shutil import rmtree
from unittest.mock import Mock
)
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"]
)
)
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"],
return self.plugins[name]
try:
- for v in iter_entry_points("osm_ro{}.plugins".format(type), name):
- self.plugins[name] = v.load()
+ for ep in entry_points(group="osm_ro{}.plugins".format(type), name=name):
+ self.plugins[name] = ep.load()
except Exception as e:
raise NsWorkerException("Cannot load plugin osm_{}: {}".format(name, e))
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(