git://git.onelab.eu
/
nepi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding linux ns3 server unit test
[nepi.git]
/
src
/
nepi
/
execution
/
resource.py
diff --git
a/src/nepi/execution/resource.py
b/src/nepi/execution/resource.py
index
b4a0c88
..
f0fad39
100644
(file)
--- a/
src/nepi/execution/resource.py
+++ b/
src/nepi/execution/resource.py
@@
-193,7
+193,7
@@
class ResourceManager(Logger):
"the experiment. ",
type = Types.Bool,
default = True,
"the experiment. ",
type = Types.Bool,
default = True,
- flags = Flags.
ExecReadOnly
)
+ flags = Flags.
Design
)
cls._register_attribute(critical)
cls._register_attribute(critical)
@@
-678,6
+678,7
@@
class ResourceManager(Logger):
rclass = ResourceFactory.get_resource_type(rtype)
for guid in self.connections:
rm = self.ec.get_resource(guid)
rclass = ResourceFactory.get_resource_type(rtype)
for guid in self.connections:
rm = self.ec.get_resource(guid)
+
if not rtype or isinstance(rm, rclass):
connected.append(rm)
return connected
if not rtype or isinstance(rm, rclass):
connected.append(rm)
return connected
@@
-1033,7
+1034,7
@@
def find_types():
path = os.path.dirname(nepi.resources.__file__)
search_path.add(path)
path = os.path.dirname(nepi.resources.__file__)
search_path.add(path)
- types =
[]
+ types =
set()
for importer, modname, ispkg in pkgutil.walk_packages(search_path,
prefix = "nepi.resources."):
for importer, modname, ispkg in pkgutil.walk_packages(search_path,
prefix = "nepi.resources."):
@@
-1041,7
+1042,7
@@
def find_types():
loader = importer.find_module(modname)
try:
loader = importer.find_module(modname)
try:
- # Notice: Repeated calls to load_module will act as a reload of t
eh
module
+ # Notice: Repeated calls to load_module will act as a reload of t
he
module
if modname in sys.modules:
module = sys.modules.get(modname)
else:
if modname in sys.modules:
module = sys.modules.get(modname)
else:
@@
-1060,10
+1061,7
@@
def find_types():
continue
if issubclass(attr, ResourceManager):
continue
if issubclass(attr, ResourceManager):
- if attr.get_rtype().lower().find("abstract") > -1:
- continue
-
- types.append(attr)
+ types.add(attr)
if not modname in sys.modules:
sys.modules[modname] = module
if not modname in sys.modules:
sys.modules[modname] = module
@@
-1077,4
+1075,3
@@
def find_types():
return types
return types
-