internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 13:22:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix undefined variables, basestring usage, and some associated python3 issues

Browse Source
This commit is contained in:
Toshio Kuratomi
2017-07-22 18:15:46 -07:00
parent 9f7b0dfc30
commit 225fa5d092
84 changed files with 652 additions and 963 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/ansible/modules/network/cloudengine/ce_command.py
View File

@@ -150,19 +150,21 @@ failed_conditions:
import time
import traceback
from ansible.module_utils.ce import run_commands
from ansible.module_utils.pycompat24 import get_exception
from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.ce import ce_argument_spec, check_args
from ansible.module_utils.ce import run_commands
from ansible.module_utils.netcli import Conditional
from ansible.module_utils.network_common import ComplexList
from ansible.module_utils.ce import ce_argument_spec, check_args
from ansible.module_utils.six import string_types
from ansible.module_utils._text import to_native
def to_lines(stdout):
lines = list()
for item in stdout:
if isinstance(item, basestring):
if isinstance(item, string_types):
item = str(item).split('\n')
lines.append(item)
return lines
@@ -223,9 +225,8 @@ def main():
try:
conditionals = [Conditional(c) for c in wait_for]
except AttributeError:
exc = get_exception()
module.fail_json(msg=str(exc))
except AttributeError as exc:
module.fail_json(msg=to_native(exc), exception=traceback.format_exc())
retries = module.params['retries']
interval = module.params['interval']

4
lib/ansible/modules/network/cloudengine/ce_ntp.py
View File

@@ -353,8 +353,8 @@ class Ntp(object):
if not addr_list:
self.module.fail_json(msg='Error: Match ip-address fail.')
value = ((long(addr_list[0][0])) * 0x1000000) + (long(addr_list[0][1]) * 0x10000) + \
(long(addr_list[0][2]) * 0x100) + (long(addr_list[0][3]))
value = ((int(addr_list[0][0])) * 0x1000000) + (int(addr_list[0][1]) * 0x10000) + \
(int(addr_list[0][2]) * 0x100) + (int(addr_list[0][3]))
if (value & (0xff000000) == 0x7f000000) or (value & (0xF0000000) == 0xF0000000) \
or (value & (0xF0000000) == 0xE0000000) or (value == 0):
return False

5
lib/ansible/modules/network/cloudengine/ce_ntp_auth.py
View File

@@ -200,8 +200,9 @@ changed:
sample: true
'''
import re
import copy
import re
from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.ce import ce_argument_spec, load_config, get_nc_config, set_nc_config
@@ -322,7 +323,7 @@ class NtpAuth(object):
self.module.fail_json(
msg='Error: key_id is not digit.')
if (long(self.key_id) < 1) or (long(self.key_id) > 4294967295):
if (int(self.key_id) < 1) or (int(self.key_id) > 4294967295):
self.module.fail_json(
msg='Error: The length of key_id is between 1 and 4294967295.')