DNM - Update junos workflow

.github/workflows/tests.yml

@@ -197,6 +197,141 @@ jobs:
           else
             echo "No unit tests directory found, skipping"
           fi
+  # Tests for junipernetworks.junos collection (to be archived)
+  junipernetworks-junos-sanity:
+    name: Sanity Tests (junipernetworks.junos)
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - python: "3.10"
+            ansible: "2.17"
+          - python: "3.11"
+            ansible: "2.17"
+          - python: "3.11"
+            ansible: "2.18"
+          - python: "3.11"
+            ansible: "2.19"
+          - python: "3.12"
+            ansible: "2.17"
+          - python: "3.12"
+            ansible: "2.18"
+          - python: "3.12"
+            ansible: "2.19"
+    steps:
+      - uses: actions/checkout@v5
+        with:
+          ref: "${{ github.event.pull_request.head.sha }}"
+          fetch-depth: 0
+      - name: Set up Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: "${{ matrix.python }}"
+      - name: "Install tox-ansible, includes tox"
+        run: python -m pip install tox-ansible
+      - name: "Check for tox-ansible.ini file, else add default"
+        uses: ansible/ansible-content-actions/.github/actions/add_tox_ansible@main
+      - name: Copy tox-ansible.ini to collection directory
+        run: |
+          if [ -f tox-ansible.ini ]; then
+            cp tox-ansible.ini ansible_collections/junipernetworks/junos/
+          fi
+      - name: Run tox sanity tests
+        working-directory: ansible_collections/junipernetworks/junos
+        run: >-
+          python -m tox --ansible -e sanity-py${{ matrix.python }}-${{ matrix.ansible }}
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+  junipernetworks-junos-unit-galaxy:
+    name: Unit Tests (junipernetworks.junos - Galaxy)
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - python: "3.10"
+            ansible: "2.17"
+          - python: "3.11"
+            ansible: "2.17"
+          - python: "3.11"
+            ansible: "2.18"
+          - python: "3.11"
+            ansible: "2.19"
+          - python: "3.12"
+            ansible: "2.17"
+          - python: "3.12"
+            ansible: "2.18"
+          - python: "3.12"
+            ansible: "2.19"
+    steps:
+      - uses: actions/checkout@v5
+        with:
+          ref: "${{ github.event.pull_request.head.ref }}"
+          repository: "${{ github.event.pull_request.head.repo.full_name }}"
+      - name: Set up Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: "${{ matrix.python }}"
+      - name: "Install tox-ansible, includes tox"
+        run: python -m pip install tox-ansible
+      - name: "Check for tox-ansible.ini file, else add default"
+        uses: ansible/ansible-content-actions/.github/actions/add_tox_ansible@main
+      - name: Copy tox-ansible.ini to collection directory
+        run: |
+          if [ -f tox-ansible.ini ]; then
+            cp tox-ansible.ini ansible_collections/junipernetworks/junos/
+          fi
+      - name: Run tox unit tests
+        working-directory: ansible_collections/junipernetworks/junos
+        run: >-
+          python -m tox --ansible -e unit-py${{ matrix.python }}-${{ matrix.ansible }}
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+  junipernetworks-junos-integration:
+    name: Integration Tests (junipernetworks.junos)
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - python: "3.11"
+            ansible: "2.17"
+          - python: "3.12"
+            ansible: "2.19"
+    steps:
+      - uses: actions/checkout@v5
+        with:
+          ref: "${{ github.event.pull_request.head.sha }}"
+          fetch-depth: 0
+      - name: Set up Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: "${{ matrix.python }}"
+      - name: "Install tox-ansible, includes tox"
+        run: python -m pip install tox-ansible
+      - name: "Check for tox-ansible.ini file, else add default"
+        uses: ansible/ansible-content-actions/.github/actions/add_tox_ansible@main
+      - name: Copy tox-ansible.ini to collection directory
+        run: |
+          if [ -f tox-ansible.ini ]; then
+            cp tox-ansible.ini ansible_collections/junipernetworks/junos/
+          fi
+      - name: Install collection dependencies
+        working-directory: ansible_collections/junipernetworks/junos
+        run: |
+          ansible-galaxy collection install -r requirements.txt || true
+          ansible-galaxy collection install git+https://github.com/ansible-collections/ansible.utils.git
+          ansible-galaxy collection install git+https://github.com/ansible-collections/ansible.netcommon.git
+          # Install juniper.device dependency
+          ansible-galaxy collection install git+https://github.com/Juniper/ansible-junos-stdlib.git,ansible_collections/juniper/device || true
+      - name: Run tox network-integration tests
+        working-directory: ansible_collections/junipernetworks/junos
+        run: >-
+          python -m tox --ansible -e network-integration-py${{ matrix.python }}-${{ matrix.ansible }}
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+        continue-on-error: true
   all_green:
     if: ${{ always() && (github.event_name != 'schedule') }}
     needs:
