Sandro Bonazzola has uploaded a new change for review. Change subject: packaging: cleanups ......................................................................
packaging: cleanups - Aligned Requires with 1.1 branch - Added missing BuildRequire on vdsm-cli needed for %check - Fixed PEP8 issues detected by python-pep8-1.5.6-3 Change-Id: I5b77dd51b58ef2986cca95f51a15c3df2870faa8 Signed-off-by: Sandro Bonazzola <[email protected]> --- M ovirt-hosted-engine-ha.spec.in M ovirt_hosted_engine_ha/agent/states.py M ovirt_hosted_engine_ha/broker/listener.py M ovirt_hosted_engine_ha/lib/storage_backends.py 4 files changed, 26 insertions(+), 19 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-hosted-engine-ha refs/changes/60/28860/1 diff --git a/ovirt-hosted-engine-ha.spec.in b/ovirt-hosted-engine-ha.spec.in index 3297db6..f3f2c67 100644 --- a/ovirt-hosted-engine-ha.spec.in +++ b/ovirt-hosted-engine-ha.spec.in @@ -1,6 +1,6 @@ # # ovirt-hosted-engine-ha -- ovirt hosted engine high availability -# Copyright (C) 2012-2013 Red Hat, Inc. +# Copyright (C) 2012-2014 Red Hat, Inc. # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -50,13 +50,14 @@ Requires: python-daemon Requires: sanlock >= 2.8 Requires: sanlock-python >= 2.8 -Requires: vdsm >= 4.12.2 -Requires: vdsm-cli >= 4.12.2 -Requires: vdsm-python >= 4.12.2 +Requires: vdsm >= 4.14.0 +Requires: vdsm-cli >= 4.14.0 +Requires: vdsm-python >= 4.14.0 BuildRequires: python2-devel BuildRequires: python-nose BuildRequires: python-mock +BuildRequires: vdsm-cli >= 4.14.0 %if 0%{?with_systemd} %systemd_requires diff --git a/ovirt_hosted_engine_ha/agent/states.py b/ovirt_hosted_engine_ha/agent/states.py index eb2d497..a75994d 100644 --- a/ovirt_hosted_engine_ha/agent/states.py +++ b/ovirt_hosted_engine_ha/agent/states.py @@ -698,8 +698,9 @@ :type new_data: HostedEngineData :type logger: logging.Logger """ - return new_data._replace(migration_result= - fsm.actions.MONITOR_MIGRATION()) + return new_data._replace( + migration_result=fsm.actions.MONITOR_MIGRATION() + ) @check_global_maintenance(GlobalMaintenance) @check_local_vm_unknown(UnknownLocalVmState) diff --git a/ovirt_hosted_engine_ha/broker/listener.py b/ovirt_hosted_engine_ha/broker/listener.py index 542ca98..dce1848 100644 --- a/ovirt_hosted_engine_ha/broker/listener.py +++ b/ovirt_hosted_engine_ha/broker/listener.py @@ -1,6 +1,6 @@ # # ovirt-hosted-engine-ha -- ovirt hosted engine high availability -# Copyright (C) 2013 Red Hat, Inc. +# Copyright (C) 2013-2014 Red Hat, Inc. # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -327,26 +327,31 @@ to a thread and uses this to track monitors accordingly. """ with self.server.sp_listener.conn_monitors_access_lock: - self.server.sp_listener.conn_monitors[threading - .current_thread().ident] = [] + self.server.sp_listener.conn_monitors[ + threading.current_thread().ident + ] = [] def _get_monitors_for_conn(self): with self.server.sp_listener.conn_monitors_access_lock: - ret = self.server.sp_listener.conn_monitors[threading - .current_thread().ident] + ret = self.server.sp_listener.conn_monitors[ + threading.current_thread().ident + ] return ret def _add_monitor_for_conn(self, id): with self.server.sp_listener.conn_monitors_access_lock: - self.server.sp_listener.conn_monitors[threading - .current_thread().ident].append(id) + self.server.sp_listener.conn_monitors[ + threading.current_thread().ident + ].append(id) def _remove_monitor_for_conn(self, id): with self.server.sp_listener.conn_monitors_access_lock: - self.server.sp_listener.conn_monitors[threading - .current_thread().ident].remove(id) + self.server.sp_listener.conn_monitors[ + threading.current_thread().ident + ].remove(id) def _remove_monitor_conn_entry(self): with self.server.sp_listener.conn_monitors_access_lock: - del self.server.sp_listener.conn_monitors[threading - .current_thread().ident] + del self.server.sp_listener.conn_monitors[ + threading.current_thread().ident + ] diff --git a/ovirt_hosted_engine_ha/lib/storage_backends.py b/ovirt_hosted_engine_ha/lib/storage_backends.py index 8ac0784..29970a8 100644 --- a/ovirt_hosted_engine_ha/lib/storage_backends.py +++ b/ovirt_hosted_engine_ha/lib/storage_backends.py @@ -217,8 +217,8 @@ """ super(VdsmBackend, self).__init__() self._services = \ - dict(map - ( + dict( + map( lambda (service, device): (service, self.Device.device_from_str(device)), activate_devices.items() -- To view, visit http://gerrit.ovirt.org/28860 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5b77dd51b58ef2986cca95f51a15c3df2870faa8 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-hosted-engine-ha Gerrit-Branch: master Gerrit-Owner: Sandro Bonazzola <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
