Change in vdsm[master]: tool: configurators package should only contain configurators.
mtayer at redhat.com
mtayer at redhat.com
Sun Oct 12 14:22:55 UTC 2014
mooli tayer has uploaded a new change for review.
Change subject: tool: configurators package should only contain configurators.
......................................................................
tool: configurators package should only contain configurators.
in preperation for autoloading modules. Moving configfile.py out.
Change-Id: I862469b19265ce7034d65b06c9d7b60e4b65a70f
Signed-off-by: Mooli Tayer <mtayer at redhat.com>
---
M lib/vdsm/tool/Makefile.am
R lib/vdsm/tool/configfile.py
M lib/vdsm/tool/configurators/Makefile.am
M lib/vdsm/tool/configurators/libvirt.py
M tests/toolTests.py
M vdsm.spec.in
6 files changed, 10 insertions(+), 10 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/48/34048/1
diff --git a/lib/vdsm/tool/Makefile.am b/lib/vdsm/tool/Makefile.am
index a181617..6f7df78 100644
--- a/lib/vdsm/tool/Makefile.am
+++ b/lib/vdsm/tool/Makefile.am
@@ -42,6 +42,7 @@
dummybr.py \
dump_bonding_defaults.py \
nwfilter.py \
+ configfile.py \
configurator.py \
passwd.py \
restore_nets.py \
diff --git a/lib/vdsm/tool/configurators/configfile.py b/lib/vdsm/tool/configfile.py
similarity index 99%
rename from lib/vdsm/tool/configurators/configfile.py
rename to lib/vdsm/tool/configfile.py
index 62b99b1..a966599 100644
--- a/lib/vdsm/tool/configurators/configfile.py
+++ b/lib/vdsm/tool/configfile.py
@@ -25,7 +25,7 @@
import selinux
import io
-from ... import utils
+from .. import utils
if utils.isOvirtNode():
from ovirt.node.utils.fs import Config as NodeCfg
diff --git a/lib/vdsm/tool/configurators/Makefile.am b/lib/vdsm/tool/configurators/Makefile.am
index 02c6f82..67e7f6b 100644
--- a/lib/vdsm/tool/configurators/Makefile.am
+++ b/lib/vdsm/tool/configurators/Makefile.am
@@ -22,7 +22,6 @@
dist_configurators_PYTHON = \
__init__.py \
certificates.py \
- configfile.py \
libvirt.py \
sanlock.py \
$(NULL)
diff --git a/lib/vdsm/tool/configurators/libvirt.py b/lib/vdsm/tool/configurators/libvirt.py
index b9e096d..8e96980 100644
--- a/lib/vdsm/tool/configurators/libvirt.py
+++ b/lib/vdsm/tool/configurators/libvirt.py
@@ -26,20 +26,20 @@
from vdsm.config import config
-from .. import \
- service, \
- validate_ovirt_certs
from . import \
InvalidRun, \
NO, \
MAYBE
-from . configfile import \
- ConfigFile, \
- ParserWrapper
from . certificates import \
CA_FILE, \
CERT_FILE, \
KEY_FILE
+from .. configfile import \
+ ConfigFile, \
+ ParserWrapper
+from .. import \
+ service, \
+ validate_ovirt_certs
from ... import utils
from ... import constants
diff --git a/tests/toolTests.py b/tests/toolTests.py
index 87dc8fb..22fe735 100644
--- a/tests/toolTests.py
+++ b/tests/toolTests.py
@@ -24,7 +24,7 @@
YES,\
InvalidConfig,\
InvalidRun
-from vdsm.tool.configurators.configfile import ConfigFile, ParserWrapper
+from vdsm.tool.configfile import ConfigFile, ParserWrapper
from vdsm.tool.configurators import libvirt
from vdsm.tool import UsageError
from vdsm.tool import upgrade
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 8fc4593..115304f 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -1244,12 +1244,12 @@
%else
%{python_sitelib}/%{vdsm_name}/tool/load_needed_modules.py*
%endif
+%{python_sitelib}/%{vdsm_name}/tool/configfile.py*
%{python_sitelib}/%{vdsm_name}/tool/dummybr.py*
%{python_sitelib}/%{vdsm_name}/tool/dump_bonding_defaults.py*
%{python_sitelib}/%{vdsm_name}/tool/nwfilter.py*
%{python_sitelib}/%{vdsm_name}/tool/configurator.py*
%{python_sitelib}/%{vdsm_name}/tool/configurators/__init__*
-%{python_sitelib}/%{vdsm_name}/tool/configurators/configfile.py*
%{python_sitelib}/%{vdsm_name}/tool/configurators/certificates.py*
%{python_sitelib}/%{vdsm_name}/tool/configurators/libvirt.py*
%{python_sitelib}/%{vdsm_name}/tool/configurators/sanlock.py*
--
To view, visit http://gerrit.ovirt.org/34048
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I862469b19265ce7034d65b06c9d7b60e4b65a70f
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: mooli tayer <mtayer at redhat.com>
More information about the vdsm-patches
mailing list