@@ -206,6 +341,9 @@ jobs:
       - unit-galaxy
       - ansible-lint
       - unit-source
+      - junipernetworks-junos-sanity
+      - junipernetworks-junos-unit-galaxy
+      - junipernetworks-junos-integration
     runs-on: ubuntu-latest
     steps:
       - run: >-
@@ -216,5 +354,8 @@ jobs:
           '${{ needs.sanity.result }}',
           '${{ needs.unit-galaxy.result }}',
           '${{ needs.ansible-lint.result }}',
-          '${{ needs.unit-source.result }}'
+          '${{ needs.unit-source.result }}',
+          '${{ needs.junipernetworks-junos-sanity.result }}',
+          '${{ needs.junipernetworks-junos-unit-galaxy.result }}',
+          '${{ needs.junipernetworks-junos-integration.result }}'
           ])"

ansible_collections/junipernetworks/junos/tests/unit/modules/network/junos/test_junos_bgp_address_family.py

@@ -28,7 +28,7 @@
 
 from unittest.mock import patch
 
-from ansible_collections.junipernetworks.junos.plugins.modules import junos_bgp_address_family
+from ansible_collections.juniper.device.plugins.modules import junos_bgp_address_family
 from ansible_collections.junipernetworks.junos.tests.unit.modules.utils import set_module_args
 
 from .junos_module import TestJunosModule, load_fixture

ansible_collections/junipernetworks/junos/tests/unit/modules/network/junos/test_junos_bgp_global.py

@@ -28,7 +28,7 @@
 
 from unittest.mock import patch
 
-from ansible_collections.junipernetworks.junos.plugins.modules import junos_bgp_global
+from ansible_collections.juniper.device.plugins.modules import junos_bgp_global
 from ansible_collections.junipernetworks.junos.tests.unit.modules.utils import set_module_args
 
 from .junos_module import TestJunosModule, load_fixture

ansible_collections/junipernetworks/junos/tests/unit/modules/network/junos/test_junos_command.py

@@ -28,7 +28,7 @@
 
 from unittest.mock import patch
 
-from ansible_collections.junipernetworks.junos.plugins.modules import junos_command
+from ansible_collections.juniper.device.plugins.modules import junos_command
 from ansible_collections.junipernetworks.junos.tests.unit.modules.utils import set_module_args
 
 from .junos_module import TestJunosModule, load_fixture
@@ -44,17 +44,17 @@ def setUp(self):
         super(TestJunosCommandModule, self).setUp()
 
         self.mock_conn = patch(
-            "ansible_collections.junipernetworks.junos.plugins.module_utils.network.junos.junos.Connection",
+            "ansible_collections.juniper.device.plugins.module_utils.network.junos.junos.Connection",
         )
         self.conn = self.mock_conn.start()
 
         self.mock_netconf = patch(
-            "ansible_collections.junipernetworks.junos.plugins.module_utils.network.junos.junos.NetconfConnection",
+            "ansible_collections.juniper.device.plugins.module_utils.network.junos.junos.NetconfConnection",
         )
         self.netconf_conn = self.mock_netconf.start()
 
         self.mock_exec_rpc = patch(
-            "ansible_collections.junipernetworks.junos.plugins.modules.junos_command.exec_rpc",
+            "ansible_collections.juniper.device.plugins.modules.junos_command.exec_rpc",
         )
         self.exec_rpc = self.mock_exec_rpc.start()
 
@@ -64,12 +64,12 @@ def setUp(self):
         self.netconf_rpc = self.mock_netconf_rpc.start()
 
         self.mock_get_connection = patch(
-            "ansible_collections.junipernetworks.junos.plugins.modules.junos_command.get_connection",
+            "ansible_collections.juniper.device.plugins.modules.junos_command.get_connection",
         )
         self.get_connection = self.mock_get_connection.start()
 
         self.mock_get_capabilities = patch(
-            "ansible_collections.junipernetworks.junos.plugins.modules.junos_command.get_capabilities",
+            "ansible_collections.juniper.device.plugins.modules.junos_command.get_capabilities",
         )
         self.get_capabilities = self.mock_get_capabilities.start()
         self.get_capabilities.return_value = {"network_api": "netconf"}

