mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-07-24 05:40:23 -07:00
nxos integration fix part 1 (#27069)
* Assorted Python 3 fixes * Fix `testcase` definition in integration tests * Fix nxos_acl_interface * clean up nxapi after nxos_nxapi
This commit is contained in:
parent
b8337ee9d3
commit
56a0b988a9
12 changed files with 29 additions and 11 deletions
|
@ -27,7 +27,7 @@
|
|||
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
|
||||
# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
#
|
||||
import re
|
||||
|
||||
import collections
|
||||
|
||||
from ansible.module_utils._text import to_text
|
||||
|
|
|
@ -88,7 +88,10 @@ from ansible.module_utils.basic import AnsibleModule
|
|||
def check_for_acl_int_present(module, name, intf, direction):
|
||||
# Need to Captitalize the interface name as the nxos
|
||||
# output has capitalization
|
||||
command = ['show running-config aclmgr | section {0}'.format(intf.title())]
|
||||
command = [{
|
||||
'command': 'show running-config aclmgr | section {0}'.format(intf.title()),
|
||||
'output': 'text',
|
||||
}]
|
||||
body = run_commands(module, command)
|
||||
|
||||
if direction == 'ingress':
|
||||
|
|
|
@ -41,7 +41,7 @@ class ActionModule(_ActionModule):
|
|||
try:
|
||||
self._handle_template()
|
||||
except ValueError as exc:
|
||||
return dict(failed=True, msg=exc.message)
|
||||
return dict(failed=True, msg=str(exc))
|
||||
|
||||
result = super(ActionModule, self).run(tmp, task_vars)
|
||||
|
||||
|
@ -55,7 +55,7 @@ class ActionModule(_ActionModule):
|
|||
|
||||
# strip out any keys that have two leading and two trailing
|
||||
# underscore characters
|
||||
for key in result.keys():
|
||||
for key in list(result.keys()):
|
||||
if PRIVATE_KEYS_RE.match(key):
|
||||
del result[key]
|
||||
|
||||
|
|
|
@ -22,9 +22,9 @@ __metaclass__ = type
|
|||
import os
|
||||
import time
|
||||
import glob
|
||||
import urlparse
|
||||
|
||||
from ansible.module_utils._text import to_text
|
||||
from ansible.module_utils.six.moves.urllib.parse import urlsplit
|
||||
from ansible.plugins.action.nxos import ActionModule as _ActionModule
|
||||
|
||||
|
||||
|
@ -35,7 +35,7 @@ class ActionModule(_ActionModule):
|
|||
try:
|
||||
self._handle_template()
|
||||
except (ValueError, AttributeError) as exc:
|
||||
return dict(failed=True, msg=exc.message)
|
||||
return dict(failed=True, msg=str(exc))
|
||||
|
||||
result = super(ActionModule, self).run(tmp, task_vars)
|
||||
|
||||
|
@ -72,7 +72,7 @@ class ActionModule(_ActionModule):
|
|||
|
||||
working_path = self._get_working_path()
|
||||
|
||||
if os.path.isabs(src) or urlparse.urlsplit(src).scheme:
|
||||
if os.path.isabs(src) or urlsplit(src).scheme:
|
||||
source = src
|
||||
else:
|
||||
source = self._loader.path_dwim_relative(working_path, 'templates', src)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue