From 477c71d9853e35997473418ff883dee9a8bd1271 Mon Sep 17 00:00:00 2001 From: Peter Sprygada Date: Fri, 9 Sep 2016 12:25:21 -0400 Subject: [PATCH] minor updates to junos_package module for 2.2 (#4761) * replaces get_module() with NetworkModule() * removes old call to package_version() --- network/junos/junos_package.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/network/junos/junos_package.py b/network/junos/junos_package.py index f11e121b241..fbf575b4dfc 100644 --- a/network/junos/junos_package.py +++ b/network/junos/junos_package.py @@ -92,6 +92,7 @@ EXAMPLES = """ src: junos-vsrx-12.1X46-D10.2-domestic.tgz reboot: no """ +from ansible.module_utils.junos import NetworkModule try: from jnpr.junos.utils.sw import SW @@ -127,8 +128,8 @@ def main(): transport=dict(default='netconf', choices=['netconf']) ) - module = get_module(argument_spec=spec, - supports_check_mode=True) + module = NetworkModule(argument_spec=spec, + supports_check_mode=True) if not HAS_SW: module.fail_json(msg='Missing jnpr.junos.utils.sw module') @@ -137,8 +138,8 @@ def main(): do_upgrade = module.params['force'] or False if not module.params['force']: - has_ver = module.get_facts().get('version') - wants_ver = module.params['version'] or package_version(module) + has_ver = module.connection.get_facts().get('version') + wants_ver = module.params['version'] do_upgrade = has_ver != wants_ver if do_upgrade: @@ -148,8 +149,6 @@ def main(): module.exit_json(**result) -from ansible.module_utils.basic import * -from ansible.module_utils.junos import * if __name__ == '__main__': main()