ansible_collections/junipernetworks/junos/tests/unit/modules/network/junos/test_junos_config.py

@@ -26,7 +26,7 @@
 
 from ansible.module_utils._text import to_text
 
-from ansible_collections.junipernetworks.junos.plugins.modules import junos_config
+from ansible_collections.juniper.device.plugins.modules import junos_config
 from ansible_collections.junipernetworks.junos.tests.unit.modules.utils import set_module_args
 
 from .junos_module import TestJunosModule, load_fixture
@@ -39,50 +39,50 @@ def setUp(self):
         super(TestJunosConfigModule, self).setUp()
 
         self.mock_get_config = patch(
-            "ansible_collections.junipernetworks.junos.plugins.modules.junos_config.get_configuration",
+            "ansible_collections.juniper.device.plugins.modules.junos_config.get_configuration",
         )
         self.get_config = self.mock_get_config.start()
 
         self.mock_load_config = patch(
-            "ansible_collections.junipernetworks.junos.plugins.modules.junos_config.load_config",
+            "ansible_collections.juniper.device.plugins.modules.junos_config.load_config",
         )
         self.load_config = self.mock_load_config.start()
 
         self.mock_load_configuration = patch(
-            "ansible_collections.junipernetworks.junos.plugins.modules.junos_config.load_configuration",
+            "ansible_collections.juniper.device.plugins.modules.junos_config.load_configuration",
         )
         self.load_configuration = self.mock_load_configuration.start()
 
         self.mock_lock_configuration = patch(
-            "ansible_collections.junipernetworks.junos.plugins.module_utils.network.junos.junos.lock_configuration",
+            "ansible_collections.juniper.device.plugins.module_utils.network.junos.junos.lock_configuration",
         )
         self.lock_configuration = self.mock_lock_configuration.start()
 
         self.mock_unlock_configuration = patch(
-            "ansible_collections.junipernetworks.junos.plugins.module_utils.network.junos.junos.unlock_configuration",
+            "ansible_collections.juniper.device.plugins.module_utils.network.junos.junos.unlock_configuration",
         )
         self.unlock_configuration = self.mock_unlock_configuration.start()
 
         self.mock_commit_configuration = patch(
-            "ansible_collections.junipernetworks.junos.plugins.modules.junos_config.commit_configuration",
+            "ansible_collections.juniper.device.plugins.modules.junos_config.commit_configuration",
         )
         self.commit_configuration = self.mock_commit_configuration.start()
 
         self.mock_get_diff = patch(
-            "ansible_collections.junipernetworks.junos.plugins.modules.junos_config.get_diff",
+            "ansible_collections.juniper.device.plugins.modules.junos_config.get_diff",
         )
         self.get_diff = self.mock_get_diff.start()
 
         self.mock_conn = patch("ansible.module_utils.connection.Connection")
         self.conn = self.mock_conn.start()
 
         self.mock_netconf = patch(
-            "ansible_collections.junipernetworks.junos.plugins.module_utils.network.junos.junos.NetconfConnection",
+            "ansible_collections.juniper.device.plugins.module_utils.network.junos.junos.NetconfConnection",
         )
         self.netconf_conn = self.mock_netconf.start()
 
         self.mock_exec_rpc = patch(
-            "ansible_collections.junipernetworks.junos.plugins.modules.junos_config.exec_rpc",
+            "ansible_collections.juniper.device.plugins.modules.junos_config.exec_rpc",
         )
         self.exec_rpc = self.mock_exec_rpc.start()
 

ansible_collections/junipernetworks/junos/tests/unit/modules/network/junos/test_junos_facts.py

@@ -28,7 +28,7 @@
 
 from unittest.mock import patch
 
-from ansible_collections.junipernetworks.junos.plugins.modules import junos_facts
+from ansible_collections.juniper.device.plugins.modules import junos_facts
 from ansible_collections.junipernetworks.junos.tests.unit.modules.utils import set_module_args
 
 from .junos_module import TestJunosModule, load_fixture

ansible_collections/junipernetworks/junos/tests/unit/modules/network/junos/test_junos_hostname.py

@@ -28,7 +28,7 @@
 
 from unittest.mock import patch
 
-from ansible_collections.junipernetworks.junos.plugins.modules import junos_hostname
+from ansible_collections.juniper.device.plugins.modules import junos_hostname
 from ansible_collections.junipernetworks.junos.tests.unit.modules.utils import set_module_args
 
 from .junos_module import TestJunosModule, load_fixture

ansible_collections/junipernetworks/junos/tests/unit/modules/network/junos/test_junos_interfaces.py

