Skip to content

Commit 39668cf

Browse files
fix review comments (#766)
* fix review comments * fix review comments * Fix for issue 765
1 parent d147c8a commit 39668cf

File tree

4 files changed

+10
-20
lines changed

4 files changed

+10
-20
lines changed

README.md

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,9 @@ This collection is hosted on the Ansible Galaxy website under the collection
1111
The `juniper.device` collection includes a set of Ansible modules that perform specific operational and configuration tasks on devices running Junos OS.
1212
These tasks include: installing and upgrading Junos OS, provisioning new Junos devices in the network, loading configuration changes,
1313
retrieving information, and resetting, rebooting, or shutting down managed devices. Please refer to the
14-
[INSTALLATION](#installation) section for instructions on installing this collection.
14+
[INSTALLATION](https://github.com/Juniper/ansible-junos-stdlib/blob/master/README.md#installation) section for instructions on installing this collection.
1515

16-
## Two Sets of Ansible Modules for Junos devices
17-
18-
Since Ansible version >= 2.1, Ansible also natively includes
19-
[core modules for Junos](https://docs.ansible.com/ansible/latest/collections/junipernetworks/junos/index.html#plugins-in-junipernetworks-junos). The Junos modules included
20-
in Ansible core have names which begin with the prefix `junos_`. The Junos modules included in this `Juniper.device`
21-
collection have names starting with module types. These two sets of Junos modules can coexist on the same
22-
Ansible control machine, and an Ansible playbook may invoke a module from either (or both) sets. Juniper Networks recommends
23-
using the modules in `juniper.device` collection when writing new playbooks that manage Junos devices.
16+
This collection is compatible with [junipernetworks.junos](https://github.com/ansible-collections/junipernetworks.junos) certified collection.
2417

2518
## Overview of Modules
2619

@@ -78,7 +71,7 @@ should be added to the Ansible configuration file in order to allow the jsnapy c
7871

7972
## INSTALLATION
8073

81-
You must have the [DEPENDENCIES](#dependencies) installed on your system.
74+
You must have the [DEPENDENCIES](https://github.com/Juniper/ansible-junos-stdlib/blob/master/README.md#dependencies) installed on your system.
8275
Check requirements.txt for the dependencies.
8376

8477
### NOTICES
@@ -111,7 +104,7 @@ For more information visit - https://docs.ansible.com/ansible/latest/user_guide/
111104

112105
### Git clone
113106

114-
For testing you can `git clone` this repo and run the `env-setup` script in the repo directory:
107+
For testing you can `git clone` [this repo](https://github.com/Juniper/ansible-junos-stdlib.git) and run the `env-setup` script in the repo directory:
115108

116109
user@ansible-junos-stdlib> source env-setup
117110

@@ -167,7 +160,7 @@ This example outlines how to use Ansible to install or upgrade the software imag
167160
This modules requires the following to be installed on the Ansible control machine:
168161
169162
- Python >= 3.8
170-
- [Ansible](http://www.ansible.com) 2.9 or later
163+
- [Ansible](https://pypi.org/project/ansible/) 2.9 or later
171164
- Junos [py-junos-eznc](https://github.com/Juniper/py-junos-eznc) 2.6.0 or later
172165
- [jxmlease](https://github.com/Juniper/jxmlease) 1.0.1 or later
173166
- [xmltodict](https://pypi.org/project/xmltodict/) 0.13.0 or later
@@ -179,17 +172,15 @@ Apache 2.0
179172
180173
## SUPPORT
181174
182-
Support for this `juniper.device` collection is provided by the community and Juniper Networks. If you have an
183-
issue with a module in the `juniper.device` collection, you may:
175+
As a Red Hat Ansible [Certified Content](https://catalog.redhat.com/en/search?searchType=Software), this collection is entitled to [support](https://access.redhat.com/support/) through [Ansible Automation Platform](https://www.redhat.com/en/technologies/management/ansible) (AAP) using the **Create issue** button on the top right corner.
176+
177+
If a support case cannot be opened with Red Hat and the collection has been obtained either from [Galaxy](https://galaxy.ansible.com/ui/) or [GitHub](https://github.com/Juniper/ansible-junos-stdlib), there is community support available, you may:
184178
185179
- Open a [GitHub issue](https://github.com/Juniper/ansible-junos-stdlib/issues).
186180
- Post a question on our [Google Group](https://groups.google.com/forum/#!forum/junos-python-ez)
187181
188182
- Open a [JTAC Case](https://www.juniper.net/casemanager/#/create)
189183
190-
Support for the Junos modules included in Ansible core is provided by Ansible. If you have an issue with an Ansible
191-
core module you should open a [Github issue against the Ansible project](https://github.com/ansible/ansible/issues).
192-
193184
## CONTRIBUTORS
194185
195186
Juniper Networks is actively contributing to and maintaining this repo. Please contact

ansible_collections/juniper/device/plugins/modules/software.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -742,7 +742,7 @@ def main():
742742
try:
743743
results["msg"] = junos_module._pyez_conn.software_api(install_params)
744744
except Exception as err: # pylint: disable=broad-except
745-
if "ConnectionError" in str(type(err)):
745+
if "ConnectionError" in str(err):
746746
# If Exception is ConnectionError, it is excpected
747747
# Device installation inititated succesfully
748748
junos_module.logger.debug("Package successfully installed.")

ansible_collections/juniper/device/tests/unit/test_file_copy.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,4 +282,4 @@ def test_invalid_action(mock_junos_module):
282282
main()
283283

284284
# This will likely not raise, but will skip both branches
285-
mock_instance.exit_json.assert_called_once_with(msg="", changed=False, failed=False)
285+
mock_instance.exit_json.assert_called_once_with(msg="", changed=False, failed=False)

requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
ansible >= 2.10
21
junos-eznc >= 2.6.0
32
jsnapy>=1.3.6
43
jxmlease

0 commit comments

Comments
 (0)