Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: setup: move remove env variables to own class ......................................................................
packaging: setup: move remove env variables to own class Change-Id: I8913a2864cfd850103dd7dd640ca0a65f91e90ab Signed-off-by: Alon Bar-Lev <[email protected]> --- M packaging/setup/ovirt_engine_setup/constants.py M packaging/setup/plugins/ovirt-engine-remove/config/ca.py M packaging/setup/plugins/ovirt-engine-remove/db/clear.py M packaging/setup/plugins/ovirt-engine-remove/files/simple.py 4 files changed, 36 insertions(+), 21 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/47/18247/1 diff --git a/packaging/setup/ovirt_engine_setup/constants.py b/packaging/setup/ovirt_engine_setup/constants.py index 88eda30..edef9dd 100644 --- a/packaging/setup/ovirt_engine_setup/constants.py +++ b/packaging/setup/ovirt_engine_setup/constants.py @@ -613,9 +613,7 @@ UNINSTALL_UNREMOVABLE_FILES = 'OVESETUP_CORE/uninstallUnremovableFiles' FILE_GROUP_PREFIX = 'OVESETUP_CORE_MODIFIED_FILE_GROUP/' LINES_GROUP_PREFIX = 'OVESETUP_CORE_MODIFIED_LINES_GROUP/' - UNINSTALL_ENABLED_FILE_GROUPS = 'OVESETUP_CORE/uninstallEnabledFileGroups' REGISTER_UNINSTALL_GROUPS = 'OVESETUP_CORE/registerUninstallGroups' - CONFIRM_UNINSTALL_GROUPS = 'OVESETUP_CORE/confirmUninstallGroups' UPGRADE_SUPPORTED_VERSIONS = 'OVESETUP_CORE/upgradeSupportedVersions' UPGRADE_FROM_LEGACY = 'OVESETUP_CORE/upgradeFromLegacy' ACTION = 'OVESETUP_CORE/action' @@ -714,12 +712,6 @@ STATEMENT = 'OVESETUP_DB/statement' PGPASS_FILE = 'OVESETUP_DB/pgPassFile' NEW_DATABASE = 'OVESETUP_DB/newDatabase' - - @osetupattrs( - answerfile=True, - ) - def REMOVE_EMPTY_DATABASE(self): - return 'OVESETUP_DB/cleanupRemove' @osetupattrs( answerfile=True, @@ -988,6 +980,29 @@ @util.export @util.codegen @osetupattrsclass +class RemoveEnv(object): + @osetupattrs( + answerfile=True, + ) + def ASK_GROUPS(self): + return 'OVESETUP_REMOVE/confirmUninstallGroups' + + @osetupattrs( + answerfile=True, + ) + def REMOVE_GROUPS(self): + return 'OVESETUP_REMOVE/enabledFileGroups' + + @osetupattrs( + answerfile=True, + ) + def REMOVE_DATABASE(self): + return 'OVESETUP_REMOVE/database' + + [email protected] [email protected] +@osetupattrsclass class AIOEnv(object): ENABLE = 'OVESETUP_AIO/enable' diff --git a/packaging/setup/plugins/ovirt-engine-remove/config/ca.py b/packaging/setup/plugins/ovirt-engine-remove/config/ca.py index c83c33f..317ba59 100644 --- a/packaging/setup/plugins/ovirt-engine-remove/config/ca.py +++ b/packaging/setup/plugins/ovirt-engine-remove/config/ca.py @@ -48,7 +48,7 @@ condition=lambda self: 'ca_pki' in [ x.strip() for x in self.environment[ - osetupcons.CoreEnv.UNINSTALL_ENABLED_FILE_GROUPS + osetupcons.RemoveEnv.REMOVE_GROUPS ].split(',') if x ], diff --git a/packaging/setup/plugins/ovirt-engine-remove/db/clear.py b/packaging/setup/plugins/ovirt-engine-remove/db/clear.py index d932844..9fd9f11 100644 --- a/packaging/setup/plugins/ovirt-engine-remove/db/clear.py +++ b/packaging/setup/plugins/ovirt-engine-remove/db/clear.py @@ -44,7 +44,7 @@ ) def _init(self): self.environment.setdefault( - osetupcons.DBEnv.REMOVE_EMPTY_DATABASE, + osetupcons.RemoveEnv.REMOVE_DATABASE, None ) self._bkpfile = None @@ -54,13 +54,13 @@ ) def _customization(self): if self.environment[ - osetupcons.DBEnv.REMOVE_EMPTY_DATABASE + osetupcons.RemoveEnv.REMOVE_DATABASE ] is None: self.environment[ - osetupcons.DBEnv.REMOVE_EMPTY_DATABASE + osetupcons.RemoveEnv.REMOVE_DATABASE ] = dialog.queryBoolean( dialog=self.dialog, - name='OVESETUP_DB_REMOVE', + name='OVESETUP_REMOVE_DATABASE', note=_( 'Do you want to remove Engine DB content? All data will ' 'be lost (@VALUES@) [@DEFAULT@]: ' @@ -75,7 +75,7 @@ stage=plugin.Stages.STAGE_MISC, condition=lambda self: ( self.environment[osetupcons.DBEnv.PASSWORD] is not None and - self.environment[osetupcons.DBEnv.REMOVE_EMPTY_DATABASE] + self.environment[osetupcons.RemoveEnv.REMOVE_DATABASE] ), after=( osetupcons.Stages.DB_CREDENTIALS_AVAILABLE_LATE, diff --git a/packaging/setup/plugins/ovirt-engine-remove/files/simple.py b/packaging/setup/plugins/ovirt-engine-remove/files/simple.py index 3f27b40..da84e4d 100644 --- a/packaging/setup/plugins/ovirt-engine-remove/files/simple.py +++ b/packaging/setup/plugins/ovirt-engine-remove/files/simple.py @@ -95,11 +95,11 @@ ) def _init(self): self.environment.setdefault( - osetupcons.CoreEnv.UNINSTALL_ENABLED_FILE_GROUPS, + osetupcons.RemoveEnv.REMOVE_GROUPS, '' ) self.environment.setdefault( - osetupcons.CoreEnv.CONFIRM_UNINSTALL_GROUPS, + osetupcons.RemoveEnv.ASK_GROUPS, True ) self._infos = sorted( @@ -116,7 +116,7 @@ ) def _customization(self): interactive = self.environment[ - osetupcons.CoreEnv.CONFIRM_UNINSTALL_GROUPS + osetupcons.RemoveEnv.ASK_GROUPS ] unremovable = {} already_asked = [] @@ -163,8 +163,8 @@ ) if add_group: self.environment[ - osetupcons.CoreEnv. - UNINSTALL_ENABLED_FILE_GROUPS + osetupcons.RemoveEnv. + REMOVE_GROUPS ] += ',' + group def getFiles(section): @@ -197,7 +197,7 @@ for uninstall_group in [ x.strip() for x in self.environment[ - osetupcons.CoreEnv.UNINSTALL_ENABLED_FILE_GROUPS + osetupcons.RemoveEnv.REMOVE_GROUPS ].split(',') if x.strip() ]: @@ -268,7 +268,7 @@ uninstalled_groups = set([ x.strip() for x in self.environment[ - osetupcons.CoreEnv.UNINSTALL_ENABLED_FILE_GROUPS + osetupcons.RemoveEnv.REMOVE_GROUPS ].split(',') if x.strip() ]) -- To view, visit http://gerrit.ovirt.org/18247 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8913a2864cfd850103dd7dd640ca0a65f91e90ab Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.3 Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
