diff options
author | David Sommerseth <davids@redhat.com> | 2012-11-30 17:13:52 +0100 |
---|---|---|
committer | David Sommerseth <davids@redhat.com> | 2012-11-30 17:13:52 +0100 |
commit | 744669173788e619e3f66ab9c717e8643a263cb7 (patch) | |
tree | 1f45f41541500ae31e398fa89f0ba54f0221e120 /rteval/modules | |
parent | 854ed12b8b89eab07540cf5858ea3479856ccbd7 (diff) | |
download | rteval-744669173788e619e3f66ab9c717e8643a263cb7.tar.gz rteval-744669173788e619e3f66ab9c717e8643a263cb7.tar.xz rteval-744669173788e619e3f66ab9c717e8643a263cb7.zip |
Split out the "object saving" from RtEvalModules::_Import()
This gives a more fine grained control of the instantiating of
module objects. This is needed as measurement modules will return
some measurement class information, and depending on that will be
stored in different object containers.
Signed-off-by: David Sommerseth <davids@redhat.com>
Diffstat (limited to 'rteval/modules')
-rw-r--r-- | rteval/modules/__init__.py | 6 | ||||
-rw-r--r-- | rteval/modules/loads/__init__.py | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/rteval/modules/__init__.py b/rteval/modules/__init__.py index 726619d..52122ab 100644 --- a/rteval/modules/__init__.py +++ b/rteval/modules/__init__.py @@ -46,7 +46,11 @@ class RtEvalModules(object): self._logger.log(Log.INFO, "importing module %s" % modname) mod = __import__("%s.%s" % (modroot, modname), fromlist=modroot) - self.__modules[modname] = mod.create(modcfg, self._logger) + return mod.create(modcfg, self._logger) + + + def _RegisterModuleObject(self, modname, modobj): + self.__modules[modname] = modobj def ModulesLoaded(self): diff --git a/rteval/modules/loads/__init__.py b/rteval/modules/loads/__init__.py index 3539624..675fcc0 100644 --- a/rteval/modules/loads/__init__.py +++ b/rteval/modules/loads/__init__.py @@ -151,7 +151,8 @@ class LoadModules(RtEvalModules): # for now (jcw) if m[1].lower() == 'module': self._cfg.AppendConfig(m[0], modparams) - self._Import(m[0], self._cfg.GetSection(m[0])) + modobj = self._Import(m[0], self._cfg.GetSection(m[0])) + self._RegisterModuleObject(m[0], modobj) def MakeReport(self): |