Alon Bar-Lev has uploaded a new change for review.
Change subject: packaging: setup: reorg the per component directory
......................................................................
packaging: setup: reorg the per component directory
rename:
dwh/dwhconfig.py.in -> dwh/config.py.in
dwh/dwhconstants.py -> dwh/constants.py
Change-Id: Ifb0256b898650b6986608021c543fa6b5ac2fddc
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M .gitignore
M Makefile
R packaging/setup/ovirt_engine_setup/dwh/config.py.in
R packaging/setup/ovirt_engine_setup/dwh/constants.py
M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/core/misc.py
M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/core/service.py
M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/connection.py
M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/pgpass.py
M packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-dwh/core/service.py
M packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-dwh/db/clear.py
M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/check_etl.py
M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/config.py
M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/misc.py
M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/service.py
M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/connection.py
M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/schema.py
M
packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/distro-rpm/packages.py
M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/legacy/config.py
M
packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/provisioning/postgres.py
19 files changed, 36 insertions(+), 36 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-dwh refs/changes/06/28606/1
diff --git a/.gitignore b/.gitignore
index 36f423c..64fc7de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,5 +13,5 @@
packaging/services/ovirt-engine-dwhd/ovirt-engine-dwhd.systemd
packaging/services/ovirt-engine-dwhd/ovirt-engine-dwhd.sysv
packaging/services/ovirt-engine-dwhd/ovirt_engine_dwh_watchdog.cron
-packaging/setup/ovirt_engine_setup/dwhconfig.py
+packaging/setup/ovirt_engine_setup/dwh/config.py
packaging/sys-etc/logrotate.d/ovirt-engine-dwhd
diff --git a/Makefile b/Makefile
index a97d5c6..e7a9528 100644
--- a/Makefile
+++ b/Makefile
@@ -105,7 +105,7 @@
packaging/services/ovirt-engine-dwhd/ovirt-engine-dwhd.systemd \
packaging/services/ovirt-engine-dwhd/ovirt-engine-dwhd.sysv \
packaging/services/ovirt-engine-dwhd/ovirt_engine_dwh_watchdog.cron \
- packaging/setup/ovirt_engine_setup/dwh/dwhconfig.py \
+ packaging/setup/ovirt_engine_setup/dwh/config.py \
packaging/sys-etc/logrotate.d/ovirt-engine-dwhd \
$(NULL)
diff --git a/packaging/setup/ovirt_engine_setup/dwh/dwhconfig.py.in
b/packaging/setup/ovirt_engine_setup/dwh/config.py.in
similarity index 100%
rename from packaging/setup/ovirt_engine_setup/dwh/dwhconfig.py.in
rename to packaging/setup/ovirt_engine_setup/dwh/config.py.in
diff --git a/packaging/setup/ovirt_engine_setup/dwh/dwhconstants.py
b/packaging/setup/ovirt_engine_setup/dwh/constants.py
similarity index 90%
rename from packaging/setup/ovirt_engine_setup/dwh/dwhconstants.py
rename to packaging/setup/ovirt_engine_setup/dwh/constants.py
index c8afa6c..7ecf331 100644
--- a/packaging/setup/ovirt_engine_setup/dwh/dwhconstants.py
+++ b/packaging/setup/ovirt_engine_setup/dwh/constants.py
@@ -32,20 +32,20 @@
from ovirt_engine_setup.constants import osetupattrs
-from . import dwhconfig
+from . import config
@util.export
@util.codegen
class Const(object):
- PACKAGE_NAME = dwhconfig.PACKAGE_NAME
- PACKAGE_VERSION = dwhconfig.PACKAGE_VERSION
- DISPLAY_VERSION = dwhconfig.DISPLAY_VERSION
- RPM_VERSION = dwhconfig.RPM_VERSION
- RPM_RELEASE = dwhconfig.RPM_RELEASE
- VERSION_MAJOR = dwhconfig.VERSION_MAJOR
- VERSION_MINOR = dwhconfig.VERSION_MINOR
- VERSION_PATCH_LEVEL = dwhconfig.VERSION_PATCH_LEVEL
+ PACKAGE_NAME = config.PACKAGE_NAME
+ PACKAGE_VERSION = config.PACKAGE_VERSION
+ DISPLAY_VERSION = config.DISPLAY_VERSION
+ RPM_VERSION = config.RPM_VERSION
+ RPM_RELEASE = config.RPM_RELEASE
+ VERSION_MAJOR = config.VERSION_MAJOR
+ VERSION_MINOR = config.VERSION_MINOR
+ VERSION_PATCH_LEVEL = config.VERSION_PATCH_LEVEL
SERVICE_NAME = 'ovirt-engine-dwhd'
OVIRT_ENGINE_DWH_DB_BACKUP_PREFIX = 'dwh'
OVIRT_ENGINE_DWH_PACKAGE_NAME = 'ovirt-engine-dwh'
@@ -81,13 +81,13 @@
@util.export
@util.codegen
class FileLocations(object):
- PKG_SYSCONF_DIR = dwhconfig.PKG_SYSCONF_DIR
- PKG_STATE_DIR = dwhconfig.PKG_STATE_DIR
- PKG_DATA_DIR = dwhconfig.PKG_DATA_DIR
+ PKG_SYSCONF_DIR = config.PKG_SYSCONF_DIR
+ PKG_STATE_DIR = config.PKG_STATE_DIR
+ PKG_DATA_DIR = config.PKG_DATA_DIR
OVIRT_ENGINE_DWHD_SERVICE_CONFIG = \
- dwhconfig.OVIRT_ENGINE_DWHD_SERVICE_CONFIG
+ config.OVIRT_ENGINE_DWHD_SERVICE_CONFIG
OVIRT_ENGINE_DWHD_SERVICE_CONFIG_DEFAULTS = \
- dwhconfig.OVIRT_ENGINE_DWHD_SERVICE_CONFIG_DEFAULTS
+ config.OVIRT_ENGINE_DWHD_SERVICE_CONFIG_DEFAULTS
OVIRT_ENGINE_DWHD_SERVICE_CONFIGD = '%s.d' % \
OVIRT_ENGINE_DWHD_SERVICE_CONFIG
OVIRT_ENGINE_DWHD_SERVICE_CONFIG_DATABASE = os.path.join(
diff --git
a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/core/misc.py
b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/core/misc.py
index e003c92..103c2e0 100644
--- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/core/misc.py
+++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/core/misc.py
@@ -25,7 +25,7 @@
from ovirt_engine_setup import constants as osetupcons
-from ovirt_engine_setup.dwh import dwhconstants as odwhcons
+from ovirt_engine_setup.dwh import constants as odwhcons
@util.export
diff --git
a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/core/service.py
b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/core/service.py
index 79b4502..29b64d5 100644
---
a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/core/service.py
+++
b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/core/service.py
@@ -25,7 +25,7 @@
from ovirt_engine_setup import constants as osetupcons
-from ovirt_engine_setup.dwh import dwhconstants as odwhcons
+from ovirt_engine_setup.dwh import constants as odwhcons
@util.export
diff --git
a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/connection.py
b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/connection.py
index 33bd46c..48c04c4 100644
---
a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/connection.py
+++
b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/connection.py
@@ -32,7 +32,7 @@
from ovirt_engine_setup import constants as osetupcons
-from ovirt_engine_setup.dwh import dwhconstants as odwhcons
+from ovirt_engine_setup.dwh import constants as odwhcons
from ovirt_engine_setup.engine_common import database
diff --git
a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/pgpass.py
b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/pgpass.py
index 95d6519..7e29052 100644
--- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/pgpass.py
+++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/pgpass.py
@@ -27,7 +27,7 @@
from otopi import plugin
-from ovirt_engine_setup.dwh import dwhconstants as odwhcons
+from ovirt_engine_setup.dwh import constants as odwhcons
from ovirt_engine_setup.engine_common import database
diff --git
a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-dwh/core/service.py
b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-dwh/core/service.py
index 20d2061..e71786b 100644
---
a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-dwh/core/service.py
+++
b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-dwh/core/service.py
@@ -25,7 +25,7 @@
from ovirt_engine_setup import constants as osetupcons
-from ovirt_engine_setup.dwh import dwhconstants as odwhcons
+from ovirt_engine_setup.dwh import constants as odwhcons
@util.export
diff --git
a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-dwh/db/clear.py
b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-dwh/db/clear.py
index 654d75d..0e45072 100644
--- a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-dwh/db/clear.py
+++ b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-dwh/db/clear.py
@@ -28,7 +28,7 @@
from ovirt_engine_setup import constants as osetupcons
-from ovirt_engine_setup.dwh import dwhconstants as odwhcons
+from ovirt_engine_setup.dwh import constants as odwhcons
from ovirt_engine_setup.engine_common import database
from ovirt_engine_setup import dialog
diff --git
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/check_etl.py
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/check_etl.py
index 64488de..d650ce1 100644
---
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/check_etl.py
+++
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/check_etl.py
@@ -25,10 +25,10 @@
from otopi import plugin
-from ovirt_engine_setup.dwh import dwhconstants as odwhcons
+from ovirt_engine_setup.dwh import constants as odwhcons
from ovirt_engine_setup.engine_common import database
from ovirt_engine_setup.engine_common \
- import enginecommonconstants as oengcommcons
+ import constants as oengcommcons
@util.export
diff --git
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/config.py
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/config.py
index 990e520..cf580ec 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/config.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/config.py
@@ -33,9 +33,9 @@
from ovirt_engine_setup import constants as osetupcons
-from ovirt_engine_setup.dwh import dwhconstants as odwhcons
+from ovirt_engine_setup.dwh import constants as odwhcons
from ovirt_engine_setup.engine_common \
- import enginecommonconstants as oengcommcons
+ import constants as oengcommcons
@util.export
diff --git
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/misc.py
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/misc.py
index 12b0cf4..d0736f1 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/misc.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/misc.py
@@ -25,7 +25,7 @@
from ovirt_engine_setup import constants as osetupcons
-from ovirt_engine_setup.dwh import dwhconstants as odwhcons
+from ovirt_engine_setup.dwh import constants as odwhcons
from ovirt_engine_setup import dialog
diff --git
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/service.py
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/service.py
index 5f586ae..c226606 100644
---
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/service.py
+++
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/service.py
@@ -25,7 +25,7 @@
from ovirt_engine_setup import constants as osetupcons
-from ovirt_engine_setup.dwh import dwhconstants as odwhcons
+from ovirt_engine_setup.dwh import constants as odwhcons
@util.export
diff --git
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/connection.py
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/connection.py
index 8a1f2e9..08f364d 100644
---
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/connection.py
+++
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/connection.py
@@ -30,12 +30,12 @@
from otopi import plugin
-from ovirt_engine_setup.dwh import dwhconstants as odwhcons
+from ovirt_engine_setup.dwh import constants as odwhcons
from ovirt_engine_setup.engine_common import database
from ovirt_engine_setup import dialog
from ovirt_engine_setup import util as osetuputil
from ovirt_engine_setup.engine_common \
- import enginecommonconstants as oengcommcons
+ import constants as oengcommcons
@util.export
diff --git
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/schema.py
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/schema.py
index 2682a89..ea8ab94 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/schema.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/schema.py
@@ -31,11 +31,11 @@
from ovirt_engine_setup import constants as osetupcons
-from ovirt_engine_setup.dwh import dwhconstants as odwhcons
+from ovirt_engine_setup.dwh import constants as odwhcons
from ovirt_engine_setup.engine_common import database
from ovirt_engine_setup import dialog
from ovirt_engine_setup.engine_common \
- import enginecommonconstants as oengcommcons
+ import constants as oengcommcons
@util.export
diff --git
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/distro-rpm/packages.py
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/distro-rpm/packages.py
index fa3d8d5..86ec8da 100644
---
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/distro-rpm/packages.py
+++
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/distro-rpm/packages.py
@@ -29,7 +29,7 @@
from ovirt_engine_setup import constants as osetupcons
-from ovirt_engine_setup.dwh import dwhconstants as odwhcons
+from ovirt_engine_setup.dwh import constants as odwhcons
@util.export
diff --git
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/legacy/config.py
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/legacy/config.py
index 21a0ea8..7f943bb 100644
---
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/legacy/config.py
+++
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/legacy/config.py
@@ -35,7 +35,7 @@
from ovirt_engine_setup import constants as osetupcons
-from ovirt_engine_setup.dwh import dwhconstants as odwhcons
+from ovirt_engine_setup.dwh import constants as odwhcons
from ovirt_engine_setup.engine_common import database
diff --git
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/provisioning/postgres.py
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/provisioning/postgres.py
index 181c38c..216d6dd 100644
---
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/provisioning/postgres.py
+++
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/provisioning/postgres.py
@@ -28,11 +28,11 @@
from ovirt_engine_setup import constants as osetupcons
-from ovirt_engine_setup.dwh import dwhconstants as odwhcons
+from ovirt_engine_setup.dwh import constants as odwhcons
from ovirt_engine_setup import dialog
from ovirt_engine_setup.engine_common import postgres
from ovirt_engine_setup.engine_common \
- import enginecommonconstants as oengcommcons
+ import constants as oengcommcons
@util.export
--
To view, visit http://gerrit.ovirt.org/28606
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifb0256b898650b6986608021c543fa6b5ac2fddc
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-dwh
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
