diff --git a/lib/ansible/modules/network/f5/bigip_iapp_template.py b/lib/ansible/modules/network/f5/bigip_iapp_template.py index 4873176de5..e6e8d1d1fc 100644 --- a/lib/ansible/modules/network/f5/bigip_iapp_template.py +++ b/lib/ansible/modules/network/f5/bigip_iapp_template.py @@ -240,10 +240,10 @@ class Parameters(AnsibleF5Parameters): # There is a bug in the iApp parser in the F5 SDK that prevents us from # using it in all cases to get the name of an iApp. So we'll use this # pattern for now and file a bug with the F5 SDK - pattern = r'sys\s+application\s+template\s+(?P\/\w+\/)?(?P[\w.]+)' + pattern = r'sys\s+application\s+template\s+(?P\/[^\{}"\'*?|#]+\/)?(?P[^\{}"\'*?|#]+)' matches = re.search(pattern, self.content) try: - result = matches.group('name') + result = matches.group('name').strip() except IndexError: result = None if result: diff --git a/test/units/modules/network/f5/test_bigip_iapp_template.py b/test/units/modules/network/f5/test_bigip_iapp_template.py index 9d01243860..2671eb28fc 100644 --- a/test/units/modules/network/f5/test_bigip_iapp_template.py +++ b/test/units/modules/network/f5/test_bigip_iapp_template.py @@ -15,21 +15,23 @@ if sys.version_info < (2, 7): raise SkipTest("F5 Ansible modules require Python >= 2.7") from ansible.compat.tests import unittest -from ansible.compat.tests.mock import patch, Mock +from ansible.compat.tests.mock import Mock +from ansible.compat.tests.mock import patch from ansible.module_utils.f5_utils import AnsibleF5Client -from units.modules.utils import set_module_args try: from library.bigip_iapp_template import Parameters from library.bigip_iapp_template import ModuleManager from library.bigip_iapp_template import ArgumentSpec from ansible.module_utils.f5_utils import iControlUnexpectedHTTPError + from test.unit.modules.utils import set_module_args except ImportError: try: from ansible.modules.network.f5.bigip_iapp_template import Parameters from ansible.modules.network.f5.bigip_iapp_template import ArgumentSpec from ansible.modules.network.f5.bigip_iapp_template import ModuleManager from ansible.module_utils.f5_utils import iControlUnexpectedHTTPError + from units.modules.utils import set_module_args except ImportError: raise SkipTest("F5 Ansible modules require the f5-sdk Python library")