diff options
author | Luke Meyer <lmeyer@redhat.com> | 2018-01-17 10:24:14 -0500 |
---|---|---|
committer | Luke Meyer <lmeyer@redhat.com> | 2018-01-17 11:01:27 -0500 |
commit | b4b5b685581a6c4b35953bf32d56c1f96b12ff51 (patch) | |
tree | 307dbaeef9bc0f7db07154b71d3fef218db7e2ce /roles/openshift_health_checker/openshift_checks/package_version.py | |
parent | 9f461f2ad2b11ca87ef1ce6ee381ccf31b703fc8 (diff) | |
download | openshift-b4b5b685581a6c4b35953bf32d56c1f96b12ff51.tar.gz openshift-b4b5b685581a6c4b35953bf32d56c1f96b12ff51.tar.bz2 openshift-b4b5b685581a6c4b35953bf32d56c1f96b12ff51.tar.xz openshift-b4b5b685581a6c4b35953bf32d56c1f96b12ff51.zip |
health checks: factor out get_required_version
Diffstat (limited to 'roles/openshift_health_checker/openshift_checks/package_version.py')
-rw-r--r-- | roles/openshift_health_checker/openshift_checks/package_version.py | 34 |
1 files changed, 3 insertions, 31 deletions
diff --git a/roles/openshift_health_checker/openshift_checks/package_version.py b/roles/openshift_health_checker/openshift_checks/package_version.py index 5417a383a..687df5135 100644 --- a/roles/openshift_health_checker/openshift_checks/package_version.py +++ b/roles/openshift_health_checker/openshift_checks/package_version.py @@ -1,6 +1,6 @@ """Check that available RPM packages match the required versions.""" -from openshift_checks import OpenShiftCheck, OpenShiftCheckException +from openshift_checks import OpenShiftCheck from openshift_checks.mixins import NotContainerizedMixin @@ -76,36 +76,8 @@ class PackageVersion(NotContainerizedMixin, OpenShiftCheck): def get_required_ovs_version(self): """Return the correct Open vSwitch version(s) for the current OpenShift version.""" - openshift_version = self.get_major_minor_version() - - earliest = min(self.openshift_to_ovs_version) - latest = max(self.openshift_to_ovs_version) - if openshift_version < earliest: - return self.openshift_to_ovs_version[earliest] - if openshift_version > latest: - return self.openshift_to_ovs_version[latest] - - ovs_version = self.openshift_to_ovs_version.get(openshift_version) - if not ovs_version: - msg = "There is no recommended version of Open vSwitch for the current version of OpenShift: {}" - raise OpenShiftCheckException(msg.format(".".join(str(comp) for comp in openshift_version))) - - return ovs_version + return self.get_required_version("Open vSwitch", self.openshift_to_ovs_version) def get_required_docker_version(self): """Return the correct Docker version(s) for the current OpenShift version.""" - openshift_version = self.get_major_minor_version() - - earliest = min(self.openshift_to_docker_version) - latest = max(self.openshift_to_docker_version) - if openshift_version < earliest: - return self.openshift_to_docker_version[earliest] - if openshift_version > latest: - return self.openshift_to_docker_version[latest] - - docker_version = self.openshift_to_docker_version.get(openshift_version) - if not docker_version: - msg = "There is no recommended version of Docker for the current version of OpenShift: {}" - raise OpenShiftCheckException(msg.format(".".join(str(comp) for comp in openshift_version))) - - return docker_version + return self.get_required_version("Docker", self.openshift_to_docker_version) |