projects
/
osm
/
RO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removing OpenNebula code
[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
94af5a1
..
5df74c5
100644
(file)
--- a/
NG-RO/osm_ng_ro/ns_thread.py
+++ b/
NG-RO/osm_ng_ro/ns_thread.py
@@
-32,7
+32,7
@@
import yaml
from copy import deepcopy
from http import HTTPStatus
from os import mkdir
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
from shutil import rmtree
from unittest.mock import Mock
@@
-596,7
+596,7
@@
class VimInteractionImage(VimInteractionBase):
)
elif len(vim_images) > 1:
raise NsWorkerException(
)
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"]
)
)
task["find_params"]
)
)
@@
-1229,8
+1229,8
@@
class NsWorker(threading.Thread):
return self.plugins[name]
try:
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))
except Exception as e:
raise NsWorkerException("Cannot load plugin osm_{}: {}".format(name, e))