@@ -28,7 +28,7 @@
 
 from unittest.mock import patch
 
-from ansible_collections.junipernetworks.junos.plugins.modules import junos_interfaces
+from ansible_collections.juniper.device.plugins.modules import junos_interfaces
 from ansible_collections.junipernetworks.junos.tests.unit.modules.utils import set_module_args
 
 from .junos_module import TestJunosModule, load_fixture

ansible_collections/junipernetworks/junos/tests/unit/modules/network/junos/test_junos_l2_interfaces.py

@@ -28,7 +28,7 @@
 
 from unittest.mock import patch
 
-from ansible_collections.junipernetworks.junos.plugins.modules import junos_l2_interfaces
+from ansible_collections.juniper.device.plugins.modules import junos_l2_interfaces
 from ansible_collections.junipernetworks.junos.tests.unit.modules.utils import set_module_args
 
 from .junos_module import TestJunosModule, load_fixture

ansible_collections/junipernetworks/junos/tests/unit/modules/network/junos/test_junos_l3_interfaces.py

@@ -28,7 +28,7 @@
 
 from unittest.mock import patch
 
-from ansible_collections.junipernetworks.junos.plugins.modules import junos_l3_interfaces
+from ansible_collections.juniper.device.plugins.modules import junos_l3_interfaces
 from ansible_collections.junipernetworks.junos.tests.unit.modules.utils import set_module_args
 
 from .junos_module import TestJunosModule, load_fixture

ansible_collections/junipernetworks/junos/tests/unit/modules/network/junos/test_junos_logging_global.py

@@ -28,7 +28,7 @@
 
 from unittest.mock import patch
 
-from ansible_collections.junipernetworks.junos.plugins.modules import junos_logging_global
+from ansible_collections.juniper.device.plugins.modules import junos_logging_global
 from ansible_collections.junipernetworks.junos.tests.unit.modules.utils import set_module_args
 
 from .junos_module import TestJunosModule, load_fixture

ansible_collections/junipernetworks/junos/tests/unit/modules/network/junos/test_junos_netconf.py

@@ -23,7 +23,7 @@
 
 from unittest.mock import patch
 
-from ansible_collections.junipernetworks.junos.plugins.modules import junos_netconf
+from ansible_collections.juniper.device.plugins.modules import junos_netconf
 from ansible_collections.junipernetworks.junos.tests.unit.modules.utils import set_module_args
 
 from .junos_module import TestJunosModule

ansible_collections/junipernetworks/junos/tests/unit/modules/network/junos/test_junos_ntp_global.py

@@ -28,7 +28,7 @@
 
 from unittest.mock import patch
 
-from ansible_collections.junipernetworks.junos.plugins.modules import junos_ntp_global
+from ansible_collections.juniper.device.plugins.modules import junos_ntp_global
 from ansible_collections.junipernetworks.junos.tests.unit.modules.utils import set_module_args
 
 from .junos_module import TestJunosModule, load_fixture

ansible_collections/junipernetworks/junos/tests/unit/modules/network/junos/test_junos_ospf_interfaces.py

@@ -28,7 +28,7 @@
 
 from unittest.mock import MagicMock, patch
 
-from ansible_collections.junipernetworks.junos.plugins.modules import junos_ospf_interfaces
+from ansible_collections.juniper.device.plugins.modules import junos_ospf_interfaces
 from ansible_collections.junipernetworks.junos.tests.unit.modules.utils import set_module_args
 
 from .junos_module import TestJunosModule, load_fixture

ansible_collections/junipernetworks/junos/tests/unit/modules/network/junos/test_junos_ospfv2.py

@@ -28,7 +28,7 @@
 
 from unittest.mock import patch
 
-from ansible_collections.junipernetworks.junos.plugins.modules import junos_ospfv2
+from ansible_collections.juniper.device.plugins.modules import junos_ospfv2
 from ansible_collections.junipernetworks.junos.tests.unit.modules.utils import set_module_args
 
 from .junos_module import TestJunosModule, load_fixture

ansible_collections/junipernetworks/junos/tests/unit/modules/network/junos/test_junos_ospfv3.py

@@ -28,7 +28,7 @@
 
 from unittest.mock import MagicMock, patch
 
-from ansible_collections.junipernetworks.junos.plugins.modules import junos_ospfv3
+from ansible_collections.juniper.device.plugins.modules import junos_ospfv3
 from ansible_collections.junipernetworks.junos.tests.unit.modules.utils import set_module_args
 
 from .junos_module import TestJunosModule, load_fixture