Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: setup: prefix database related messages with 'Engine' ......................................................................
packaging: setup: prefix database related messages with 'Engine' reduce confusion with other databases we going to have. Change-Id: I7c486ecf94e74cece79ba9260c50ac9ab1ba1d05 Signed-off-by: Alon Bar-Lev <[email protected]> --- M packaging/setup/ovirt_engine_setup/constants.py M packaging/setup/plugins/ovirt-engine-common/base/db/connection.py M packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/db/clear.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/db/connection.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/db/schema.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/dbvalidations.py 6 files changed, 43 insertions(+), 43 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/85/22985/1 diff --git a/packaging/setup/ovirt_engine_setup/constants.py b/packaging/setup/ovirt_engine_setup/constants.py index 6d8ca99..95023ca 100644 --- a/packaging/setup/ovirt_engine_setup/constants.py +++ b/packaging/setup/ovirt_engine_setup/constants.py @@ -715,7 +715,7 @@ @osetupattrs( answerfile=True, summary=True, - description=_('Database host'), + description=_('Engine database host'), ) def HOST(self): return 'OVESETUP_DB/host' @@ -723,7 +723,7 @@ @osetupattrs( answerfile=True, summary=True, - description=_('Datbase port'), + description=_('Engine Datbase port'), ) def PORT(self): return 'OVESETUP_DB/port' @@ -731,7 +731,7 @@ @osetupattrs( answerfile=True, summary=True, - description=_('Database secured connection'), + description=_('Engine database secured connection'), ) def SECURED(self): return 'OVESETUP_DB/secured' @@ -739,7 +739,7 @@ @osetupattrs( answerfile=True, summary=True, - description=_('Database host name validation'), + description=_('Engine database host name validation'), ) def SECURED_HOST_VALIDATION(self): return 'OVESETUP_DB/securedHostValidation' @@ -747,7 +747,7 @@ @osetupattrs( answerfile=True, summary=True, - description=_('Database name'), + description=_('Engine database name'), ) def DATABASE(self): return 'OVESETUP_DB/database' @@ -755,7 +755,7 @@ @osetupattrs( answerfile=True, summary=True, - description=_('Database user name'), + description=_('Engine database user name'), ) def USER(self): return 'OVESETUP_DB/user' diff --git a/packaging/setup/plugins/ovirt-engine-common/base/db/connection.py b/packaging/setup/plugins/ovirt-engine-common/base/db/connection.py index 1b2c02d..4680cbe 100644 --- a/packaging/setup/plugins/ovirt-engine-common/base/db/connection.py +++ b/packaging/setup/plugins/ovirt-engine-common/base/db/connection.py @@ -144,7 +144,7 @@ exc_info=True, ) msg = _( - 'Cannot connect to database using existing ' + 'Cannot connect to Engine database using existing ' 'credentials: {user}@{host}:{port}' ).format( host=dbenv[osetupcons.DBEnv.HOST], 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 9059b16..11a0941 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 @@ -70,10 +70,10 @@ osetupcons.RemoveEnv.REMOVE_DATABASE ] = dialog.queryBoolean( dialog=self.dialog, - name='OVESETUP_REMOVE_DATABASE', + name='OVESETUP_ENGINE_DB_REMOVE', note=_( - 'Do you want to remove Engine DB content? All data will ' - 'be lost (@VALUES@) [@DEFAULT@]: ' + 'Do you want to remove Engine database content? ' + 'All data will be lost (@VALUES@) [@DEFAULT@]: ' ), prompt=True, true=_('Yes'), @@ -98,7 +98,7 @@ dbovirtutils.tryDatabaseConnect() self._bkpfile = dbovirtutils.backup() self.logger.info( - _('Clearing database {database}').format( + _('Clearing Engine database {database}').format( database=self.environment[osetupcons.DBEnv.DATABASE], ) ) @@ -108,7 +108,7 @@ self.logger.debug('exception', exc_info=True) self.logger.warning( _( - 'Cannot clear database: {error}' + 'Cannot clear Engine database: {error}' ).format( error=e, ) @@ -127,10 +127,11 @@ def _closeup(self): self.dialog.note( text=_( - 'A backup of the database is available at {path}' + 'A backup of the Engine database is available at {path}' ).format( path=self._bkpfile ), ) + # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/db/connection.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/db/connection.py index a6435e6..4cc183e 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/db/connection.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/db/connection.py @@ -79,7 +79,7 @@ if encoding.lower() != 'utf8': raise RuntimeError( _( - 'Encoding of the engine database is {encoding}. ' + 'Encoding of the Engine database is {encoding}. ' 'Engine installation is only supported on servers ' 'with default encoding set to UTF8. Please fix the ' 'default DB encoding before you continue' @@ -155,8 +155,8 @@ if host is None: while True: host = self.dialog.queryString( - name='OVESETUP_DB_HOST', - note=_('Database host [@DEFAULT@]: '), + name='OVESETUP_ENGINE_DB_HOST', + note=_('Engine database host [@DEFAULT@]: '), prompt=True, default=osetupcons.Defaults.DEFAULT_DB_HOST, ) @@ -175,8 +175,8 @@ try: port = osetuputil.parsePort( self.dialog.queryString( - name='OVESETUP_DB_PORT', - note=_('Database port [@DEFAULT@]: '), + name='OVESETUP_ENGINE_DB_PORT', + note=_('Engine database port [@DEFAULT@]: '), prompt=True, default=osetupcons.Defaults.DEFAULT_DB_PORT, ) @@ -188,9 +188,9 @@ if secured is None: secured = dialog.queryBoolean( dialog=self.dialog, - name='OVESETUP_DB_SECURED', + name='OVESETUP_ENGINE_DB_SECURED', note=_( - 'Database secured connection (@VALUES@) ' + 'Engine database secured connection (@VALUES@) ' '[@DEFAULT@]: ' ), prompt=True, @@ -203,10 +203,10 @@ if securedHostValidation is None: securedHostValidation = dialog.queryBoolean( dialog=self.dialog, - name='OVESETUP_DB_SECURED_HOST_VALIDATION', + name='OVESETUP_ENGINE_DB_SECURED_HOST_VALIDATION', note=_( - 'Validate host name in secured connection (@VALUES@) ' - '[@DEFAULT@]: ' + 'Engine database host name validation in secured ' + 'connection (@VALUES@) [@DEFAULT@]: ' ), prompt=True, default=True, @@ -214,24 +214,24 @@ if db is None: db = self.dialog.queryString( - name='OVESETUP_DB_DATABASE', - note=_('Database name [@DEFAULT@]: '), + name='OVESETUP_ENGINE_DB_DATABASE', + note=_('Engine database name [@DEFAULT@]: '), prompt=True, default=osetupcons.Defaults.DEFAULT_DB_DATABASE, ) if user is None: user = self.dialog.queryString( - name='OVESETUP_DB_USER', - note=_('Database user [@DEFAULT@]: '), + name='OVESETUP_ENGINE_DB_USER', + note=_('Engine database user [@DEFAULT@]: '), prompt=True, default=osetupcons.Defaults.DEFAULT_DB_USER, ) if password is None: password = self.dialog.queryString( - name='OVESETUP_DB_PASSWORD', - note=_('Database password: '), + name='OVESETUP_ENGINE_DB_PASSWORD', + note=_('Engine database password: '), prompt=True, hidden=True, ) @@ -258,7 +258,7 @@ connectionValid = True except RuntimeError as e: self.logger.error( - _('Cannot connect to database: {error}').format( + _('Cannot connect to Engine database: {error}').format( error=e, ) ) 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 c098c11..1d7a591 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 @@ -46,7 +46,7 @@ self._backup = backup def __str__(self): - return _("Schema Transaction") + return _("Engine schema Transaction") def prepare(self): pass @@ -56,7 +56,7 @@ try: dbovirtutils = database.OvirtUtils(plugin=self._parent) self._parent.logger.info( - _('Clearing database {database}').format( + _('Clearing Engine database {database}').format( database=self._parent.environment[ osetupcons.DBEnv.DATABASE ], @@ -65,7 +65,7 @@ dbovirtutils.clearOvirtEngineDatabase() if self._backup is not None and os.path.exists(self._backup): self._parent.logger.info( - _('Restoring database {database}').format( + _('Restoring Engine database {database}').format( database=self._parent.environment[ osetupcons.DBEnv.DATABASE ], @@ -74,11 +74,11 @@ dbovirtutils.restore(backupFile=self._backup) except Exception as e: self._parent.logger.debug( - 'Exception during database restore', + 'Error during Engine database restore', exc_info=True, ) self._parent.logger.error( - _('Database rollback failed: {error}').format( + _('Engine database rollback failed: {error}').format( error=e, ) ) @@ -127,7 +127,7 @@ if len(result) > 0: raise RuntimeError( _( - 'Cannot upgrade the database schema due to wrong ' + 'Cannot upgrade the Engine database schema due to wrong ' 'ownership of some database entities.\n' 'Please execute: {command}\n' 'Using the password of the "postgres" user.' @@ -217,7 +217,7 @@ ) ) - self.logger.info(_('Creating database schema')) + self.logger.info(_('Creating Engine database schema')) args = [ osetupcons.FileLocations.OVIRT_ENGINE_DB_CREATE, '-l', self.environment[otopicons.CoreEnv.LOG_FILE_NAME], @@ -289,7 +289,7 @@ # consider doing that via python # - self.logger.info(_('Updating database schema')) + self.logger.info(_('Updating Engine database schema')) args = [ osetupcons.FileLocations.OVIRT_ENGINE_DB_UPGRADE, '-s', self.environment[osetupcons.DBEnv.HOST], 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 cbb9908..097a02c 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 @@ -78,7 +78,7 @@ if rc != 0: raise RuntimeError( _( - 'Failed checking DB:\n' + 'Failed checking Engine database:\n' '{output}\n'.format( output=stdout, ) @@ -127,7 +127,7 @@ ) def _validation(self): self.logger.info( - _('Checking the DB consistency') + _('Checking the Engine database consistency') ) violations, issues_found = self._checkDb() if issues_found: @@ -137,7 +137,7 @@ self.logger.warn( _( 'The following inconsistencies were found ' - 'in the DB: {violations}. ' + 'in engine database: {violations}. ' ).format( violations=violations, ), @@ -160,7 +160,6 @@ ]: raise RuntimeError( _( - 'User decided to skip db fix.\n' 'Upgrade aborted, database integrity ' 'cannot be established.' ) @@ -172,7 +171,7 @@ ) def _misc(self): self.logger.info( - _('Fixing DB inconsistencies') + _('Fixing Engine database inconsistencies') ) self._dbUtil(fix=True) -- To view, visit http://gerrit.ovirt.org/22985 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7c486ecf94e74cece79ba9260c50ac9ab1ba1d05 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
