ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Adds better error handling to f5 api connections (#35020)

Browse source 
Previously, the failure of the API connection would result
in a stack trace. This patch makes the failure capable of exiting
with fail_json
This commit is contained in:
Tim Rupp 2018-01-17 16:14:35 -08:00 • committed by GitHub
parent 3371b5eb03
commit 8cc0e74448
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 56 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/ansible/module_utils/network/f5/bigip.py
View file

@ -16,19 +16,27 @@ except ImportError:
try: try:
from library.module_utils.network.f5.common import F5BaseClient from library.module_utils.network.f5.common import F5BaseClient
from library.module_utils.network.f5.common import F5ModuleError
except ImportError: except ImportError:
from ansible.module_utils.network.f5.common import F5BaseClient from ansible.module_utils.network.f5.common import F5BaseClient
from ansible.module_utils.network.f5.common import F5ModuleError
class F5Client(F5BaseClient): class F5Client(F5BaseClient):
@property @property
def api(self): def api(self):
result = ManagementRoot( try:
self.params['server'], result = ManagementRoot(
self.params['user'], self.params['server'],
self.params['password'], self.params['user'],
port=self.params['server_port'], self.params['password'],
verify=self.params['validate_certs'], port=self.params['server_port'],
token='tmos' verify=self.params['validate_certs'],
) token='tmos'
)
except Exception:
raise F5ModuleError(
'Unable to connect to {0} on port {1}. '
'Is "validate_certs" preventing this?'.format(self.params['server'], self.params['server_port'])
)
return result return result

29
lib/ansible/module_utils/network/f5/bigiq.py
View file

@ -14,18 +14,29 @@ try:
except ImportError: except ImportError:
HAS_F5SDK = False HAS_F5SDK = False
from ansible.module_utils.network.f5.common import F5BaseClient try:
from library.module_utils.network.f5.common import F5BaseClient
from library.module_utils.network.f5.common import F5ModuleError
except ImportError:
from ansible.module_utils.network.f5.common import F5BaseClient
from ansible.module_utils.network.f5.common import F5ModuleError
class F5Client(F5BaseClient): class F5Client(F5BaseClient):
@property @property
def api(self): def api(self):
result = ManagementRoot( try:
self.params['server'], result = ManagementRoot(
self.params['user'], self.params['server'],
self.params['password'], self.params['user'],
port=self.params['server_port'], self.params['password'],
verify=self.params['validate_certs'], port=self.params['server_port'],
token='local' verify=self.params['validate_certs'],
) token='local'
)
except Exception:
raise F5ModuleError(
'Unable to connect to {0} on port {1}. '
'Is "validate_certs" preventing this?'.format(self.params['server'], self.params['server_port'])
)
return result return result

29
lib/ansible/module_utils/network/f5/iworkflow.py
View file

@ -14,18 +14,29 @@ try:
except ImportError: except ImportError:
HAS_F5SDK = False HAS_F5SDK = False
from ansible.module_utils.network.f5.common import F5BaseClient try:
from library.module_utils.network.f5.common import F5BaseClient
from library.module_utils.network.f5.common import F5ModuleError
except ImportError:
from ansible.module_utils.network.f5.common import F5BaseClient
from ansible.module_utils.network.f5.common import F5ModuleError
class F5Client(F5BaseClient): class F5Client(F5BaseClient):
@property @property
def api(self): def api(self):
result = ManagementRoot( try:
self.params['server'], result = ManagementRoot(
self.params['user'], self.params['server'],
self.params['password'], self.params['user'],
port=self.params['server_port'], self.params['password'],
verify=self.params['validate_certs'], port=self.params['server_port'],
token='local' verify=self.params['validate_certs'],
) token='local'
)
except Exception:
raise F5ModuleError(
'Unable to connect to {0} on port {1}. '
'Is "validate_certs" preventing this?'.format(self.params['server'], self.params['server_port'])
)
return result return result