Fix junos pylint issues (#23292)
* Fix junos rollback id validate issue (#23283) (cherry picked from commit0b8ca98c48
) * Fix various junos errors (#23278) (cherry picked from commite8538213fa
)
This commit is contained in:
parent
55583c71ff
commit
3ba95b8ef7
5 changed files with 11 additions and 12 deletions
|
@ -18,12 +18,11 @@
|
|||
#
|
||||
from contextlib import contextmanager
|
||||
|
||||
from xml.etree.ElementTree import Element, SubElement, tostring
|
||||
from xml.etree.ElementTree import Element, SubElement
|
||||
|
||||
from ansible.module_utils.basic import env_fallback
|
||||
from ansible.module_utils.netconf import send_request, children
|
||||
from ansible.module_utils.netconf import discard_changes, validate
|
||||
from ansible.module_utils.network_common import to_list
|
||||
from ansible.module_utils.six import string_types
|
||||
|
||||
ACTIONS = frozenset(['merge', 'override', 'replace', 'update', 'set'])
|
||||
|
@ -49,7 +48,7 @@ def check_args(module, warnings):
|
|||
warnings.append('argument %s has been deprecated and will be '
|
||||
'removed in a future version' % key)
|
||||
|
||||
def _validate_rollback_id(value):
|
||||
def _validate_rollback_id(module, value):
|
||||
try:
|
||||
if not 0 <= int(value) <= 49:
|
||||
raise ValueError
|
||||
|
@ -75,7 +74,7 @@ def load_configuration(module, candidate=None, action='merge', rollback=None, fo
|
|||
module.fail_json(msg='format must be text when action is set')
|
||||
|
||||
if rollback is not None:
|
||||
_validate_rollback_id(rollback)
|
||||
_validate_rollback_id(module, rollback)
|
||||
xattrs = {'rollback': str(rollback)}
|
||||
else:
|
||||
xattrs = {'action': action, 'format': format}
|
||||
|
@ -103,7 +102,7 @@ def get_configuration(module, compare=False, format='xml', rollback='0'):
|
|||
module.fail_json(msg='invalid config format specified')
|
||||
xattrs = {'format': format}
|
||||
if compare:
|
||||
_validate_rollback_id(rollback)
|
||||
_validate_rollback_id(module, rollback)
|
||||
xattrs['compare'] = 'rollback'
|
||||
xattrs['rollback'] = str(rollback)
|
||||
return send_request(module, Element('get-configuration', xattrs))
|
||||
|
|
|
@ -246,7 +246,7 @@ def parse_rpcs(module):
|
|||
|
||||
return items
|
||||
|
||||
def parse_commands(module):
|
||||
def parse_commands(module, warnings):
|
||||
items = list()
|
||||
|
||||
for command in (module.params['commands'] or list()):
|
||||
|
@ -301,7 +301,7 @@ def main():
|
|||
check_args(module, warnings)
|
||||
|
||||
items = list()
|
||||
items.extend(parse_commands(module))
|
||||
items.extend(parse_commands(module, warnings))
|
||||
items.extend(parse_rpcs(module))
|
||||
|
||||
wait_for = module.params['wait_for'] or list()
|
||||
|
|
|
@ -194,7 +194,7 @@ def check_args(module, warnings):
|
|||
if module.params['replace'] is not None:
|
||||
module.fail_json(msg='argument replace is deprecated, use update')
|
||||
|
||||
zeroize = lambda x: send_request(x, Element('request-system-zeroize'))
|
||||
zeroize = lambda x: send_request(x, ElementTree.Element('request-system-zeroize'))
|
||||
rollback = lambda x: get_diff(x)
|
||||
|
||||
def guess_format(config):
|
||||
|
|
|
@ -65,7 +65,7 @@ ansible_facts:
|
|||
"""
|
||||
|
||||
import re
|
||||
from xml.etree.ElementTree import Element, SubElement
|
||||
from xml.etree.ElementTree import Element, SubElement, tostring
|
||||
|
||||
from ansible.module_utils.basic import AnsibleModule
|
||||
from ansible.module_utils.six import iteritems
|
||||
|
@ -89,7 +89,7 @@ class FactsBase(object):
|
|||
reply = command(self.module, command)
|
||||
output = reply.find('.//output')
|
||||
if not output:
|
||||
module.fail_json(msg='failed to retrieve facts for command %s' % command)
|
||||
self.module.fail_json(msg='failed to retrieve facts for command %s' % command)
|
||||
return str(output.text).strip()
|
||||
|
||||
def rpc(self, rpc):
|
||||
|
|
|
@ -119,7 +119,7 @@ from functools import partial
|
|||
from ncclient.xml_ import new_ele, sub_ele, to_xml
|
||||
|
||||
from ansible.module_utils.basic import AnsibleModule
|
||||
from ansible.module_utils.junos import load
|
||||
from ansible.module_utils.junos import load_config
|
||||
from ansible.module_utils.six import iteritems
|
||||
|
||||
ROLES = ['operator', 'read-only', 'super-user', 'unauthorized']
|
||||
|
@ -242,7 +242,7 @@ def main():
|
|||
if module.params['purge']:
|
||||
kwargs['action'] = 'replace'
|
||||
|
||||
diff = load(module, ele, **kwargs)
|
||||
diff = load_config(module, ele, **kwargs)
|
||||
|
||||
if diff:
|
||||
result.update({
|
||||
|
|
Loading…
Reference in a new issue