Yedidyah Bar David has uploaded a new change for review.
Change subject: packaging: setup: Private engine db credentials consts
......................................................................
packaging: setup: Private engine db credentials consts
Change-Id: I18e59fcd518cac357a208e6e7f501cea5a528c38
Signed-off-by: Yedidyah Bar David <d...@redhat.com>
---
M packaging/setup/ovirt_engine_setup/engine/constants.py
M packaging/setup/ovirt_engine_setup/engine_common/constants.py
D packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/db/__init__.py
D
packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/db/connection.py
M packaging/setup/plugins/ovirt-engine-common/ovirt-engine/db/connection.py
M packaging/setup/plugins/ovirt-engine-common/ovirt-engine/db/pgpass.py
M packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/db/clear.py
M packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/database.py
M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/core.py
M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/vdsm.py
M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/appmode.py
M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/database.py
M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/domain_type.py
M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/iso_domain.py
M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/macrange.py
M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/options.py
M
packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/public_glance_repository.py
M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/db/connection.py
M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/db/schema.py
M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/legacy/osinfo.py
M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ca.py
M
packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/provisioning/postgres.py
M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/nfs.py
M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/asynctasks.py
M
packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/dbvalidations.py
25 files changed, 266 insertions(+), 359 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/46/28646/1
diff --git a/packaging/setup/ovirt_engine_setup/engine/constants.py
b/packaging/setup/ovirt_engine_setup/engine/constants.py
index 81e6899..ad6c7cb 100644
--- a/packaging/setup/ovirt_engine_setup/engine/constants.py
+++ b/packaging/setup/ovirt_engine_setup/engine/constants.py
@@ -28,6 +28,7 @@
from ovirt_engine_setup import constants as osetupcons
+from ovirt_engine_setup.constants import classproperty
from ovirt_engine_setup.constants import osetupattrsclass
from ovirt_engine_setup.constants import osetupattrs
@@ -370,6 +371,104 @@
ENGINE_DB_BACKUP_PREFIX = 'engine'
+ @classproperty
+ def ENGINE_DB_ENV_KEYS(self):
+ return {
+ 'host': EngineDBEnv.HOST,
+ 'port': EngineDBEnv.PORT,
+ 'secured': EngineDBEnv.SECURED,
+ 'hostValidation': EngineDBEnv.SECURED_HOST_VALIDATION,
+ 'user': EngineDBEnv.USER,
+ 'password': EngineDBEnv.PASSWORD,
+ 'database': EngineDBEnv.DATABASE,
+ 'connection': EngineDBEnv.CONNECTION,
+ 'pgpassfile': EngineDBEnv.PGPASS_FILE,
+ 'newDatabase': EngineDBEnv.NEW_DATABASE,
+ }
+
+ @classproperty
+ def DEFAULT_ENGINE_DB_ENV_KEYS(self):
+ return {
+ 'host': Defaults.DEFAULT_DB_HOST,
+ 'port': Defaults.DEFAULT_DB_PORT,
+ 'secured': Defaults.DEFAULT_DB_SECURED,
+ 'hostValidation': Defaults.DEFAULT_DB_SECURED_HOST_VALIDATION,
+ 'user': Defaults.DEFAULT_DB_USER,
+ 'password': Defaults.DEFAULT_DB_PASSWORD,
+ 'database': Defaults.DEFAULT_DB_DATABASE,
+ }
+
+
+@util.export
+@util.codegen
+@osetupattrsclass
+class EngineDBEnv(object):
+
+ @osetupattrs(
+ answerfile=True,
+ summary=True,
+ description=_('Engine database host'),
+ )
+ def HOST(self):
+ return 'OVESETUP_DB/host'
+
+ @osetupattrs(
+ answerfile=True,
+ summary=True,
+ description=_('Engine database port'),
+ )
+ def PORT(self):
+ return 'OVESETUP_DB/port'
+
+ @osetupattrs(
+ answerfile=True,
+ summary=True,
+ description=_('Engine database secured connection'),
+ )
+ def SECURED(self):
+ return 'OVESETUP_DB/secured'
+
+ @osetupattrs(
+ answerfile=True,
+ summary=True,
+ description=_('Engine database host name validation'),
+ )
+ def SECURED_HOST_VALIDATION(self):
+ return 'OVESETUP_DB/securedHostValidation'
+
+ @osetupattrs(
+ answerfile=True,
+ summary=True,
+ description=_('Engine database name'),
+ )
+ def DATABASE(self):
+ return 'OVESETUP_DB/database'
+
+ @osetupattrs(
+ answerfile=True,
+ summary=True,
+ description=_('Engine database user name'),
+ )
+ def USER(self):
+ return 'OVESETUP_DB/user'
+
+ @osetupattrs(
+ answerfile=True,
+ )
+ def PASSWORD(self):
+ return 'OVESETUP_DB/password'
+
+ CONNECTION = 'OVESETUP_DB/connection'
+ STATEMENT = 'OVESETUP_DB/statement'
+ PGPASS_FILE = 'OVESETUP_DB/pgPassFile'
+ NEW_DATABASE = 'OVESETUP_DB/newDatabase'
+
+ @osetupattrs(
+ answerfile=True,
+ )
+ def FIX_DB_VIOLATIONS(self):
+ return 'OVESETUP_DB/fixDbViolations'
+
@util.export
@util.codegen
diff --git a/packaging/setup/ovirt_engine_setup/engine_common/constants.py
b/packaging/setup/ovirt_engine_setup/engine_common/constants.py
index 5122859..336ccba 100644
--- a/packaging/setup/ovirt_engine_setup/engine_common/constants.py
+++ b/packaging/setup/ovirt_engine_setup/engine_common/constants.py
@@ -27,6 +27,7 @@
from otopi import util
+
from . import config
from ovirt_engine_setup import constants as osetupcons
from ovirt_engine_setup.constants import classproperty
@@ -142,109 +143,6 @@
DIALOG_TITLES_E_PKI = 'osetup.dialog.titles.pki.end'
RENAME_PKI_CONF_MISC = 'osetup.rename.pki.conf.misc'
-
-
-@util.export
-@util.codegen
-class Const(object):
-
- @classproperty
- def ENGINE_DB_ENV_KEYS(self):
- return {
- 'host': EngineDBEnv.HOST,
- 'port': EngineDBEnv.PORT,
- 'secured': EngineDBEnv.SECURED,
- 'hostValidation': EngineDBEnv.SECURED_HOST_VALIDATION,
- 'user': EngineDBEnv.USER,
- 'password': EngineDBEnv.PASSWORD,
- 'database': EngineDBEnv.DATABASE,
- 'connection': EngineDBEnv.CONNECTION,
- 'pgpassfile': EngineDBEnv.PGPASS_FILE,
- 'newDatabase': EngineDBEnv.NEW_DATABASE,
- }
-
- @classproperty
- def DEFAULT_ENGINE_DB_ENV_KEYS(self):
- return {
- 'host': Defaults.DEFAULT_DB_HOST,
- 'port': Defaults.DEFAULT_DB_PORT,
- 'secured': Defaults.DEFAULT_DB_SECURED,
- 'hostValidation': Defaults.DEFAULT_DB_SECURED_HOST_VALIDATION,
- 'user': Defaults.DEFAULT_DB_USER,
- 'password': Defaults.DEFAULT_DB_PASSWORD,
- 'database': Defaults.DEFAULT_DB_DATABASE,
- }
-
-
-@util.export
-@util.codegen
-@osetupattrsclass
-class EngineDBEnv(object):
-
- @osetupattrs(
- answerfile=True,
- summary=True,
- description=_('Engine database host'),
- )
- def HOST(self):
- return 'OVESETUP_DB/host'
-
- @osetupattrs(
- answerfile=True,
- summary=True,
- description=_('Engine database port'),
- )
- def PORT(self):
- return 'OVESETUP_DB/port'
-
- @osetupattrs(
- answerfile=True,
- summary=True,
- description=_('Engine database secured connection'),
- )
- def SECURED(self):
- return 'OVESETUP_DB/secured'
-
- @osetupattrs(
- answerfile=True,
- summary=True,
- description=_('Engine database host name validation'),
- )
- def SECURED_HOST_VALIDATION(self):
- return 'OVESETUP_DB/securedHostValidation'
-
- @osetupattrs(
- answerfile=True,
- summary=True,
- description=_('Engine database name'),
- )
- def DATABASE(self):
- return 'OVESETUP_DB/database'
-
- @osetupattrs(
- answerfile=True,
- summary=True,
- description=_('Engine database user name'),
- )
- def USER(self):
- return 'OVESETUP_DB/user'
-
- @osetupattrs(
- answerfile=True,
- )
- def PASSWORD(self):
- return 'OVESETUP_DB/password'
-
- CONNECTION = 'OVESETUP_DB/connection'
- STATEMENT = 'OVESETUP_DB/statement'
- PGPASS_FILE = 'OVESETUP_DB/pgPassFile'
- NEW_DATABASE = 'OVESETUP_DB/newDatabase'
-
- @osetupattrs(
- answerfile=True,
- )
- def FIX_DB_VIOLATIONS(self):
- return 'OVESETUP_DB/fixDbViolations'
@util.export
diff --git
a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/db/__init__.py
b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/db/__init__.py
deleted file mode 100644
index b68ace4..0000000
---
a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/db/__init__.py
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# ovirt-engine-setup -- ovirt engine setup
-# Copyright (C) 2013-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-host-setup datebase plugin."""
-
-
-from otopi import util
-
-
-from . import connection
-
-
-@util.export
-def createPlugins(context):
- connection.Plugin(context=context)
-
-
-# vim: expandtab tabstop=4 shiftwidth=4
diff --git
a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/db/connection.py
b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/db/connection.py
deleted file mode 100644
index 5f649b7..0000000
---
a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/db/connection.py
+++ /dev/null
@@ -1,101 +0,0 @@
-#
-# ovirt-engine-setup -- ovirt engine setup
-# Copyright (C) 2013 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.
-#
-
-
-"""Connection plugin."""
-
-
-import gettext
-_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup')
-
-
-from otopi import constants as otopicons
-from otopi import util
-from otopi import plugin
-
-
-from ovirt_engine_setup.engine_common \
- import constants as oengcommcons
-from ovirt_engine_setup.engine_common import database
-
-
-@util.export
-class Plugin(plugin.PluginBase):
- """Connection plugin."""
-
- def __init__(self, context):
- super(Plugin, self).__init__(context=context)
-
- @plugin.event(
- stage=plugin.Stages.STAGE_BOOT,
- )
- def _boot(self):
- self.environment[
- otopicons.CoreEnv.LOG_FILTER_KEYS
- ].append(
- oengcommcons.EngineDBEnv.PASSWORD
- )
-
- @plugin.event(
- stage=plugin.Stages.STAGE_INIT,
- )
- def _init(self):
- self.environment.setdefault(
- oengcommcons.EngineDBEnv.HOST,
- None
- )
- self.environment.setdefault(
- oengcommcons.EngineDBEnv.PORT,
- None
- )
- self.environment.setdefault(
- oengcommcons.EngineDBEnv.SECURED,
- None
- )
- self.environment.setdefault(
- oengcommcons.EngineDBEnv.SECURED_HOST_VALIDATION,
- None
- )
- self.environment.setdefault(
- oengcommcons.EngineDBEnv.USER,
- None
- )
- self.environment.setdefault(
- oengcommcons.EngineDBEnv.PASSWORD,
- None
- )
- self.environment.setdefault(
- oengcommcons.EngineDBEnv.DATABASE,
- None
- )
-
- self.environment[oengcommcons.EngineDBEnv.CONNECTION] = None
- self.environment[oengcommcons.EngineDBEnv.STATEMENT] = None
- self.environment[oengcommcons.EngineDBEnv.NEW_DATABASE] = True
-
- @plugin.event(
- stage=plugin.Stages.STAGE_SETUP,
- )
- def _commands(self):
- dbovirtutils = database.OvirtUtils(
- plugin=self,
- dbenvkeys=oengcommcons.Const.ENGINE_DB_ENV_KEYS,
- )
- dbovirtutils.detectCommands()
-
-
-# vim: expandtab tabstop=4 shiftwidth=4
diff --git
a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/db/connection.py
b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/db/connection.py
index 57d0b75..3a097d8 100644
--- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/db/connection.py
+++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/db/connection.py
@@ -45,10 +45,53 @@
super(Plugin, self).__init__(context=context)
@plugin.event(
+ stage=plugin.Stages.STAGE_INIT,
+ )
+ def _init(self):
+ self.environment.setdefault(
+ oenginecons.EngineDBEnv.HOST,
+ None
+ )
+ self.environment.setdefault(
+ oenginecons.EngineDBEnv.PORT,
+ None
+ )
+ self.environment.setdefault(
+ oenginecons.EngineDBEnv.SECURED,
+ None
+ )
+ self.environment.setdefault(
+ oenginecons.EngineDBEnv.SECURED_HOST_VALIDATION,
+ None
+ )
+ self.environment.setdefault(
+ oenginecons.EngineDBEnv.USER,
+ None
+ )
+ self.environment.setdefault(
+ oenginecons.EngineDBEnv.PASSWORD,
+ None
+ )
+ self.environment.setdefault(
+ oenginecons.EngineDBEnv.DATABASE,
+ None
+ )
+
+ self.environment[oenginecons.EngineDBEnv.CONNECTION] = None
+ self.environment[oenginecons.EngineDBEnv.STATEMENT] = None
+ self.environment[oenginecons.EngineDBEnv.NEW_DATABASE] = True
+
+ @plugin.event(
stage=plugin.Stages.STAGE_SETUP,
name=oengcommcons.Stages.DB_CONNECTION_SETUP,
)
def _setup(self):
+ dbovirtutils = database.OvirtUtils(
+ plugin=self,
+ dbenvkeys=oenginecons.Const.ENGINE_DB_ENV_KEYS,
+ )
+ dbovirtutils.detectCommands()
+
config = configfile.ConfigFile([
oenginecons.FileLocations.OVIRT_ENGINE_SERVICE_CONFIG_DEFAULTS,
oenginecons.FileLocations.OVIRT_ENGINE_SERVICE_CONFIG
@@ -57,30 +100,26 @@
try:
dbenv = {}
for e, k in (
- (oengcommcons.EngineDBEnv.HOST, 'ENGINE_DB_HOST'),
- (oengcommcons.EngineDBEnv.PORT, 'ENGINE_DB_PORT'),
- (oengcommcons.EngineDBEnv.USER, 'ENGINE_DB_USER'),
- (oengcommcons.EngineDBEnv.PASSWORD, 'ENGINE_DB_PASSWORD'),
- (oengcommcons.EngineDBEnv.DATABASE, 'ENGINE_DB_DATABASE'),
+ (oenginecons.EngineDBEnv.HOST, 'ENGINE_DB_HOST'),
+ (oenginecons.EngineDBEnv.PORT, 'ENGINE_DB_PORT'),
+ (oenginecons.EngineDBEnv.USER, 'ENGINE_DB_USER'),
+ (oenginecons.EngineDBEnv.PASSWORD, 'ENGINE_DB_PASSWORD'),
+ (oenginecons.EngineDBEnv.DATABASE, 'ENGINE_DB_DATABASE'),
):
dbenv[e] = config.get(k)
for e, k in (
- (oengcommcons.EngineDBEnv.SECURED, 'ENGINE_DB_SECURED'),
+ (oenginecons.EngineDBEnv.SECURED, 'ENGINE_DB_SECURED'),
(
- oengcommcons.EngineDBEnv.SECURED_HOST_VALIDATION,
+ oenginecons.EngineDBEnv.SECURED_HOST_VALIDATION,
'ENGINE_DB_SECURED_VALIDATION'
)
):
dbenv[e] = config.getboolean(k)
- dbovirtutils = database.OvirtUtils(
- plugin=self,
- dbenvkeys=oengcommcons.Const.ENGINE_DB_ENV_KEYS,
- )
dbovirtutils.tryDatabaseConnect(dbenv)
self.environment.update(dbenv)
self.environment[
- oengcommcons.EngineDBEnv.NEW_DATABASE
+ oenginecons.EngineDBEnv.NEW_DATABASE
] = dbovirtutils.isNewDatabase()
except RuntimeError as e:
self.logger.debug(
@@ -91,10 +130,10 @@
'Cannot connect to Engine database using existing '
'credentials: {user}@{host}:{port}'
).format(
- host=dbenv[oengcommcons.EngineDBEnv.HOST],
- port=dbenv[oengcommcons.EngineDBEnv.PORT],
- database=dbenv[oengcommcons.EngineDBEnv.DATABASE],
- user=dbenv[oengcommcons.EngineDBEnv.USER],
+ host=dbenv[oenginecons.EngineDBEnv.HOST],
+ port=dbenv[oenginecons.EngineDBEnv.PORT],
+ database=dbenv[oenginecons.EngineDBEnv.DATABASE],
+ user=dbenv[oenginecons.EngineDBEnv.USER],
)
if self.environment[
osetupcons.CoreEnv.ACTION
diff --git
a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/db/pgpass.py
b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/db/pgpass.py
index a28d7a7..9fa9a9f 100644
--- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/db/pgpass.py
+++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/db/pgpass.py
@@ -29,6 +29,7 @@
from ovirt_engine_setup.engine_common \
import constants as oengcommcons
+from ovirt_engine_setup.engine import engineconstants as oenginecons
from ovirt_engine_setup.engine_common import database
@@ -42,20 +43,20 @@
stage=plugin.Stages.STAGE_INIT,
)
def _init(self):
- self.environment[oengcommcons.EngineDBEnv.PGPASS_FILE] = None
+ self.environment[oenginecons.EngineDBEnv.PGPASS_FILE] = None
@plugin.event(
stage=plugin.Stages.STAGE_VALIDATION,
name=oengcommcons.Stages.DB_CREDENTIALS_AVAILABLE_EARLY,
condition=lambda self: self.environment[
- oengcommcons.EngineDBEnv.PASSWORD
+ oenginecons.EngineDBEnv.PASSWORD
] is not None
)
def _validation(self):
# this required for dbvalidations
database.OvirtUtils(
plugin=self,
- dbenvkeys=oengcommcons.Const.ENGINE_DB_ENV_KEYS,
+ dbenvkeys=oenginecons.Const.ENGINE_DB_ENV_KEYS,
).createPgPass()
@plugin.event(
@@ -65,7 +66,7 @@
def _misc(self):
database.OvirtUtils(
plugin=self,
- dbenvkeys=oengcommcons.Const.ENGINE_DB_ENV_KEYS,
+ dbenvkeys=oenginecons.Const.ENGINE_DB_ENV_KEYS,
).createPgPass()
diff --git
a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/db/clear.py
b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/db/clear.py
index 6e12c0a..b371d39 100644
--- a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/db/clear.py
+++ b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/db/clear.py
@@ -87,7 +87,7 @@
@plugin.event(
stage=plugin.Stages.STAGE_MISC,
condition=lambda self: (
- self.environment[oengcommcons.EngineDBEnv.PASSWORD] is not None and
+ self.environment[oenginecons.EngineDBEnv.PASSWORD] is not None and
self.environment[osetupcons.RemoveEnv.REMOVE_DATABASE]
),
after=(
@@ -99,7 +99,7 @@
try:
dbovirtutils = database.OvirtUtils(
plugin=self,
- dbenvkeys=oengcommcons.Const.ENGINE_DB_ENV_KEYS,
+ dbenvkeys=oenginecons.Const.ENGINE_DB_ENV_KEYS,
)
dbovirtutils.tryDatabaseConnect()
self._bkpfile = dbovirtutils.backup(
@@ -109,7 +109,7 @@
self.logger.info(
_('Clearing Engine database {database}').format(
database=self.environment[
- oengcommcons.EngineDBEnv.DATABASE
+ oenginecons.EngineDBEnv.DATABASE
],
)
)
diff --git
a/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/database.py
b/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/database.py
index d92d96d..8095716 100644
--- a/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/database.py
+++ b/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/database.py
@@ -33,6 +33,7 @@
from ovirt_engine_setup import constants as osetupcons
from ovirt_engine_setup.engine_common \
import constants as oengcommcons
+from ovirt_engine_setup.engine import engineconstants as oenginecons
from ovirt_engine_setup.engine_common import database
from ovirt_engine_setup.engine import vdcoption
from ovirt_engine_setup import domains
@@ -56,17 +57,17 @@
def abort(self):
connection = self._parent.environment[
- oengcommcons.EngineDBEnv.CONNECTION
+ oenginecons.EngineDBEnv.CONNECTION
]
if connection is not None:
connection.rollback()
self._parent.environment[
- oengcommcons.EngineDBEnv.CONNECTION
+ oenginecons.EngineDBEnv.CONNECTION
] = None
def commit(self):
connection = self._parent.environment[
- oengcommcons.EngineDBEnv.CONNECTION
+ oenginecons.EngineDBEnv.CONNECTION
]
if connection is not None:
connection.commit()
@@ -88,15 +89,15 @@
)
def _connection(self):
self.environment[
- oengcommcons.EngineDBEnv.STATEMENT
+ oenginecons.EngineDBEnv.STATEMENT
] = database.Statement(
- dbenvkeys=oengcommcons.Const.ENGINE_DB_ENV_KEYS,
+ dbenvkeys=oenginecons.Const.ENGINE_DB_ENV_KEYS,
environment=self.environment,
)
# must be here as we do not have database at validation
self.environment[
- oengcommcons.EngineDBEnv.CONNECTION
- ] = self.environment[oengcommcons.EngineDBEnv.STATEMENT].connect()
+ oenginecons.EngineDBEnv.CONNECTION
+ ] = self.environment[oenginecons.EngineDBEnv.STATEMENT].connect()
@plugin.event(
stage=plugin.Stages.STAGE_VALIDATION,
@@ -104,11 +105,11 @@
def _validation(self):
dbovirtutils = database.OvirtUtils(
plugin=self,
- dbenvkeys=oengcommcons.Const.ENGINE_DB_ENV_KEYS,
+ dbenvkeys=oenginecons.Const.ENGINE_DB_ENV_KEYS,
)
dbovirtutils.tryDatabaseConnect()
dbstatement = database.Statement(
- dbenvkeys=oengcommcons.Const.ENGINE_DB_ENV_KEYS,
+ dbenvkeys=oenginecons.Const.ENGINE_DB_ENV_KEYS,
environment=self.environment,
)
my_domains = []
@@ -163,7 +164,7 @@
option = 'RedirectServletReportsPage'
vdc = vdcoption.VdcOption(
statement=self.environment[
- oengcommcons.EngineDBEnv.STATEMENT
+ oenginecons.EngineDBEnv.STATEMENT
]
)
value = vdc.getVdcOption(name=option)
diff --git
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/core.py
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/core.py
index bcddaa5..a8c3892 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/core.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/core.py
@@ -72,7 +72,7 @@
condition=lambda self: self.environment[
oenginecons.AIOEnv.ENABLE
] and self.environment[
- oengcommcons.EngineDBEnv.NEW_DATABASE
+ oenginecons.EngineDBEnv.NEW_DATABASE
],
)
def _setup(self):
diff --git
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/vdsm.py
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/vdsm.py
index 0587299..850ffc1 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/vdsm.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/vdsm.py
@@ -197,7 +197,7 @@
SupportedClusterLevels = vdcoption.VdcOption(
statement=self.environment[
- oengcommcons.EngineDBEnv.STATEMENT
+ oenginecons.EngineDBEnv.STATEMENT
]
).getVdcOption(
name='SupportedClusterLevels'
diff --git
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/appmode.py
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/appmode.py
index fcdf2eb..e5018db 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/appmode.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/appmode.py
@@ -64,7 +64,7 @@
oenginecons.Stages.DIALOG_TITLES_S_ENGINE,
),
condition=lambda self: self.environment[
- oengcommcons.EngineDBEnv.NEW_DATABASE
+ oenginecons.EngineDBEnv.NEW_DATABASE
],
name=osetupcons.Stages.CONFIG_APPLICATION_MODE_AVAILABLE
)
@@ -100,7 +100,7 @@
v = self.environment[osetupcons.ConfigEnv.APPLICATION_MODE]
- self.environment[oengcommcons.EngineDBEnv.STATEMENT].execute(
+ self.environment[oenginecons.EngineDBEnv.STATEMENT].execute(
statement="""
select inst_update_service_type(
%(clusterId)s,
@@ -111,7 +111,7 @@
args=dict(
clusterId=vdcoption.VdcOption(
statement=self.environment[
- oengcommcons.EngineDBEnv.STATEMENT
+ oenginecons.EngineDBEnv.STATEMENT
]
).getVdcOption(name='AutoRegistrationDefaultVdsGroupID'),
virt=(v in ('both', 'virt')),
@@ -120,7 +120,7 @@
)
if v != 'both':
- self.environment[oengcommcons.EngineDBEnv.STATEMENT].execute(
+ self.environment[oenginecons.EngineDBEnv.STATEMENT].execute(
statement="""
select fn_db_update_config_value(
'ApplicationMode',
diff --git
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/database.py
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/database.py
index 01895ce..dd0a17c 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/database.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/database.py
@@ -78,23 +78,23 @@
) +
''
).format(
- host=self.environment[oengcommcons.EngineDBEnv.HOST],
- port=self.environment[oengcommcons.EngineDBEnv.PORT],
- user=self.environment[oengcommcons.EngineDBEnv.USER],
+ host=self.environment[oenginecons.EngineDBEnv.HOST],
+ port=self.environment[oenginecons.EngineDBEnv.PORT],
+ user=self.environment[oenginecons.EngineDBEnv.USER],
password=outil.escape(
- self.environment[oengcommcons.EngineDBEnv.PASSWORD],
+ self.environment[oenginecons.EngineDBEnv.PASSWORD],
'"\\$',
),
- db=self.environment[oengcommcons.EngineDBEnv.DATABASE],
- secured=self.environment[oengcommcons.EngineDBEnv.SECURED],
+ db=self.environment[oenginecons.EngineDBEnv.DATABASE],
+ secured=self.environment[oenginecons.EngineDBEnv.SECURED],
securedValidation=self.environment[
- oengcommcons.EngineDBEnv.SECURED_HOST_VALIDATION
+ oenginecons.EngineDBEnv.SECURED_HOST_VALIDATION
],
jdbcTlsOptions='&'.join(
s for s in (
'ssl=true'
if self.environment[
- oengcommcons.EngineDBEnv.SECURED
+ oenginecons.EngineDBEnv.SECURED
] else '',
(
@@ -102,7 +102,7 @@
'org.postgresql.ssl.NonValidatingFactory'
)
if not self.environment[
- oengcommcons.EngineDBEnv.
+ oenginecons.EngineDBEnv.
SECURED_HOST_VALIDATION
] else ''
) if s
diff --git
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/domain_type.py
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/domain_type.py
index 4ddb3aa..a7d4a86 100644
---
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/domain_type.py
+++
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/domain_type.py
@@ -68,7 +68,7 @@
oenginecons.Stages.DIALOG_TITLES_S_ENGINE,
),
condition=lambda self: (
- self.environment[oengcommcons.EngineDBEnv.NEW_DATABASE] and
+ self.environment[oenginecons.EngineDBEnv.NEW_DATABASE] and
self.environment[
osetupcons.ConfigEnv.APPLICATION_MODE
] != 'gluster'
@@ -107,7 +107,7 @@
condition=lambda self: self._enabled,
)
def _misc(self):
- self.environment[oengcommcons.EngineDBEnv.STATEMENT].execute(
+ self.environment[oenginecons.EngineDBEnv.STATEMENT].execute(
statement="""
select inst_update_default_storage_pool_type (%(type)s)
""",
diff --git
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/iso_domain.py
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/iso_domain.py
index 467d0bc..dfe24af 100644
---
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/iso_domain.py
+++
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/iso_domain.py
@@ -454,7 +454,7 @@
oenginecons.Const.ISO_DOMAIN_IMAGE_UID,
)
self.logger.debug('Adding ISO domain into DB')
- self.environment[oengcommcons.EngineDBEnv.STATEMENT].execute(
+ self.environment[oenginecons.EngineDBEnv.STATEMENT].execute(
statement="""
select inst_add_iso_storage_domain(
%(storage_domain_id)s,
diff --git
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/macrange.py
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/macrange.py
index ee308d9..b0313da 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/macrange.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/macrange.py
@@ -62,13 +62,13 @@
oengcommcons.Stages.DB_CONNECTION_AVAILABLE,
),
condition=lambda self: self.environment[
- oengcommcons.EngineDBEnv.NEW_DATABASE
+ oenginecons.EngineDBEnv.NEW_DATABASE
]
)
def _misc(self):
vdcoption.VdcOption(
statement=self.environment[
- oengcommcons.EngineDBEnv.STATEMENT
+ oenginecons.EngineDBEnv.STATEMENT
]
).updateVdcOptions(
options=(
diff --git
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/options.py
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/options.py
index 0dbeed9..65bb262 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/options.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/options.py
@@ -74,7 +74,7 @@
)
def _customization(self):
self._enabled = self.environment[
- oengcommcons.EngineDBEnv.NEW_DATABASE
+ oenginecons.EngineDBEnv.NEW_DATABASE
]
if not self._enabled:
@@ -146,7 +146,7 @@
def _miscAlways(self):
vdcoption.VdcOption(
statement=self.environment[
- oengcommcons.EngineDBEnv.STATEMENT
+ oenginecons.EngineDBEnv.STATEMENT
]
).updateVdcOptions(
options=(
@@ -163,13 +163,13 @@
oengcommcons.Stages.DB_CONNECTION_AVAILABLE,
),
condition=lambda self: self.environment[
- oengcommcons.EngineDBEnv.NEW_DATABASE
+ oenginecons.EngineDBEnv.NEW_DATABASE
]
)
def _miscNewDatabase(self):
vdcoption.VdcOption(
statement=self.environment[
- oengcommcons.EngineDBEnv.STATEMENT
+ oenginecons.EngineDBEnv.STATEMENT
]
).updateVdcOptions(
options=(
@@ -213,13 +213,13 @@
oengcommcons.Stages.CONFIG_DB_ENCRYPTION_AVAILABLE,
),
condition=lambda self: self.environment[
- oengcommcons.EngineDBEnv.NEW_DATABASE
+ oenginecons.EngineDBEnv.NEW_DATABASE
]
)
def _miscEncrypted(self):
vdcoption.VdcOption(
statement=self.environment[
- oengcommcons.EngineDBEnv.STATEMENT
+ oenginecons.EngineDBEnv.STATEMENT
]
).updateVdcOptions(
options=(
@@ -249,7 +249,7 @@
osetupcons.Stages.DIALOG_TITLES_S_SUMMARY,
),
condition=lambda self: self.environment[
- oengcommcons.EngineDBEnv.NEW_DATABASE
+ oenginecons.EngineDBEnv.NEW_DATABASE
]
)
def _closeup(self):
diff --git
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/public_glance_repository.py
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/public_glance_repository.py
index 696087b..b8fea58 100644
---
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/public_glance_repository.py
+++
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/public_glance_repository.py
@@ -30,6 +30,7 @@
from ovirt_engine_setup import constants as osetupcons
from ovirt_engine_setup.engine_common \
import constants as oengcommcons
+from ovirt_engine_setup.engine import engineconstants as oenginecons
@util.export
@@ -58,7 +59,7 @@
],
)
def _misc(self):
- self.environment[oengcommcons.EngineDBEnv.STATEMENT].execute(
+ self.environment[oenginecons.EngineDBEnv.STATEMENT].execute(
statement="""
select inst_add_glance_provider(
%(provider_id)s,
diff --git
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/db/connection.py
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/db/connection.py
index 33d6cf7..4d60f76 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/db/connection.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/db/connection.py
@@ -31,6 +31,7 @@
from ovirt_engine_setup.engine_common \
import constants as oengcommcons
+from ovirt_engine_setup.engine import engineconstants as oenginecons
from ovirt_engine_setup import util as osetuputil
from ovirt_engine_setup.engine_common import database
@@ -53,17 +54,17 @@
def abort(self):
connection = self._parent.environment[
- oengcommcons.EngineDBEnv.CONNECTION
+ oenginecons.EngineDBEnv.CONNECTION
]
if connection is not None:
connection.rollback()
self._parent.environment[
- oengcommcons.EngineDBEnv.CONNECTION
+ oenginecons.EngineDBEnv.CONNECTION
] = None
def commit(self):
connection = self._parent.environment[
- oengcommcons.EngineDBEnv.CONNECTION
+ oenginecons.EngineDBEnv.CONNECTION
]
if connection is not None:
connection.commit()
@@ -92,11 +93,11 @@
def _customization(self):
database.OvirtUtils(
plugin=self,
- dbenvkeys=oengcommcons.Const.ENGINE_DB_ENV_KEYS,
+ dbenvkeys=oenginecons.Const.ENGINE_DB_ENV_KEYS,
).getCredentials(
name='Engine',
queryprefix='OVESETUP_ENGINE_DB_',
- defaultdbenvkeys=oengcommcons.Const.DEFAULT_ENGINE_DB_ENV_KEYS,
+ defaultdbenvkeys=oenginecons.Const.DEFAULT_ENGINE_DB_ENV_KEYS,
show_create_msg=True,
)
@@ -109,15 +110,15 @@
)
def _connection(self):
self.environment[
- oengcommcons.EngineDBEnv.STATEMENT
+ oenginecons.EngineDBEnv.STATEMENT
] = database.Statement(
- dbenvkeys=oengcommcons.Const.ENGINE_DB_ENV_KEYS,
+ dbenvkeys=oenginecons.Const.ENGINE_DB_ENV_KEYS,
environment=self.environment,
)
# must be here as we do not have database at validation
self.environment[
- oengcommcons.EngineDBEnv.CONNECTION
- ] = self.environment[oengcommcons.EngineDBEnv.STATEMENT].connect()
+ oenginecons.EngineDBEnv.CONNECTION
+ ] = self.environment[oenginecons.EngineDBEnv.STATEMENT].connect()
# vim: expandtab tabstop=4 shiftwidth=4
diff --git
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/db/schema.py
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/db/schema.py
index 9207eec..3136eef 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/db/schema.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/db/schema.py
@@ -59,12 +59,12 @@
try:
dbovirtutils = database.OvirtUtils(
plugin=self._parent,
- dbenvkeys=oengcommcons.Const.ENGINE_DB_ENV_KEYS,
+ dbenvkeys=oenginecons.Const.ENGINE_DB_ENV_KEYS,
)
self._parent.logger.info(
_('Clearing Engine database {database}').format(
database=self._parent.environment[
- oengcommcons.EngineDBEnv.DATABASE
+ oenginecons.EngineDBEnv.DATABASE
],
)
)
@@ -73,7 +73,7 @@
self._parent.logger.info(
_('Restoring Engine database {database}').format(
database=self._parent.environment[
- oengcommcons.EngineDBEnv.DATABASE
+ oenginecons.EngineDBEnv.DATABASE
],
)
)
@@ -97,7 +97,7 @@
def _checkDatabaseOwnership(self):
statement = database.Statement(
- dbenvkeys=oengcommcons.Const.ENGINE_DB_ENV_KEYS,
+ dbenvkeys=oenginecons.Const.ENGINE_DB_ENV_KEYS,
environment=self.environment,
)
result = statement.execute(
@@ -128,7 +128,7 @@
cls.relname
""",
args=dict(
- user=self.environment[oengcommcons.EngineDBEnv.USER],
+ user=self.environment[oenginecons.EngineDBEnv.USER],
),
ownConnection=True,
transaction=False,
@@ -153,10 +153,10 @@
oenginecons.FileLocations.
OVIRT_ENGINE_DB_CHANGE_OWNER
),
- server=self.environment[oengcommcons.EngineDBEnv.HOST],
- port=self.environment[oengcommcons.EngineDBEnv.PORT],
- db=self.environment[oengcommcons.EngineDBEnv.DATABASE],
- user=self.environment[oengcommcons.EngineDBEnv.USER],
+ server=self.environment[oenginecons.EngineDBEnv.HOST],
+ port=self.environment[oenginecons.EngineDBEnv.PORT],
+ db=self.environment[oenginecons.EngineDBEnv.DATABASE],
+ user=self.environment[oenginecons.EngineDBEnv.USER],
),
)
)
@@ -164,7 +164,7 @@
def _checkSupportedVersionsPresent(self):
# TODO: figure out a better way to do this for the future
statement = database.Statement(
- dbenvkeys=oengcommcons.Const.ENGINE_DB_ENV_KEYS,
+ dbenvkeys=oenginecons.Const.ENGINE_DB_ENV_KEYS,
environment=self.environment,
)
dcVersions = statement.execute(
@@ -209,7 +209,7 @@
oengcommcons.Stages.DB_CREDENTIALS_AVAILABLE_EARLY,
),
condition=lambda self: not self.environment[
- oengcommcons.EngineDBEnv.NEW_DATABASE
+ oenginecons.EngineDBEnv.NEW_DATABASE
],
)
def _validation(self):
@@ -227,11 +227,11 @@
backupFile = None
if not self.environment[
- oengcommcons.EngineDBEnv.NEW_DATABASE
+ oenginecons.EngineDBEnv.NEW_DATABASE
]:
dbovirtutils = database.OvirtUtils(
plugin=self,
- dbenvkeys=oengcommcons.Const.ENGINE_DB_ENV_KEYS,
+ dbenvkeys=oenginecons.Const.ENGINE_DB_ENV_KEYS,
)
backupFile = dbovirtutils.backup(
dir=oenginecons.FileLocations.OVIRT_ENGINE_DB_BACKUP_DIR,
@@ -248,10 +248,10 @@
self.logger.info(_('Creating/refreshing Engine database schema'))
args = [
oenginecons.FileLocations.OVIRT_ENGINE_DB_SCHMA_TOOL,
- '-s', self.environment[oengcommcons.EngineDBEnv.HOST],
- '-p', str(self.environment[oengcommcons.EngineDBEnv.PORT]),
- '-u', self.environment[oengcommcons.EngineDBEnv.USER],
- '-d', self.environment[oengcommcons.EngineDBEnv.DATABASE],
+ '-s', self.environment[oenginecons.EngineDBEnv.HOST],
+ '-p', str(self.environment[oenginecons.EngineDBEnv.PORT]),
+ '-u', self.environment[oenginecons.EngineDBEnv.USER],
+ '-d', self.environment[oenginecons.EngineDBEnv.DATABASE],
'-l', self.environment[otopicons.CoreEnv.LOG_FILE_NAME],
'-c', 'apply',
]
@@ -271,10 +271,10 @@
oenginecons.FileLocations.OVIRT_ENGINE_DB_MD5_DIR,
'%s-%s.scripts.md5' % (
self.environment[
- oengcommcons.EngineDBEnv.HOST
+ oenginecons.EngineDBEnv.HOST
],
self.environment[
- oengcommcons.EngineDBEnv.DATABASE
+ oenginecons.EngineDBEnv.DATABASE
],
),
),
@@ -284,7 +284,7 @@
args=args,
envAppend={
'DBFUNC_DB_PGPASSFILE': self.environment[
- oengcommcons.EngineDBEnv.PGPASS_FILE
+ oenginecons.EngineDBEnv.PGPASS_FILE
]
},
)
diff --git
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/legacy/osinfo.py
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/legacy/osinfo.py
index e816e22..8b6af51 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/legacy/osinfo.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/legacy/osinfo.py
@@ -50,7 +50,7 @@
stage=plugin.Stages.STAGE_MISC,
condition=lambda self: (
not self.environment[
- oengcommcons.EngineDBEnv.NEW_DATABASE
+ oenginecons.EngineDBEnv.NEW_DATABASE
] and
not self.environment[
osetupcons.CoreEnv.DEVELOPER_MODE
@@ -82,7 +82,7 @@
):
val = vdcoption.VdcOption(
statement=self.environment[
- oengcommcons.EngineDBEnv.STATEMENT
+ oenginecons.EngineDBEnv.STATEMENT
]
).getVdcOption(name=vdco)
@@ -98,7 +98,7 @@
#
vdcoption.VdcOption(
statement=self.environment[
- oengcommcons.EngineDBEnv.STATEMENT
+ oenginecons.EngineDBEnv.STATEMENT
]
).updateVdcOptions(
options=(
diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ca.py
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ca.py
index 4702670..15cb3d6 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ca.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ca.py
@@ -327,7 +327,7 @@
)
def miscOptions(self):
vdcoption.VdcOption(
- statement=self.environment[oengcommcons.EngineDBEnv.STATEMENT]
+ statement=self.environment[oenginecons.EngineDBEnv.STATEMENT]
).updateVdcOptions(
options=(
{
diff --git
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/provisioning/postgres.py
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/provisioning/postgres.py
index 8e84284..a06bda5 100644
---
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/provisioning/postgres.py
+++
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/provisioning/postgres.py
@@ -30,6 +30,7 @@
from ovirt_engine_setup import constants as osetupcons
from ovirt_engine_setup.engine_common \
import constants as oengcommcons
+from ovirt_engine_setup.engine import engineconstants as oenginecons
from ovirt_engine_setup import dialog
from ovirt_engine_setup.engine_common import postgres
@@ -44,8 +45,8 @@
self._renamedDBResources = False
self._provisioning = postgres.Provisioning(
plugin=self,
- dbenvkeys=oengcommcons.Const.ENGINE_DB_ENV_KEYS,
- defaults=oengcommcons.Const.DEFAULT_ENGINE_DB_ENV_KEYS,
+ dbenvkeys=oenginecons.Const.ENGINE_DB_ENV_KEYS,
+ defaults=oenginecons.Const.DEFAULT_ENGINE_DB_ENV_KEYS,
)
@plugin.event(
@@ -67,7 +68,7 @@
osetupcons.CoreEnv.DEVELOPER_MODE
] and
self.environment[
- oengcommcons.EngineDBEnv.NEW_DATABASE
+ oenginecons.EngineDBEnv.NEW_DATABASE
]
),
)
@@ -104,9 +105,9 @@
default=True,
)
if local:
- self.environment[oengcommcons.EngineDBEnv.HOST] = 'localhost'
+ self.environment[oenginecons.EngineDBEnv.HOST] = 'localhost'
self.environment[
- oengcommcons.EngineDBEnv.PORT
+ oenginecons.EngineDBEnv.PORT
] = oengcommcons.Defaults.DEFAULT_DB_PORT
# TODO:
@@ -147,7 +148,7 @@
stage=plugin.Stages.STAGE_CUSTOMIZATION,
priority=plugin.Stages.PRIORITY_LAST,
condition=lambda self: self.environment[
- oengcommcons.EngineDBEnv.HOST
+ oenginecons.EngineDBEnv.HOST
] == 'localhost',
)
def _customization_firewall(self):
@@ -197,10 +198,10 @@
' Database user name: {user}\n'
).format(
database=self.environment[
- oengcommcons.EngineDBEnv.DATABASE
+ oenginecons.EngineDBEnv.DATABASE
],
user=self.environment[
- oengcommcons.EngineDBEnv.USER
+ oenginecons.EngineDBEnv.USER
],
)
)
diff --git
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/nfs.py
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/nfs.py
index 392cf56..c2abf86 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/nfs.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/nfs.py
@@ -120,7 +120,7 @@
oenginecons.SystemEnv.NFS_CONFIG_ENABLED_LEGACY_IN_POSTINSTALL
]
):
- if not self.environment[oengcommcons.EngineDBEnv.NEW_DATABASE]:
+ if not self.environment[oenginecons.EngineDBEnv.NEW_DATABASE]:
self.environment[
oenginecons.SystemEnv.NFS_CONFIG_ENABLED
] = False
diff --git
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/asynctasks.py
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/asynctasks.py
index 9fd9b9d..79397bb 100644
---
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/asynctasks.py
+++
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/asynctasks.py
@@ -127,10 +127,10 @@
args=(
oenginecons.FileLocations.OVIRT_ENGINE_TASKCLEANER,
'-l', self.environment[otopicons.CoreEnv.LOG_FILE_NAME],
- '-u', self.environment[oengcommcons.EngineDBEnv.USER],
- '-s', self.environment[oengcommcons.EngineDBEnv.HOST],
- '-p', str(self.environment[oengcommcons.EngineDBEnv.PORT]),
- '-d', self.environment[oengcommcons.EngineDBEnv.DATABASE],
+ '-u', self.environment[oenginecons.EngineDBEnv.USER],
+ '-s', self.environment[oenginecons.EngineDBEnv.HOST],
+ '-p', str(self.environment[oenginecons.EngineDBEnv.PORT]),
+ '-d', self.environment[oenginecons.EngineDBEnv.DATABASE],
'-R',
'-A',
'-J',
@@ -139,7 +139,7 @@
raiseOnError=False,
envAppend={
'DBFUNC_DB_PGPASSFILE': self.environment[
- oengcommcons.EngineDBEnv.PGPASS_FILE
+ oenginecons.EngineDBEnv.PGPASS_FILE
]
},
)
@@ -244,7 +244,7 @@
def _checkRunningTasks(self):
dbstatement = database.Statement(
- dbenvkeys=oengcommcons.Const.ENGINE_DB_ENV_KEYS,
+ dbenvkeys=oenginecons.Const.ENGINE_DB_ENV_KEYS,
environment=self.environment,
)
return (
@@ -310,7 +310,7 @@
def _validateEnv(self):
self._enabled = (
not self.environment[
- oengcommcons.EngineDBEnv.NEW_DATABASE
+ oenginecons.EngineDBEnv.NEW_DATABASE
] and
self.environment[
oenginecons.AsyncTasksEnv.CLEAR_TASKS
@@ -343,7 +343,7 @@
if runningTasks or compensations:
self._askUserToStopTasks(runningTasks, compensations)
dbstatement = database.Statement(
- dbenvkeys=oengcommcons.Const.ENGINE_DB_ENV_KEYS,
+ dbenvkeys=oenginecons.Const.ENGINE_DB_ENV_KEYS,
environment=self.environment,
)
try:
diff --git
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/dbvalidations.py
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/dbvalidations.py
index 4238e0f..d38df2b 100644
---
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/dbvalidations.py
+++
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/dbvalidations.py
@@ -43,22 +43,22 @@
oenginecons.FileLocations.OVIRT_ENGINE_DB_VALIDATOR,
'--user={user}'.format(
user=self.environment[
- oengcommcons.EngineDBEnv.USER
+ oenginecons.EngineDBEnv.USER
],
),
'--host={host}'.format(
host=self.environment[
- oengcommcons.EngineDBEnv.HOST
+ oenginecons.EngineDBEnv.HOST
],
),
'--port={port}'.format(
port=self.environment[
- oengcommcons.EngineDBEnv.PORT
+ oenginecons.EngineDBEnv.PORT
],
),
'--database={database}'.format(
database=self.environment[
- oengcommcons.EngineDBEnv.DATABASE
+ oenginecons.EngineDBEnv.DATABASE
],
),
'--log={logfile}'.format(
@@ -75,7 +75,7 @@
raiseOnError=False,
envAppend={
'DBFUNC_DB_PGPASSFILE': self.environment[
- oengcommcons.EngineDBEnv.PGPASS_FILE
+ oenginecons.EngineDBEnv.PGPASS_FILE
]
},
)
@@ -103,7 +103,7 @@
)
def _init(self):
self.environment.setdefault(
- oengcommcons.EngineDBEnv.FIX_DB_VIOLATIONS,
+ oenginecons.EngineDBEnv.FIX_DB_VIOLATIONS,
None
)
@@ -115,7 +115,7 @@
oengcommcons.Stages.DB_CREDENTIALS_AVAILABLE_EARLY,
),
condition=lambda self: not self.environment[
- oengcommcons.EngineDBEnv.NEW_DATABASE
+ oenginecons.EngineDBEnv.NEW_DATABASE
],
)
def _validation(self):
@@ -125,7 +125,7 @@
violations, issues_found = self._checkDb()
if issues_found:
if self.environment[
- oengcommcons.EngineDBEnv.FIX_DB_VIOLATIONS
+ oenginecons.EngineDBEnv.FIX_DB_VIOLATIONS
] is None:
self.logger.warn(
_(
@@ -136,7 +136,7 @@
),
)
self.environment[
- oengcommcons.EngineDBEnv.FIX_DB_VIOLATIONS
+ oenginecons.EngineDBEnv.FIX_DB_VIOLATIONS
] = self.dialog.queryBoolean(
dialog=self.dialog,
name='OVESETUP_FIX_DB_VALIDATIONS',
@@ -149,7 +149,7 @@
)
if not self.environment[
- oengcommcons.EngineDBEnv.FIX_DB_VIOLATIONS
+ oenginecons.EngineDBEnv.FIX_DB_VIOLATIONS
]:
raise RuntimeError(
_(
@@ -161,7 +161,7 @@
@plugin.event(
stage=plugin.Stages.STAGE_EARLY_MISC,
condition=lambda self: self.environment[
- oengcommcons.EngineDBEnv.FIX_DB_VIOLATIONS
+ oenginecons.EngineDBEnv.FIX_DB_VIOLATIONS
],
)
def _misc(self):
--
To view, visit http://gerrit.ovirt.org/28646
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I18e59fcd518cac357a208e6e7f501cea5a528c38
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yedidyah Bar David <d...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
