Simone Tiraboschi has uploaded a new change for review. Change subject: reports: Split of engine-setup-plugin ......................................................................
reports: Split of engine-setup-plugin Update includes and constants packages due to changes on constant packages in engine-setup for engine setup split. Move constants files to the right position to adopt the same schema. This patch depends from: http://gerrit.ovirt.org/#/c/27647/ from ovirt-engine project Change-Id: I1849f9f06523d5926b7e8cf35399cedb5146c718 Signed-off-by: Simone Tiraboschi <[email protected]> --- M Makefile M ovirt-engine-reports.spec.in A packaging/setup/ovirt_engine_setup/reports/__init__.py R packaging/setup/ovirt_engine_setup/reports/reportsconfig.py.in R packaging/setup/ovirt_engine_setup/reports/reportsconstants.py R packaging/setup/ovirt_engine_setup/reports/reportsutil.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/config/jasper.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/core/misc.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/db/connection.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/db/pgpass.py M packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-reports/db/clear.py M packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-reports/jasper/clear.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/apache/reports.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/admin.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/engine.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/jasper.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/sso.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/core/misc.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/db/connection.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/distro-rpm/packages.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/jasper/deploy.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/provisioning/postgres.py 22 files changed, 84 insertions(+), 44 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/43/28243/1 diff --git a/Makefile b/Makefile index f0ce8eb..806d3ef 100644 --- a/Makefile +++ b/Makefile @@ -97,7 +97,7 @@ packaging/jasper-customizations/WEB-INF/applicationContext-ovirt-override.xml \ packaging/jasper-war-patches/ce/900_004_props_change_logs_location.patch \ packaging/jasper-war-patches/pro/900_004_props_change_logs_location.patch \ - packaging/setup/ovirt_engine_setup/reportsconfig.py \ + packaging/setup/ovirt_engine_setup/reports/reportsconfig.py \ packaging/sys-etc/logrotate.d/ovirt-engine-reports \ packaging/sys-etc/ovirt-engine/engine.conf.d/20-ovirt-engine-reports.conf \ $(NULL) diff --git a/ovirt-engine-reports.spec.in b/ovirt-engine-reports.spec.in index 702be62..7e7ed59 100644 --- a/ovirt-engine-reports.spec.in +++ b/ovirt-engine-reports.spec.in @@ -131,7 +131,8 @@ %endif %files setup -%{_datadir}/ovirt-engine/setup/ovirt_engine_setup/reports* +%dir %attr(-, %{engine_user}, %{engine_group}) %{_datadir}/ovirt-engine/setup/ovirt_engine_setup/reports/ +%{_datadir}/ovirt-engine/setup/ovirt_engine_setup/reports/ %{_datadir}/ovirt-engine/setup/plugins/*/ovirt-engine-reports/ %changelog diff --git a/packaging/setup/ovirt_engine_setup/reports/__init__.py b/packaging/setup/ovirt_engine_setup/reports/__init__.py new file mode 100644 index 0000000..74cb8e6 --- /dev/null +++ b/packaging/setup/ovirt_engine_setup/reports/__init__.py @@ -0,0 +1,25 @@ +# +# ovirt-engine-setup -- ovirt engine setup +# Copyright (C) 2014 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + + +"""ovirt_engine_setup module.""" + + +__all__ = [] + + +# vim: expandtab tabstop=4 shiftwidth=4 diff --git a/packaging/setup/ovirt_engine_setup/reportsconfig.py.in b/packaging/setup/ovirt_engine_setup/reports/reportsconfig.py.in similarity index 100% rename from packaging/setup/ovirt_engine_setup/reportsconfig.py.in rename to packaging/setup/ovirt_engine_setup/reports/reportsconfig.py.in diff --git a/packaging/setup/ovirt_engine_setup/reportsconstants.py b/packaging/setup/ovirt_engine_setup/reports/reportsconstants.py similarity index 100% rename from packaging/setup/ovirt_engine_setup/reportsconstants.py rename to packaging/setup/ovirt_engine_setup/reports/reportsconstants.py diff --git a/packaging/setup/ovirt_engine_setup/reportsutil.py b/packaging/setup/ovirt_engine_setup/reports/reportsutil.py similarity index 95% rename from packaging/setup/ovirt_engine_setup/reportsutil.py rename to packaging/setup/ovirt_engine_setup/reports/reportsutil.py index 17e19cc..7c21c48 100644 --- a/packaging/setup/ovirt_engine_setup/reportsutil.py +++ b/packaging/setup/ovirt_engine_setup/reports/reportsutil.py @@ -34,7 +34,8 @@ from otopi import util -from . import constants as osetupcons +from ovirt_engine_setup.engine_common \ + import enginecommonconstants as oengcommcons from . import reportsconstants as oreportscons @@ -115,7 +116,7 @@ ), envAppend={ 'JAVA_HOME': self.environment[ - osetupcons.ConfigEnv.JAVA_HOME + oengcommcons.ConfigEnv.JAVA_HOME ], 'JAVA_OPTS': '-Djava.io.tmpdir=%s' % self._javatmp, 'ADDITIONAL_CONFIG_DIR': ( @@ -141,7 +142,7 @@ ), envAppend={ 'JAVA_HOME': self.environment[ - osetupcons.ConfigEnv.JAVA_HOME + ongcommcons.ConfigEnv.JAVA_HOME ], 'JAVA_OPTS': '-Djava.io.tmpdir=%s' % self._javatmp, 'ADDITIONAL_CONFIG_DIR': ( diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/config/jasper.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/config/jasper.py index 1ed7829..2ae75d9 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/config/jasper.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/config/jasper.py @@ -16,7 +16,6 @@ # -import os import gettext _ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-reports') @@ -25,7 +24,7 @@ from otopi import plugin -from ovirt_engine_setup import reportsconstants as oreportscons +from ovirt_engine_setup.reports import reportsconstants as oreportscons @util.export diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/core/misc.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/core/misc.py index ced9a64..489cbcc 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/core/misc.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/core/misc.py @@ -25,7 +25,7 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup import reportsconstants as oreportscons +from ovirt_engine_setup.reports import reportsconstants as oreportscons @util.export diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/db/connection.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/db/connection.py index 59c3222..e0b00bb 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/db/connection.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/db/connection.py @@ -32,8 +32,8 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup import reportsconstants as oreportscons -from ovirt_engine_setup import database +from ovirt_engine_setup.reports import reportsconstants as oreportscons +from ovirt_engine_setup.engine_common import database @util.export diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/db/pgpass.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/db/pgpass.py index c43159a..acd7ce0 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/db/pgpass.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/db/pgpass.py @@ -27,8 +27,8 @@ from otopi import plugin -from ovirt_engine_setup import reportsconstants as oreportscons -from ovirt_engine_setup import database +from ovirt_engine_setup.reports import reportsconstants as oreportscons +from ovirt_engine_setup.engine_common import database @util.export diff --git a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-reports/db/clear.py b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-reports/db/clear.py index d5be19f..17a35e8 100644 --- a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-reports/db/clear.py +++ b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-reports/db/clear.py @@ -28,8 +28,8 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup import reportsconstants as oreportscons -from ovirt_engine_setup import database +from ovirt_engine_setup.reports import reportsconstants as oreportscons +from ovirt_engine_setup.engine_common import database from ovirt_engine_setup import dialog diff --git a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-reports/jasper/clear.py b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-reports/jasper/clear.py index 80c606d..9ad8fd2 100644 --- a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-reports/jasper/clear.py +++ b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-reports/jasper/clear.py @@ -30,7 +30,7 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup import reportsconstants as oreportscons +from ovirt_engine_setup.reports import reportsconstants as oreportscons from ovirt_engine_setup import dialog diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/apache/reports.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/apache/reports.py index c6de643..320c052 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/apache/reports.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/apache/reports.py @@ -30,7 +30,9 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup import reportsconstants as oreportscons +from ovirt_engine_setup.reports import reportsconstants as oreportscons +from ovirt_engine_setup.engine_common \ + import enginecommonconstants as oengcommcons @util.export @@ -65,7 +67,7 @@ group='ovirt_reports_files', fileList=uninstall_files, ) - self.environment[osetupcons.ApacheEnv.NEED_RESTART] = True + self.environment[oengcommcons.ApacheEnv.NEED_RESTART] = True self.environment[otopicons.CoreEnv.MAIN_TRANSACTION].append( filetransaction.FileTransaction( name=self.environment[ @@ -78,7 +80,7 @@ ), subst={ '@JBOSS_AJP_PORT@': self.environment[ - osetupcons.ConfigEnv.JBOSS_AJP_PORT + oengcommcons.ConfigEnv.JBOSS_AJP_PORT ], }, ), diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/admin.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/admin.py index c7c3bd7..03a88a6 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/admin.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/admin.py @@ -26,7 +26,7 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup import reportsconstants as oreportscons +from ovirt_engine_setup.reports import reportsconstants as oreportscons from ovirt_engine_setup import dialog diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/engine.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/engine.py index e775263..32bbfdb 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/engine.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/engine.py @@ -28,7 +28,9 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup import reportsconstants as oreportscons +from ovirt_engine_setup.reports import reportsconstants as oreportscons +from ovirt_engine_setup.engine_common \ + import enginecommonconstants as oengcommcons @util.export @@ -41,7 +43,7 @@ stage=plugin.Stages.STAGE_MISC, condition=lambda self: self.environment[oreportscons.CoreEnv.ENABLE], after=( - osetupcons.Stages.DB_CONNECTION_AVAILABLE, + oengcommcons.Stages.DB_CONNECTION_AVAILABLE, oreportscons.Stages.JASPER_NAME_SET, ), ) @@ -61,7 +63,7 @@ self.environment[otopicons.CoreEnv.MAIN_TRANSACTION].append( filetransaction.FileTransaction( name=os.path.join( - osetupcons.FileLocations.OVIRT_ENGINE_LOCALSTATEDIR, + oreportscons.FileLocations.OVIRT_ENGINE_REPORTS_UI, 'reports.xml', ), content=content.read(), @@ -69,7 +71,7 @@ ) ) - self.environment[osetupcons.DBEnv.STATEMENT].updateVdcOptions( + self.environment[oengcommcons.EngineDBEnv.STATEMENT].updateVdcOptions( options=( { 'name': 'RedirectServletReportsPage', diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/jasper.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/jasper.py index 57afefa..d258325 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/jasper.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/jasper.py @@ -26,7 +26,7 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup import reportsconstants as oreportscons +from ovirt_engine_setup.reports import reportsconstants as oreportscons @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/sso.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/sso.py index 1435f22..4399099 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/sso.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/sso.py @@ -27,7 +27,9 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup import reportsconstants as oreportscons +from ovirt_engine_setup.reports import reportsconstants as oreportscons +from ovirt_engine_setup.engine_common \ + import enginecommonconstants as oengcommcons @util.export @@ -58,7 +60,7 @@ '/get-session-user\n' ) % ( self.environment[ - osetupcons.ConfigEnv.PUBLIC_HTTPS_PORT + oengcommcons.ConfigEnv.PUBLIC_HTTPS_PORT ], ), modifiedList=uninstall_files, diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/core/misc.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/core/misc.py index c1ee7c1..7bcae3b 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/core/misc.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/core/misc.py @@ -25,7 +25,7 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup import reportsconstants as oreportscons +from ovirt_engine_setup.reports import reportsconstants as oreportscons from ovirt_engine_setup import dialog diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/db/connection.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/db/connection.py index 3c2fcca..f821bf1 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/db/connection.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/db/connection.py @@ -31,10 +31,12 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup import reportsconstants as oreportscons -from ovirt_engine_setup import database +from ovirt_engine_setup.reports import reportsconstants as oreportscons +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 @util.export @@ -109,10 +111,10 @@ name=oreportscons.Stages.DB_CONNECTION_CUSTOMIZATION, condition=lambda self: self.environment[oreportscons.CoreEnv.ENABLE], before=( - osetupcons.Stages.DIALOG_TITLES_E_DATABASE, + oengcommcons.Stages.DIALOG_TITLES_E_DATABASE, ), after=( - osetupcons.Stages.DIALOG_TITLES_S_DATABASE, + oengcommcons.Stages.DIALOG_TITLES_S_DATABASE, ), ) def _customization(self): diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/distro-rpm/packages.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/distro-rpm/packages.py index 954c8c6..def9bee 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/distro-rpm/packages.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/distro-rpm/packages.py @@ -29,7 +29,7 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup import reportsconstants as oreportscons +from ovirt_engine_setup.reports import reportsconstants as oreportscons @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/jasper/deploy.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/jasper/deploy.py index 83e1fe0..f462467 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/jasper/deploy.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/jasper/deploy.py @@ -41,10 +41,10 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup import reportsconstants as oreportscons -from ovirt_engine_setup import reportsutil as oreportsutil +from ovirt_engine_setup.reports import reportsconstants as oreportscons +from ovirt_engine_setup.reports import reportsutil as oreportsutil from ovirt_engine_setup import util as osetuputil -from ovirt_engine_setup import database +from ovirt_engine_setup.engine_common import database @util.export @@ -179,7 +179,7 @@ ), envAppend={ 'JAVA_HOME': self.environment[ - osetupcons.ConfigEnv.JAVA_HOME + oengcommcons.ConfigEnv.JAVA_HOME ], 'ANT_OPTS': '-Djava.io.tmpdir=%s' % self._javatmp, }, @@ -420,7 +420,7 @@ '-t {user}' ).format( cmd=( - osetupcons.FileLocations. + oengcommcons.FileLocations. OVIRT_ENGINE_DB_CHANGE_OWNER ), server=self.environment[oreportscons.DBEnv.HOST], @@ -1046,10 +1046,14 @@ os.chown( f, osetuputil.getUid( - self.environment[osetupcons.SystemEnv.USER_ENGINE] + self.environment[oreportscons.SystemEnv.USER_REPORTS] + # TODO: ES: fix it: should we put USER_ENGINE under + # engine-commons? ), osetuputil.getGid( - self.environment[osetupcons.SystemEnv.GROUP_ENGINE], + self.environment[oreportscons.SystemEnv.GROUP_REPORTS], + # TODO: ES: fix it: should we put USER_ENGINE under + # engine-commons? ), ) os.chmod(f, 0o600) diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/provisioning/postgres.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/provisioning/postgres.py index 94dd9f0..ba3d160 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/provisioning/postgres.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/provisioning/postgres.py @@ -28,9 +28,11 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup import reportsconstants as oreportscons +from ovirt_engine_setup.reports import reportsconstants as oreportscons +from ovirt_engine_setup.engine_common \ + import enginecommonconstants as oengcommcons from ovirt_engine_setup import dialog -from ovirt_engine_setup import postgres +from ovirt_engine_setup.engine_common import postgres @util.export @@ -87,11 +89,11 @@ @plugin.event( stage=plugin.Stages.STAGE_CUSTOMIZATION, before=( - osetupcons.Stages.DIALOG_TITLES_E_DATABASE, + oengcommcons.Stages.DIALOG_TITLES_E_DATABASE, oreportscons.Stages.DB_CONNECTION_CUSTOMIZATION, ), after=( - osetupcons.Stages.DIALOG_TITLES_S_DATABASE, + oengcommcons.Stages.DIALOG_TITLES_S_DATABASE, oreportscons.Stages.CORE_ENABLE, ), condition=lambda self: self._enabled, @@ -152,7 +154,7 @@ stage=plugin.Stages.STAGE_CUSTOMIZATION, priority=plugin.Stages.PRIORITY_LAST, condition=lambda self: self.environment[ - osetupcons.DBEnv.HOST + oreportscons.DBEnv.HOST ] == 'localhost', ) def _customization_firewall(self): -- To view, visit http://gerrit.ovirt.org/28243 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1849f9f06523d5926b7e8cf35399cedb5146c718 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-reports Gerrit-Branch: master Gerrit-Owner: Simone Tiraboschi <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
