External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-13 12:27:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Attempting to fix py2 test issues

Browse Source
This commit is contained in:
John Westcott IV
2020-04-29 10:05:04 -04:00
committed by AlanCoding
parent 4321c63165
commit 31a11cf6bb
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,7 +33,7 @@ class ItemNotDefined(Exception):
class TowerModule(AnsibleModule): class TowerModule(AnsibleModule):
# This gets set by the make process so whatever is in here is irrelevant # This gets set by the make process so whatever is in here is irrelevant
_COLLECTION_VERSION = "11.0.0" _COLLECTION_VERSION = "11.1.0"
_COLLECTION_TYPE = "awx" _COLLECTION_TYPE = "awx"
# This maps the collections type (awx/tower) to the values returned by the API # This maps the collections type (awx/tower) to the values returned by the API
# Those values can be found in awx/api/generics.py line 204 # Those values can be found in awx/api/generics.py line 204
@@ -338,6 +338,9 @@ class TowerModule(AnsibleModule):
if headers.get('Content-Type', '') == 'application/json': if headers.get('Content-Type', '') == 'application/json':
data = dumps(kwargs.get('data', {})) data = dumps(kwargs.get('data', {}))
with open('/tmp/john', 'w') as f:
f.write("{}".format(self.url.geturl()))
try: try:
response = self.session.open(method, self.url.geturl(), headers=headers, validate_certs=self.verify_ssl, follow_redirects=True, data=data) response = self.session.open(method, self.url.geturl(), headers=headers, validate_certs=self.verify_ssl, follow_redirects=True, data=data)
except(SSLValidationError) as ssl_err: except(SSLValidationError) as ssl_err:
@@ -385,8 +388,15 @@ class TowerModule(AnsibleModule):
self.url = self.url._replace(query=None) self.url = self.url._replace(query=None)
if not self.version_checked: if not self.version_checked:
tower_type = response.getheader('X-API-Product-Name', None) # In PY2 we get back an HTTPResponse object but PY2 is returning an addinfourl
tower_version = response.getheader('X-API-Product-Version', None) # First try to get the headers in PY3 format and then drop down to PY2.
try:
tower_type = response.getheader('X-API-Product-Name', None)
tower_version = response.getheader('X-API-Product-Version', None)
except Exception:
tower_type = response.info().getheader('X-API-Product-Name', None)
tower_version = response.info().getheader('X-API-Product-Version', None)
if self._COLLECTION_TYPE not in self.collection_to_version or self.collection_to_version[self._COLLECTION_TYPE] != tower_type: 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.warn("You are using the {0} version of this collection but connecting to {1}".format(
self._COLLECTION_TYPE, tower_type self._COLLECTION_TYPE, tower_type