Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix junos pylint issues #23292

Merged
merged 2 commits into from
Apr 5, 2017
Merged

Fix junos pylint issues #23292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4940a5
Fix junos rollback id validate issue (#23283)
ganeshrn Apr 5, 2017
6dce2aa
Fix various junos errors (#23278)
Qalthos Apr 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 4 additions & 5 deletions lib/ansible/module_utils/junos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'])
Expand All @@ -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
Expand All @@ -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}
Expand Down Expand Up @@ -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))
Expand Down
4 changes: 2 additions & 2 deletions lib/ansible/modules/network/junos/junos_command.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()):
Expand Down Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion lib/ansible/modules/network/junos/junos_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
4 changes: 2 additions & 2 deletions lib/ansible/modules/network/junos/junos_facts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"""

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
Expand All @@ -89,7 +89,7 @@ def cli(self, command):
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):
Expand Down
4 changes: 2 additions & 2 deletions lib/ansible/modules/network/junos/junos_user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
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']
Expand Down Expand Up @@ -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({
Expand Down