MOdified namespace to juniper.device

arineng · Jul 9, 2020 · ec154ff · ec154ff
1 parent 17cc876
commit ec154ff
Show file tree

Hide file tree

Showing 69 changed files with 49 additions and 49 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -14,7 +14,7 @@ RUN apk del -r --purge gcc make g++ &&\
     rm -rf /var/cache/apk/* &&\
     rm -rf /tmp/*
 
-WORKDIR /etc/ansible/collections/ansible_collections/junipernetworks.devices
+WORKDIR /etc/ansible/collections/ansible_collections/juniper.device
 COPY action_plugins action_plugins
 COPY callback_plugins callback_plugins
 COPY library library

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
@@ -13,9 +13,9 @@ Module Name
 <!--- Insert, BELOW THIS COMMENT, the name of the module, plugin, task or feature
 -->
 
-junipernetworks.devices collection and Python libraries version
+juniper.device collection and Python libraries version
 <!--- Paste, BELOW THIS COMMENT, verbatim output from "ansible --version" and  "pip freeze" between quotes below 
-Also provide the version of junipernetworks.devices collection-->
+Also provide the version of juniper.device collection-->
 ```
 
 ```

diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ The repo is under active development.  If you take a clone, you are getting the
 
 Juniper Networks supports Ansible for managing devices running the Junos operating system (Junos OS). 
 This collection is hosted on the Ansible Galaxy website under the collection 
-[junipernetworks.devices](https://galaxy.ansible.com/Juniper/junos/). The junipernetworks.devices collection includes 
+[juniper.device](https://galaxy.ansible.com/Juniper/junos/). The juniper.device collection includes 
 a set of Ansible modules that perform specific operational and configuration tasks on devices running Junos OS. 
 These tasks include:
 installing and upgrading Junos OS, provisioning new Junos devices in the network, loading configuration changes,
@@ -18,7 +18,7 @@ retrieving information, and resetting, rebooting, or shutting down managed devic
 ## juniper.junos roles by Juniper Networks
 
 Ansible galaxy is upgrading to collections and plans to deprecate roles in future. The master branch will now have 
-junipernetworks.devices collection support. Juniper.junos roles have been moved to roles branch. 
+juniper.device collection support. Juniper.junos roles have been moved to roles branch. 
 For more information for roles, check: 
 https://github.com/Juniper/ansible-junos-stdlib/tree/roles
 
@@ -33,7 +33,7 @@ using the modules in this collection when writing new playbooks that manage Juno
 
 ## Overview of Modules
 
-This junipernetworks.devices collection includes the following modules:
+This juniper.device collection includes the following modules:
 
 - **juniper_junos_command** — Execute one or more CLI commands on a Junos device.
 - **juniper_junos_config** — Manipulate the configuration of a Junos device.
@@ -100,10 +100,10 @@ In MacOS Mojave and newer (>=10.14), ssh keys created with the system `ssh-keyge
 ### Ansible Galaxy collection
 
 You can use the ansible-galaxy install command to install the latest
-version of the junipernetworks.devices collection.
+version of the juniper.device collection.
 
 ```bash
-sudo ansible-galaxy collection install junipernetworks.devices
+sudo ansible-galaxy collection install juniper.device
 ```
 
 ### Git clone
@@ -167,7 +167,7 @@ This example outlines how to use Ansible to install or upgrade the software imag
 - name: Install Junos OS
   hosts: dc1
   collections:
-    - junipernetworks.devices
+    - juniper.device
   connection: local
   gather_facts: no
   vars:
@@ -211,8 +211,8 @@ Apache 2.0
 
 ## SUPPORT
 
-Support for this junipernetworks.devices collection is provided by the community and Juniper Networks. If you have an
-issue with a module in the junipernetworks.devices collection, you may:
+Support for this juniper.device collection is provided by the community and Juniper Networks. If you have an
+issue with a module in the juniper.device collection, you may:
 
 - Open a [GitHub issue](https://github.com/Juniper/ansible-junos-stdlib/issues).
 - Post a question on our [Google Group](https://groups.google.com/forum/#!forum/junos-python-ez)

diff --git a/ansible-junos-awx/Makefile b/ansible-junos-awx/Makefile
@@ -58,7 +58,7 @@ endif
 .PHONY: docker-exec
 docker-exec:
 	docker exec -it awx_task pip install jsnapy jxmlease junos-eznc
-	docker exec -it awx_task ansible-galaxy install junipernetworks.devices,$(ANSIBLE_JUNOS_VERSION) -p  /etc/ansible/roles
+	docker exec -it awx_task ansible-galaxy install juniper.junos,$(ANSIBLE_JUNOS_VERSION) -p  /etc/ansible/roles
 	docker exec -it awx_task /bin/bash -c 'sed -i '/roles_path/s/^#//g' /etc/ansible/ansible.cfg'
 ifneq '$(HOST_FILE)' ''	
 	curl -u admin:password --noproxy '*' http://localhost/api/v2/inventories/ --header "Content-Type: application/json" -x POST -d '{"name":"$(INVENTORY_NAME)" , "organization": 1}'

diff --git a/ansible-junos-awx/README.md b/ansible-junos-awx/README.md
@@ -26,8 +26,8 @@ This will do the following operations:
 - Clone AWX repository into the Juniper-awx/awx folder
 - Change AWX inventory file to include user specifications.Refer [Makefile.variable](#makefilevariable).
 - Launch AWX conatiners.
-- Install junipernetworks.devices role with user specified version.Refer [Makefile.variable](#makefilevariable).
-- Install python modules required for junipernetworks.devices role in awx_task container: jxmlease,junos-eznc,jsnappy.
+- Install juniper.junos role with user specified version.Refer [Makefile.variable](#makefilevariable).
+- Install python modules required for juniper.junos role in awx_task container: jxmlease,junos-eznc,jsnappy.
 - Change roles_path in ansible.cfg for awx_task container.
 - If HOST_FILE is mentioned, an inventory with name INVENTORY_NAME is created and host's loaded into it.Refer [Makefile.variable](#makefilevariable).
 
@@ -508,11 +508,11 @@ Installing collected packages: lxml, ncclient, scp, pyserial, netaddr, junos-ezn
 Successfully installed colorama-0.3.9 configparser-3.5.0 future-0.16.0 icdiff-1.9.1 jsnapy-1.3.1 junos-eznc-2.1.7 jxmlease-1.0.1 lxml-4.1.1 ncclient-0.5.3 netaddr-0.7.19 pyparsing-2.2.0 pyserial-3.4 scp-0.10.2
 You are using pip version 8.1.2, however version 9.0.1 is available.
 You should consider upgrading via the 'pip install --upgrade pip' command.
-docker exec -it awx_task ansible-galaxy install junipernetworks.devices, -p  /etc/ansible/roles
+docker exec -it awx_task ansible-galaxy install juniper.junos, -p  /etc/ansible/roles
 - downloading role 'junos', owned by Juniper
 - downloading role from https://github.com/Juniper/ansible-junos-stdlib/archive/2.0.2.tar.gz
-- extracting junipernetworks.devices to /etc/ansible/roles/junipernetworks.devices
-- junipernetworks.devices (2.0.2) was installed successfully
+- extracting juniper.junos to /etc/ansible/roles/juniper.junos
+- juniper.junos (2.0.2) was installed successfully
 docker exec -it awx_task /bin/bash -c 'sed -i '/roles_path/s/^#//g' /etc/ansible/ansible.cfg'
 
 
@@ -580,7 +580,7 @@ INVENTORY_NAME = Junos
 1. `PROJECT_DATA_DIR` : Provide absolute path to directory where the ansible projects reside.If the directory is not present Makefile will create the path.
 2. `AWX_TASK_TAG`: Mention the awx_task tag to be installed.For available versions refer [Dockerhub](https://hub.docker.com/r/ansible/awx_task/tags/).
 3. `POSTGRES_DATA_DIR`: Provide absolute path to postgres directory.If the directory is not present Makefile will create the path and create folders required for postgres to run.
-4. `ANSIBLE_JUNOS_VERSION`: Mention the junipernetworks.devices version to be installed.By default, it installs the latest version.
+4. `ANSIBLE_JUNOS_VERSION`: Mention the juniper.junos version to be installed.By default, it installs the latest version.
 5. `HOST_FILE`: Provide the absolute path to the host file.This option can be only used if PROJECT_DATA_DIR is mentioned.
 By default, it doesnot load any host file.Please ensure that a unique INVENTORY_NAME is mentioned to avoid errors e.g Hosts.
 6. `INVENTORY_NAME`: The name of the inventory to which HOST_FILE is to be loaded.

diff --git a/...ections/junipernetworks/devices/README.md → ansible_collections/juniper/device/README.md b/...ections/junipernetworks/devices/README.md → ansible_collections/juniper/device/README.md
diff --git a/...ons/junipernetworks/devices/docs/Makefile → ..._collections/juniper/device/docs/Makefile b/...ons/junipernetworks/devices/docs/Makefile → ..._collections/juniper/device/docs/Makefile
diff --git a/...es/docs/_static/juniper-junos-modules.css → ...ce/docs/_static/juniper-junos-modules.css b/...es/docs/_static/juniper-junos-modules.css → ...ce/docs/_static/juniper-junos-modules.css
diff --git a/...networks/devices/docs/_static/juniper.png → ...s/juniper/device/docs/_static/juniper.png b/...networks/devices/docs/_static/juniper.png → ...s/juniper/device/docs/_static/juniper.png
diff --git a/...nipernetworks/devices/docs/ansible2rst.py → ...ctions/juniper/device/docs/ansible2rst.py b/...nipernetworks/devices/docs/ansible2rst.py → ...ctions/juniper/device/docs/ansible2rst.py
diff --git a/...ions/junipernetworks/devices/docs/conf.py → ...e_collections/juniper/device/docs/conf.py b/...ions/junipernetworks/devices/docs/conf.py → ...e_collections/juniper/device/docs/conf.py
diff --git a/...s/junipernetworks/devices/docs/docreq.txt → ...ollections/juniper/device/docs/docreq.txt b/...s/junipernetworks/devices/docs/docreq.txt → ...ollections/juniper/device/docs/docreq.txt
diff --git a/...tions/junipernetworks/devices/docs/rst.j2 → ...le_collections/juniper/device/docs/rst.j2 b/...tions/junipernetworks/devices/docs/rst.j2 → ...le_collections/juniper/device/docs/rst.j2
diff --git a/...ctions/junipernetworks/devices/galaxy.yml → ...ble_collections/juniper/device/galaxy.yml b/...ctions/junipernetworks/devices/galaxy.yml → ...ble_collections/juniper/device/galaxy.yml
@@ -3,10 +3,10 @@
 # The namespace of the collection. This can be a company/brand/organization or product namespace under which all
 # content lives. May only contain alphanumeric characters and underscores. Additionally namespaces cannot start with
 # underscores or numbers and cannot contain consecutive underscores
-namespace: junipernetworks
+namespace: juniper
 
 # The name of the collection. Has the same character restrictions as 'namespace'
-name: devices
+name: device
 
 # The version of the collection. Must be compatible with semantic versioning
 version: 0.1.0

diff --git a/...junipernetworks/devices/plugins/README.md → ...lections/juniper/device/plugins/README.md b/...junipernetworks/devices/plugins/README.md → ...lections/juniper/device/plugins/README.md
diff --git a/...etworks/devices/plugins/action/command.py → .../juniper/device/plugins/action/command.py b/...etworks/devices/plugins/action/command.py → .../juniper/device/plugins/action/command.py
diff --git a/...networks/devices/plugins/action/config.py → ...s/juniper/device/plugins/action/config.py b/...networks/devices/plugins/action/config.py → ...s/juniper/device/plugins/action/config.py
diff --git a/...rnetworks/devices/plugins/action/facts.py → ...ns/juniper/device/plugins/action/facts.py b/...rnetworks/devices/plugins/action/facts.py → ...ns/juniper/device/plugins/action/facts.py
diff --git a/...networks/devices/plugins/action/jsnapy.py → ...s/juniper/device/plugins/action/jsnapy.py b/...networks/devices/plugins/action/jsnapy.py → ...s/juniper/device/plugins/action/jsnapy.py
diff --git a/...s/plugins/action/juniper_junos_command.py → ...e/plugins/action/juniper_junos_command.py b/...s/plugins/action/juniper_junos_command.py → ...e/plugins/action/juniper_junos_command.py
diff --git a/...ins/action/juniper_junos_common_action.py → ...ins/action/juniper_junos_common_action.py b/...ins/action/juniper_junos_common_action.py → ...ins/action/juniper_junos_common_action.py
diff --git a/...es/plugins/action/juniper_junos_config.py → ...ce/plugins/action/juniper_junos_config.py b/...es/plugins/action/juniper_junos_config.py → ...ce/plugins/action/juniper_junos_config.py
diff --git a/...ces/plugins/action/juniper_junos_facts.py → ...ice/plugins/action/juniper_junos_facts.py b/...ces/plugins/action/juniper_junos_facts.py → ...ice/plugins/action/juniper_junos_facts.py
diff --git a/...es/plugins/action/juniper_junos_jsnapy.py → ...ce/plugins/action/juniper_junos_jsnapy.py b/...es/plugins/action/juniper_junos_jsnapy.py → ...ce/plugins/action/juniper_junos_jsnapy.py
diff --git a/...ices/plugins/action/juniper_junos_ping.py → ...vice/plugins/action/juniper_junos_ping.py b/...ices/plugins/action/juniper_junos_ping.py → ...vice/plugins/action/juniper_junos_ping.py
diff --git a/...ces/plugins/action/juniper_junos_pmtud.py → ...ice/plugins/action/juniper_junos_pmtud.py b/...ces/plugins/action/juniper_junos_pmtud.py → ...ice/plugins/action/juniper_junos_pmtud.py
diff --git a/...vices/plugins/action/juniper_junos_rpc.py → ...evice/plugins/action/juniper_junos_rpc.py b/...vices/plugins/action/juniper_junos_rpc.py → ...evice/plugins/action/juniper_junos_rpc.py
diff --git a/.../plugins/action/juniper_junos_software.py → .../plugins/action/juniper_junos_software.py b/.../plugins/action/juniper_junos_software.py → .../plugins/action/juniper_junos_software.py
diff --git a/...ugins/action/juniper_junos_srx_cluster.py → ...ugins/action/juniper_junos_srx_cluster.py b/...ugins/action/juniper_junos_srx_cluster.py → ...ugins/action/juniper_junos_srx_cluster.py
diff --git a/...es/plugins/action/juniper_junos_system.py → ...ce/plugins/action/juniper_junos_system.py b/...es/plugins/action/juniper_junos_system.py → ...ce/plugins/action/juniper_junos_system.py
diff --git a/...ces/plugins/action/juniper_junos_table.py → ...ice/plugins/action/juniper_junos_table.py b/...ces/plugins/action/juniper_junos_table.py → ...ice/plugins/action/juniper_junos_table.py
diff --git a/...ernetworks/devices/plugins/action/ping.py → ...ons/juniper/device/plugins/action/ping.py b/...ernetworks/devices/plugins/action/ping.py → ...ons/juniper/device/plugins/action/ping.py
diff --git a/...rnetworks/devices/plugins/action/pmtud.py → ...ns/juniper/device/plugins/action/pmtud.py b/...rnetworks/devices/plugins/action/pmtud.py → ...ns/juniper/device/plugins/action/pmtud.py
diff --git a/...pernetworks/devices/plugins/action/rpc.py → ...ions/juniper/device/plugins/action/rpc.py b/...pernetworks/devices/plugins/action/rpc.py → ...ions/juniper/device/plugins/action/rpc.py
diff --git a/...tworks/devices/plugins/action/software.py → ...juniper/device/plugins/action/software.py b/...tworks/devices/plugins/action/software.py → ...juniper/device/plugins/action/software.py
diff --git a/...rks/devices/plugins/action/srx_cluster.py → ...iper/device/plugins/action/srx_cluster.py b/...rks/devices/plugins/action/srx_cluster.py → ...iper/device/plugins/action/srx_cluster.py
diff --git a/...networks/devices/plugins/action/system.py → ...s/juniper/device/plugins/action/system.py b/...networks/devices/plugins/action/system.py → ...s/juniper/device/plugins/action/system.py
diff --git a/...rnetworks/devices/plugins/action/table.py → ...ns/juniper/device/plugins/action/table.py b/...rnetworks/devices/plugins/action/table.py → ...ns/juniper/device/plugins/action/table.py
diff --git a/...tworks/devices/plugins/callback/jsnapy.py → ...juniper/device/plugins/callback/jsnapy.py b/...tworks/devices/plugins/callback/jsnapy.py → ...juniper/device/plugins/callback/jsnapy.py
diff --git a/.../devices/plugins/module_utils/__init__.py → ...r/device/plugins/module_utils/__init__.py b/.../devices/plugins/module_utils/__init__.py → ...r/device/plugins/module_utils/__init__.py
diff --git a/...gins/module_utils/juniper_junos_common.py → ...gins/module_utils/juniper_junos_common.py b/...gins/module_utils/juniper_junos_common.py → ...gins/module_utils/juniper_junos_common.py
diff --git a/...tworks/devices/plugins/modules/command.py → ...juniper/device/plugins/modules/command.py b/...tworks/devices/plugins/modules/command.py → ...juniper/device/plugins/modules/command.py
diff --git a/...etworks/devices/plugins/modules/config.py → .../juniper/device/plugins/modules/config.py b/...etworks/devices/plugins/modules/config.py → .../juniper/device/plugins/modules/config.py
diff --git a/...networks/devices/plugins/modules/facts.py → ...s/juniper/device/plugins/modules/facts.py b/...networks/devices/plugins/modules/facts.py → ...s/juniper/device/plugins/modules/facts.py
diff --git a/...etworks/devices/plugins/modules/jsnapy.py → .../juniper/device/plugins/modules/jsnapy.py b/...etworks/devices/plugins/modules/jsnapy.py → .../juniper/device/plugins/modules/jsnapy.py
diff --git a/.../plugins/modules/juniper_junos_command.py → .../plugins/modules/juniper_junos_command.py b/.../plugins/modules/juniper_junos_command.py → .../plugins/modules/juniper_junos_command.py
@@ -153,7 +153,7 @@
   connection: local
   gather_facts: no
   collections:
-    - junipernetworks.devices
+    - juniper.device
 
   tasks:
     - name: Execute single "show version" command.
@@ -309,7 +309,7 @@
 
 # Ansiballz packages module_utils into ansible.module_utils
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.junipernetworks.devices.plugins.module_utils import juniper_junos_common
+from ansible_collections.juniper.device.plugins.module_utils import juniper_junos_common
 
 def main():
     # Create the module instance.

diff --git a/...s/plugins/modules/juniper_junos_config.py → ...e/plugins/modules/juniper_junos_config.py b/...s/plugins/modules/juniper_junos_config.py → ...e/plugins/modules/juniper_junos_config.py
@@ -520,7 +520,7 @@
   connection: local
   gather_facts: no
   collections:
-    - junipernetworks.devices
+    - juniper.device
   tasks:
     - name: Retrieve the committed configuration
       juniper_junos_config:
@@ -738,7 +738,7 @@
 
 # Ansiballz packages module_utils into ansible.module_utils
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.junipernetworks.devices.plugins.module_utils import juniper_junos_common
+from ansible_collections.juniper.device.plugins.module_utils import juniper_junos_common
 
 def main():
     # Choices which are defined in the common module.

diff --git a/...es/plugins/modules/juniper_junos_facts.py → ...ce/plugins/modules/juniper_junos_facts.py b/...es/plugins/modules/juniper_junos_facts.py → ...ce/plugins/modules/juniper_junos_facts.py
@@ -90,7 +90,7 @@
   connection: local
   gather_facts: no
   collections:
-    - junipernetworks.devices
+    - juniper.device
   tasks:
     - name: Gather Junos facts with no configuration
       juniper_junos_facts:
@@ -176,7 +176,7 @@
 
 # Ansiballz packages module_utils into ansible.module_utils
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.junipernetworks.devices.plugins.module_utils import juniper_junos_common
+from ansible_collections.juniper.device.plugins.module_utils import juniper_junos_common
 from ansible.module_utils._text import to_bytes
 
 def get_facts_dict(junos_module):

diff --git a/...s/plugins/modules/juniper_junos_jsnapy.py → ...e/plugins/modules/juniper_junos_jsnapy.py b/...s/plugins/modules/juniper_junos_jsnapy.py → ...e/plugins/modules/juniper_junos_jsnapy.py
@@ -115,7 +115,7 @@
   connection: local
   gather_facts: no
   collections:
-    - junipernetworks.devices
+    - juniper.device
 
   tasks:
     - name: JUNOS Post Checklist
@@ -208,7 +208,7 @@
 
 # Ansiballz packages module_utils into ansible.module_utils
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.junipernetworks.devices.plugins.module_utils import juniper_junos_common
+from ansible_collections.juniper.device.plugins.module_utils import juniper_junos_common
 
 def main():
     JSNAPY_ACTION_CHOICES = ['check', 'snapcheck', 'snap_pre', 'snap_post']

diff --git a/...ces/plugins/modules/juniper_junos_ping.py → ...ice/plugins/modules/juniper_junos_ping.py b/...ces/plugins/modules/juniper_junos_ping.py → ...ice/plugins/modules/juniper_junos_ping.py
@@ -146,7 +146,7 @@
   connection: local
   gather_facts: no
   collections:
-    - junipernetworks.devices
+    - juniper.device
 
   tasks:
     - name: Ping 192.68.1.1 with default parameters. Fails if any packets lost.
@@ -385,7 +385,7 @@
 
 # Ansiballz packages module_utils into ansible.module_utils
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.junipernetworks.devices.plugins.module_utils import juniper_junos_common
+from ansible_collections.juniper.device.plugins.module_utils import juniper_junos_common
 
 def main():
     # The argument spec for the module.

diff --git a/...es/plugins/modules/juniper_junos_pmtud.py → ...ce/plugins/modules/juniper_junos_pmtud.py b/...es/plugins/modules/juniper_junos_pmtud.py → ...ce/plugins/modules/juniper_junos_pmtud.py
@@ -132,7 +132,7 @@
   connection: local
   gather_facts: no
   collections:
-    - junipernetworks.devices
+    - juniper.device
 
   tasks:
     - name: Perform PMTUD to 192.68.1.1 with default parameters.
@@ -247,7 +247,7 @@
 
 # Ansiballz packages module_utils into ansible.module_utils
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.junipernetworks.devices.plugins.module_utils import juniper_junos_common
+from ansible_collections.juniper.device.plugins.module_utils import juniper_junos_common
 
 def main():
     # Constants for MTU size

diff --git a/...ices/plugins/modules/juniper_junos_rpc.py → ...vice/plugins/modules/juniper_junos_rpc.py b/...ices/plugins/modules/juniper_junos_rpc.py → ...vice/plugins/modules/juniper_junos_rpc.py
@@ -190,7 +190,7 @@
   connection: local
   gather_facts: no
   collections:
-    - junipernetworks.devices
+    - juniper.device
 
   tasks:
     - name: Execute single get-software-information RPC.
@@ -246,7 +246,7 @@
 - name: Get Device Configuration
   hosts: all
   collections:
-    - junipernetworks.devices
+    - juniper.device
   connection: local
   gather_facts: no
   tasks:
@@ -375,7 +375,7 @@
 
 # Ansiballz packages module_utils into ansible.module_utils
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.junipernetworks.devices.plugins.module_utils import juniper_junos_common
+from ansible_collections.juniper.device.plugins.module_utils import juniper_junos_common
 
 def main():
     # Create the module instance.

diff --git a/...plugins/modules/juniper_junos_software.py → ...plugins/modules/juniper_junos_software.py b/...plugins/modules/juniper_junos_software.py → ...plugins/modules/juniper_junos_software.py
@@ -322,7 +322,7 @@
   connection: local
   gather_facts: no
   collections:
-    - junipernetworks.devices
+    - juniper.device
 
   tasks:
     - name: Execute a basic Junos software upgrade.
@@ -390,7 +390,7 @@
 
 # Ansiballz packages module_utils into ansible.module_utils
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.junipernetworks.devices.plugins.module_utils import juniper_junos_common
+from ansible_collections.juniper.device.plugins.module_utils import juniper_junos_common
 
 def parse_version_from_filename(filename):
     """Attempts to parse a version string from the filename of a Junos package.

diff --git a/...gins/modules/juniper_junos_srx_cluster.py → ...gins/modules/juniper_junos_srx_cluster.py b/...gins/modules/juniper_junos_srx_cluster.py → ...gins/modules/juniper_junos_srx_cluster.py
@@ -95,7 +95,7 @@
   connection: local
   gather_facts: no
   collections:
-    - junipernetworks.devices
+    - juniper.device
   tasks:
     - name: Enable an SRX cluster
       juniper_junos_srx_cluster:
@@ -149,7 +149,7 @@
 
 # Ansiballz packages module_utils into ansible.module_utils
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.junipernetworks.devices.plugins.module_utils import juniper_junos_common
+from ansible_collections.juniper.device.plugins.module_utils import juniper_junos_common
 
 def main():
     # Create the module instance.

diff --git a/...s/plugins/modules/juniper_junos_system.py → ...e/plugins/modules/juniper_junos_system.py b/...s/plugins/modules/juniper_junos_system.py → ...e/plugins/modules/juniper_junos_system.py
@@ -163,7 +163,7 @@
   connection: local
   gather_facts: no
   collections:
-    - junipernetworks.devices
+    - juniper.device
 
   tasks:
     - name: Reboot all REs of the device
@@ -255,7 +255,7 @@
 
 # Ansiballz packages module_utils into ansible.module_utils
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.junipernetworks.devices.plugins.module_utils import juniper_junos_common
+from ansible_collections.juniper.device.plugins.module_utils import juniper_junos_common
 
 def main():
     # Create the module instance.

diff --git a/...es/plugins/modules/juniper_junos_table.py → ...ce/plugins/modules/juniper_junos_table.py b/...es/plugins/modules/juniper_junos_table.py → ...ce/plugins/modules/juniper_junos_table.py
@@ -128,7 +128,7 @@
   connection: local
   gather_facts: no
   collections:
-    - junipernetworks.devices
+    - juniper.device
 
   tasks:
     - name: Retrieve LLDP Neighbor Information Using PyEZ-included Table
@@ -291,7 +291,7 @@
 
 # Ansiballz packages module_utils into ansible.module_utils
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.junipernetworks.devices.plugins.module_utils import juniper_junos_common
+from ansible_collections.juniper.device.plugins.module_utils import juniper_junos_common
 
 def expand_items(module, data):
     """Recursively expand any table items

diff --git a/...rnetworks/devices/plugins/modules/ping.py → ...ns/juniper/device/plugins/modules/ping.py b/...rnetworks/devices/plugins/modules/ping.py → ...ns/juniper/device/plugins/modules/ping.py
diff --git a/...networks/devices/plugins/modules/pmtud.py → ...s/juniper/device/plugins/modules/pmtud.py b/...networks/devices/plugins/modules/pmtud.py → ...s/juniper/device/plugins/modules/pmtud.py
diff --git a/...ernetworks/devices/plugins/modules/rpc.py → ...ons/juniper/device/plugins/modules/rpc.py b/...ernetworks/devices/plugins/modules/rpc.py → ...ons/juniper/device/plugins/modules/rpc.py
diff --git a/...works/devices/plugins/modules/software.py → ...uniper/device/plugins/modules/software.py b/...works/devices/plugins/modules/software.py → ...uniper/device/plugins/modules/software.py
diff --git a/...ks/devices/plugins/modules/srx_cluster.py → ...per/device/plugins/modules/srx_cluster.py b/...ks/devices/plugins/modules/srx_cluster.py → ...per/device/plugins/modules/srx_cluster.py
diff --git a/...etworks/devices/plugins/modules/system.py → .../juniper/device/plugins/modules/system.py b/...etworks/devices/plugins/modules/system.py → .../juniper/device/plugins/modules/system.py
diff --git a/...networks/devices/plugins/modules/table.py → ...s/juniper/device/plugins/modules/table.py b/...networks/devices/plugins/modules/table.py → ...s/juniper/device/plugins/modules/table.py
diff --git a/tests/pb.juniper_junos_config.yml b/tests/pb.juniper_junos_config.yml
@@ -4,7 +4,7 @@
   connection: local
   gather_facts: no
   collections:
-    - junipernetworks.devices
+    - juniper.device
   tasks:
 #################
     - name: Retrieve the committed configuration

diff --git a/tests/pb.juniper_junos_facts.yml b/tests/pb.juniper_junos_facts.yml
@@ -4,7 +4,7 @@
   connection: local
   gather_facts: no
   collections:
-    - junipernetworks.devices
+    - juniper.device
   tasks:
     - name: "TEST 1 - Gather Facts"
       juniper_junos_facts:

diff --git a/tests/pb.juniper_junos_jsnapy.yml b/tests/pb.juniper_junos_jsnapy.yml
@@ -4,7 +4,7 @@
   connection: local
   gather_facts: no
   collections:
-    - junipernetworks.devices
+    - juniper.device
   tasks:
 ##################################################
 ####    TEST 1                                  ##

diff --git a/tests/pb.juniper_junos_ping.yml b/tests/pb.juniper_junos_ping.yml
@@ -4,7 +4,7 @@
   connection: local
   gather_facts: no
   collections:
-    - junipernetworks.devices
+    - juniper.device
   tasks:
     - name: "TEST 1 - Ping Host DNS"
       juniper_junos_ping:

diff --git a/tests/pb.juniper_junos_pmtud.yml b/tests/pb.juniper_junos_pmtud.yml
@@ -4,7 +4,7 @@
   connection: local
   gather_facts: no
   collections:
-    - junipernetworks.devices
+    - juniper.device
   tasks:
     - name: "TEST 1 - Check path MTU to host DNS"
       juniper_junos_pmtud:

diff --git a/tests/pb.juniper_junos_rpc.yml b/tests/pb.juniper_junos_rpc.yml
@@ -4,7 +4,7 @@
   connection: local
   gather_facts: no
   collections:
-    - junipernetworks.devices
+    - juniper.device
 
   tasks:
 #################