External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-01 01:28:09 -03:30
Code Issues Packages Projects Releases Wiki Activity

Use distutils instead of semver, add/update unit tests

Browse Source
This commit is contained in:
beeankha
2021-03-23 12:17:59 -04:00
parent b2665c084e
commit e2b290ff99
3 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
awx_collection/plugins/module_utils/tower_api.py
View File

@@ -7,7 +7,7 @@ from ansible.module_utils.urls import Request, SSLValidationError, ConnectionErr
from ansible.module_utils.six import PY2
from ansible.module_utils.six.moves.urllib.error import HTTPError
from ansible.module_utils.six.moves.http_cookiejar import CookieJar
import semver
from distutils.version import LooseVersion as Version
import time
from json import loads, dumps
@@ -260,17 +260,13 @@ class TowerAPIModule(TowerModule):
tower_type = response.info().getheader('X-API-Product-Name', None)
tower_version = response.info().getheader('X-API-Product-Version', None)
semver_collection_version = semver.VersionInfo.parse(self._COLLECTION_VERSION)
semver_tower_version = semver.VersionInfo.parse(tower_version)
collection_major = Version(self._COLLECTION_VERSION).version[0]
tower_major = Version(tower_version).version[0]
if self._COLLECTION_TYPE not in self.collection_to_version or self.collection_to_version[self._COLLECTION_TYPE] != tower_type:
self.warn("You are using the {0} version of this collection but connecting to {1}".format(
self._COLLECTION_TYPE, tower_type
))
elif semver_collection_version.major != semver_tower_version.major:
self.warn("You are running collection version {0} but connecting to tower version {1}".format(
self._COLLECTION_VERSION, tower_version
))
self.warn("You are using the {0} version of this collection but connecting to {1}".format(self._COLLECTION_TYPE, tower_type))
elif collection_major != tower_major:
self.warn("You are running collection version {0} but connecting to tower version {1}".format(self._COLLECTION_VERSION, tower_version))
self.version_checked = True
response_body = ''