Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: pythonlib: adopt utils procesTemplate and escape ......................................................................
packaging: pythonlib: adopt utils procesTemplate and escape Change-Id: I842f44ca4915e892074b75e2349ad8ab761f773d Signed-off-by: Alon Bar-Lev <[email protected]> --- M packaging/pythonlib/ovirt_engine/util.py M packaging/setup/ovirt_engine_setup/util.py M packaging/setup/plugins/ovirt-engine-common/base/db/pgpass.py M packaging/setup/plugins/ovirt-engine-common/base/network/firewall_manager_iptables.py M packaging/setup/plugins/ovirt-engine-common/base/network/process_firewalld_services.py M packaging/setup/plugins/ovirt-engine-rename/core/pki.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/ovirt_engine.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/ca.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/database.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ca.py 10 files changed, 55 insertions(+), 37 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/27/22827/1 diff --git a/packaging/pythonlib/ovirt_engine/util.py b/packaging/pythonlib/ovirt_engine/util.py index 23d24bd..87e3433 100644 --- a/packaging/pythonlib/ovirt_engine/util.py +++ b/packaging/pythonlib/ovirt_engine/util.py @@ -40,4 +40,24 @@ return o +@export +def escape(s, chars): + ret = '' + for c in s: + if c in chars: + ret += '\\' + ret += c + return ret + + +@export +def processTemplate(template, subst={}): + content = '' + with open(template, 'r') as f: + content = f.read() + for k, v in subst.items(): + content = content.replace(str(k), str(v)) + return content + + # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/packaging/setup/ovirt_engine_setup/util.py b/packaging/setup/ovirt_engine_setup/util.py index 74e7c36..c777133 100644 --- a/packaging/setup/ovirt_engine_setup/util.py +++ b/packaging/setup/ovirt_engine_setup/util.py @@ -30,16 +30,6 @@ @util.export -def processTemplate(template, subst={}): - content = '' - with open(template, 'r') as f: - content = f.read() - for k, v in subst.items(): - content = content.replace(str(k), str(v)) - return content - - [email protected] def editConfigContent( content, params, @@ -216,16 +206,6 @@ ) ) return port - - [email protected] -def escape(s, chars): - ret = '' - for c in s: - if c in chars: - ret += '\\' - ret += c - return ret # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/packaging/setup/plugins/ovirt-engine-common/base/db/pgpass.py b/packaging/setup/plugins/ovirt-engine-common/base/db/pgpass.py index 5ae517c..6ac350c 100644 --- a/packaging/setup/plugins/ovirt-engine-common/base/db/pgpass.py +++ b/packaging/setup/plugins/ovirt-engine-common/base/db/pgpass.py @@ -29,8 +29,10 @@ from otopi import plugin +from ovirt_engine import util as outil + + from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup import util as osetuputil @util.export @@ -69,7 +71,7 @@ port=self.environment[osetupcons.DBEnv.PORT], database=self.environment[osetupcons.DBEnv.DATABASE], user=self.environment[osetupcons.DBEnv.USER], - password=osetuputil.escape( + password=outil.escape( self.environment[osetupcons.DBEnv.PASSWORD], ':\\', ), diff --git a/packaging/setup/plugins/ovirt-engine-common/base/network/firewall_manager_iptables.py b/packaging/setup/plugins/ovirt-engine-common/base/network/firewall_manager_iptables.py index 711b0bf..650a3f0 100644 --- a/packaging/setup/plugins/ovirt-engine-common/base/network/firewall_manager_iptables.py +++ b/packaging/setup/plugins/ovirt-engine-common/base/network/firewall_manager_iptables.py @@ -29,8 +29,11 @@ from otopi import constants as otopicons from otopi import filetransaction + +from ovirt_engine import util as outil + + from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup import util as osetuputil from ovirt_engine_setup import firewall_manager_base @@ -49,7 +52,7 @@ def _get_rules(self): if self._rules is None: - self._rules = osetuputil.processTemplate( + self._rules = outil.processTemplate( osetupcons.FileLocations.OVIRT_IPTABLES_DEFAULT, subst={ '@CUSTOM_RULES@': ( diff --git a/packaging/setup/plugins/ovirt-engine-common/base/network/process_firewalld_services.py b/packaging/setup/plugins/ovirt-engine-common/base/network/process_firewalld_services.py index 0f40b8f..c3e11b8 100644 --- a/packaging/setup/plugins/ovirt-engine-common/base/network/process_firewalld_services.py +++ b/packaging/setup/plugins/ovirt-engine-common/base/network/process_firewalld_services.py @@ -31,8 +31,10 @@ from otopi import constants as otopicons +from ovirt_engine import util as outil + + from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup import util as osetuputil @util.export @@ -62,7 +64,7 @@ self.environment[ otopicons.NetEnv.FIREWALLD_SERVICE_PREFIX + service['name'] - ] = osetuputil.processTemplate( + ] = outil.processTemplate( template=os.path.join( osetupcons.FileLocations.OVIRT_FIREWALLD_CONFIG, service['directory'], diff --git a/packaging/setup/plugins/ovirt-engine-rename/core/pki.py b/packaging/setup/plugins/ovirt-engine-rename/core/pki.py index e932e17..3bbf981 100644 --- a/packaging/setup/plugins/ovirt-engine-rename/core/pki.py +++ b/packaging/setup/plugins/ovirt-engine-rename/core/pki.py @@ -35,8 +35,10 @@ from otopi import filetransaction +from ovirt_engine import util as outil + + from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup import util as osetuputil from ovirt_engine_setup import dialog @@ -270,7 +272,7 @@ self.environment[osetupcons.PKIEnv.STORE_PASS], ), '--subject=%s' % '/' + '/'.join( - osetuputil.escape(s, '/\\') + outil.escape(s, '/\\') for s in subject.as_text( flags=XN_FLAG_SEP_MULTILINE, ).splitlines() diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/ovirt_engine.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/ovirt_engine.py index 2634283..319807a 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/ovirt_engine.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/ovirt_engine.py @@ -29,8 +29,10 @@ from otopi import plugin +from ovirt_engine import util as outil + + from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup import util as osetuputil @util.export @@ -62,7 +64,7 @@ name=self.environment[ osetupcons.ApacheEnv.HTTPD_CONF_OVIRT_ENGINE ], - content=osetuputil.processTemplate( + content=outil.processTemplate( template=( osetupcons.FileLocations. HTTPD_CONF_OVIRT_ENGINE_TEMPLATE diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/ca.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/ca.py index e741983..86b8dcf 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/ca.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/ca.py @@ -29,8 +29,10 @@ from otopi import plugin +from ovirt_engine import util as outil + + from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup import util as osetuputil @util.export @@ -100,7 +102,7 @@ osetupcons.FileLocations. OVIRT_ENGINE_PKI_ENGINE_TRUST_STORE ), - trust_store_password=osetuputil.escape( + trust_store_password=outil.escape( osetupcons.Const.PKI_PASSWORD, '"\\$', ), @@ -108,7 +110,7 @@ osetupcons.FileLocations. OVIRT_ENGINE_PKI_ENGINE_STORE ), - engine_store_password=osetuputil.escape( + engine_store_password=outil.escape( osetupcons.Const.PKI_PASSWORD, '"\\$', ), 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 206bd23..3c2e94b 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 @@ -29,8 +29,10 @@ from otopi import plugin +from ovirt_engine import util as outil + + from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup import util as osetuputil @util.export @@ -80,7 +82,7 @@ host=self.environment[osetupcons.DBEnv.HOST], port=self.environment[osetupcons.DBEnv.PORT], user=self.environment[osetupcons.DBEnv.USER], - password=osetuputil.escape( + password=outil.escape( self.environment[osetupcons.DBEnv.PASSWORD], '"\\$', ), 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 2f42639..5cd1648 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 @@ -36,6 +36,9 @@ from otopi import constants as otopicons +from ovirt_engine import util as outil + + from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup import util as osetuputil @@ -66,7 +69,7 @@ pass def _subjectComponentEscape(self, s): - return osetuputil.escape(s, '/\\') + return outil.escape(s, '/\\') def __init__(self, context): super(Plugin, self).__init__(context=context) @@ -184,7 +187,7 @@ localtransaction.append( filetransaction.FileTransaction( name=name[:-len('.in')], - content=osetuputil.processTemplate( + content=outil.processTemplate( name, { '@AIA@': 'http://%s:%s%s' % ( -- To view, visit http://gerrit.ovirt.org/22827 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I842f44ca4915e892074b75e2349ad8ab761f773d 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
