Skip to content

Commit

Permalink
Fix connection error reporting (ansible#40758)
Browse files Browse the repository at this point in the history
The variables used for reporting errors were incorrect. Additionally,
the fetching of connection related params was using an old format.
  • Loading branch information
caphrim007 committed May 27, 2018
1 parent 547a1ed commit dc08bca
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
5 changes: 2 additions & 3 deletions lib/ansible/module_utils/network/f5/bigip.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def api(self):
if self._client:
return self._client

for x in range(0, 60):
for x in range(0, 10):
try:
result = ManagementRoot(
self.provider['server'],
Expand All @@ -53,7 +53,7 @@ def api(self):
exc = ex
time.sleep(1)
error = 'Unable to connect to {0} on port {1}.'.format(
self.params['server'], self.params['server_port']
self.provider['server'], self.provider['server_port']
)

if exc is not None:
Expand All @@ -71,7 +71,6 @@ def api(self):
exc = None
if self._client:
return self._client

for x in range(0, 10):
try:
url = "https://{0}:{1}/mgmt/shared/authn/login".format(
Expand Down
27 changes: 14 additions & 13 deletions lib/ansible/module_utils/network/f5/bigiq.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,32 +29,33 @@


class F5Client(F5BaseClient):
def __init__(self, *args, **kwargs):
super(F5Client, self).__init__(*args, **kwargs)
self.provider = self.merge_provider_params()

@property
def api(self):
exc = None
if self._client:
return self._client
for x in range(0, 3):
for x in range(0, 10):
try:
server = self.params['provider']['server'] or self.params['server']
user = self.params['provider']['user'] or self.params['user']
password = self.params['provider']['password'] or self.params['password']
server_port = self.params['provider']['server_port'] or self.params['server_port'] or 443
validate_certs = self.params['provider']['validate_certs'] or self.params['validate_certs']

result = ManagementRoot(
server,
user,
password,
port=server_port,
verify=validate_certs
self.provider['server'],
self.provider['user'],
self.provider['password'],
port=self.provider['server_port'],
verify=self.provider['validate_certs']
)
self._client = result
return self._client
except Exception as ex:
exc = ex
time.sleep(1)
error = 'Unable to connect to {0} on port {1}.'.format(self.params['server'], self.params['server_port'])
error = 'Unable to connect to {0} on port {1}.'.format(
self.provider['server'], self.provider['server_port']
)

if exc is not None:
error += ' The reported error was "{0}".'.format(str(exc))
raise F5ModuleError(error)
Expand Down

0 comments on commit dc08bca

Please sign in to comment.