Adding upstream version 9.4.0+dfsg.upstream/9.4.0+dfsg

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

68 files changed, 418 insertions, 89 deletions

diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_acl_interfaces/tests/netconf/gathered.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_acl_interfaces/tests/netconf/gathered.yaml
new file mode 100644
index 000000000..79fbac2f4
--- /dev/null
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_acl_interfaces/tests/netconf/gathered.yaml
@@ -0,0 +1,50 @@
+---
+- ansible.builtin.debug:
+    msg: START junos_acl_interfaces gathered integration tests on connection={{ ansible_connection }}
+
+- block:
+    - name: Reset configuration
+      ansible.builtin.include_tasks: _reset_config.yaml
+
+    - name: Set facts
+      ansible.builtin.set_fact:
+        expected_gathered_config:
+          - name: ge-1/0/0
+            access_groups:
+              - afi: ipv4
+                acls:
+                  - name: second_acl
+                    direction: in
+                  - name: initial_acl
+                    direction: out
+
+    - name: Merge the provided configuration with the exisiting running configuration
+      junipernetworks.junos.junos_acl_interfaces:
+        config:
+          - name: ge-1/0/0
+            access_groups:
+              - afi: ipv4
+                acls:
+                  - name: second_acl
+                    direction: in
+                  - name: initial_acl
+                    direction: out
+        state: merged
+      register: result
+
+    - name: Gather security policies facts using gathered state
+      register: result
+      junipernetworks.junos.junos_acl_interfaces:
+        state: gathered
+
+    - name: Assert that facts were correctly generated
+      ansible.builtin.assert:
+        that: "{{ result['gathered'] == expected_gathered_config }}"
+
+  always:
+    - ansible.builtin.include_tasks: _reset_config.yaml
+
+- ansible.builtin.debug:
+    msg:
+      END junos_acl_interfaces gathered integration tests on connection={{ ansible_connection
+      }}
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_acls/tests/netconf/gathered.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_acls/tests/netconf/gathered.yaml
new file mode 100644
index 000000000..207b79f75
--- /dev/null
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_acls/tests/netconf/gathered.yaml
@@ -0,0 +1,100 @@
+---
+- ansible.builtin.debug:
+    msg: "START junos_acls gathered integration tests on connection={{ ansible_connection }}"
+
+- block:
+    - ansible.builtin.include_tasks: _reset_config.yaml
+
+    - ansible.builtin.include_tasks: config_policy.yaml
+
+    - ansible.builtin.set_fact:
+        expected_gathered_output:
+          - acls:
+              - aces:
+                  - name: ten_dot
+                    source:
+                      address: 10.0.0.0/8
+                      port_protocol:
+                        eq: bgp
+                    protocol: tcp
+                  - name: eleven_dot
+                    source:
+                      address: 11.0.0.0/8
+                      port_protocol:
+                        eq: bgp
+                    protocol: tcp
+                name: initial_acl
+              - aces:
+                  - name: twelve_dot
+                    source:
+                      address: 12.0.0.0/8
+                      port_protocol:
+                        eq: bgp
+                    protocol: tcp
+                name: second_acl
+              - aces:
+                  - name: thirteen_dot
+                    source:
+                      address:
+                        - 13.0.0.0/16
+                        - 13.1.0.0/16
+                      port_protocol:
+                        eq: bgp
+                    protocol: tcp
+                name: third_acl
+              - aces:
+                  - name: ssh_rule
+                    source:
+                      prefix_list:
+                        - name: "ipv4-interfaces"
+                        - name: "ospf-all-routers"
+                      port_protocol:
+                        eq: ssh
+                    protocol: tcp
+                name: allow_ssh_acl
+            afi: ipv4
+          - acls:
+              - aces:
+                  - name: colon_eleven
+                    source:
+                      address: ::11/128
+                      port_protocol:
+                        eq: "631"
+                name: initial_acl6
+            afi: ipv6
+
+    - name: Merge the provided configuration with the existing running configuration
+      junipernetworks.junos.junos_acls:
+        config:
+          - afi: ipv4
+            acls:
+              - name: allow_ssh_acl
+                aces:
+                  - name: ssh_rule
+                    source:
+                      prefix_list:
+                        - name: "ipv4-interfaces"
+                        - name: "ospf-all-routers"
+                      port_protocol:
+                        eq: ssh
+                    protocol: tcp
+        state: merged
+
+    - name: Gather Junos Acls facts using gathered state
+      register: result
+      junipernetworks.junos.junos_acls:
+        state: gathered
+
+    - name: Assert that facts were correctly generated
+      ansible.builtin.assert:
+        that: "{{ expected_gathered_output == result['gathered'] }}"
+      register: result
+
+  tags: merged
+  always:
+    - ansible.builtin.include_tasks: _reset_config.yaml
+
+    - ansible.builtin.include_tasks: reset_policy_config.yaml
+
+- ansible.builtin.debug:
+    msg: "END junos_acls gathered integration tests on connection={{ ansible_connection }}"
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_bgp_address_family/tests/netconf/deleted.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_bgp_address_family/tests/netconf/deleted.yaml
index 248421891..2bca3aea4 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_bgp_address_family/tests/netconf/deleted.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_bgp_address_family/tests/netconf/deleted.yaml
@@ -111,7 +111,7 @@
         expected_deleted_res_output: {}
 
     - name: Merge the existing config with provided configuration
-      junos_bgp_address_family: *merged
+      junipernetworks.junos.junos_bgp_address_family: *merged
       register: result
 
     - name: Delete complete existing bgp address family configuration
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_bgp_global/tests/netconf/merged.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_bgp_global/tests/netconf/merged.yaml
index a89774613..8037559b5 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_bgp_global/tests/netconf/merged.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_bgp_global/tests/netconf/merged.yaml
@@ -49,7 +49,7 @@
           - "{{ merged['after'] == result['after'] }}"
 
     - name: Merge the provided configuration with the existing running configuration (IDEMPOTENT)
-      junos_bgp_global: *merged
+      junipernetworks.junos.junos_bgp_global: *merged
       register: result
 
     - name: Assert that the previous task was idempotent
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_bgp_global/tests/netconf/overridden.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_bgp_global/tests/netconf/overridden.yaml
new file mode 100644
index 000000000..88cb9fcb4
--- /dev/null
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_bgp_global/tests/netconf/overridden.yaml
@@ -0,0 +1,51 @@
+---
+- name: Debug task
+  ansible.builtin.debug:
+    msg: "START junos_bgp_global overridden integration tests on connection={{ ansible_connection }}"
+
+- block:
+    - name: Reset configuration
+      ansible.builtin.include_tasks: _reset_config.yaml
+
+    - name: Initial config
+      ansible.builtin.include_tasks: _initial_config.yaml
+
+    - name: Replace configuration
+      junipernetworks.junos.junos_bgp_global: &overridden
+        config:
+          bgp_error_tolerance:
+            malformed_route_limit: 20000000
+          bmp:
+            monitor: true
+          damping: true
+          description: "This is configured with Junos_bgp resource module"
+        state: overridden
+      register: result
+
+    - name: Assert that before dicts were correctly generated
+      ansible.builtin.assert:
+        that: "{{ merged['after'] == result['before'] }}"
+
+    - name: Assert configuration
+      ansible.builtin.assert:
+        that:
+          - result.changed == True
+          - "{{ overridden['after'] == result.after }}"
+
+    - name: Merge the provided configuration with the existing running configuration (IDEMPOTENT)
+      junipernetworks.junos.junos_bgp_global: *overridden
+      register: result
+
+    - name: Assert that the previous task was idempotent
+      ansible.builtin.assert:
+        that:
+          - result.changed == False
+
+  tags: overridden
+  always:
+    - name: Reset configuration
+      ansible.builtin.include_tasks: _reset_config.yaml
+
+- name: Debug task
+  ansible.builtin.debug:
+    msg: "END junos_bgp_global overridden integration tests on connection={{ ansible_connection }}"
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_bgp_global/tests/netconf/replaced.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_bgp_global/tests/netconf/replaced.yaml
index a34d186fe..93c3a797f 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_bgp_global/tests/netconf/replaced.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_bgp_global/tests/netconf/replaced.yaml
@@ -33,7 +33,7 @@
           - "{{ replaced['after'] == result.after }}"
 
     - name: Merge the provided configuration with the existing running configuration (IDEMPOTENT)
-      junos_bgp_global: *replaced
+      junipernetworks.junos.junos_bgp_global: *replaced
       register: result
 
     - name: Assert that the previous task was idempotent
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_bgp_global/vars/main.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_bgp_global/vars/main.yaml
index 5927e7ff0..a9f9e9b3a 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_bgp_global/vars/main.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_bgp_global/vars/main.yaml
@@ -108,3 +108,12 @@ replaced:
       monitor: true
     damping: true
     description: "This is configured with Junos_bgp resource module"
+
+overridden:
+  after:
+    bgp_error_tolerance:
+      malformed_route_limit: 20000000
+    bmp:
+      monitor: true
+    damping: true
+    description: "This is configured with Junos_bgp resource module"
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_config/tasks/redirection.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_config/tasks/redirection.yaml
index 7671a0477..0b26ef511 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_config/tasks/redirection.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_config/tasks/redirection.yaml
@@ -7,7 +7,8 @@
   register: test_cases
 
 - name: Set test_items
-  ansible.builtin.set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
+  ansible.builtin.set_fact:
+    test_items: "{{ test_cases.files | map(attribute='path') | list }}"
 
 - name: Run test case (connection=ansible.netcommon.netconf)
   ansible.builtin.include_tasks: "{{ test_case_to_run }}"
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_facts/tests/netconf/facts.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_facts/tests/netconf/facts.yaml
index b795d98ed..6dfcaf57e 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_facts/tests/netconf/facts.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_facts/tests/netconf/facts.yaml
@@ -31,6 +31,8 @@
   register: result
   junipernetworks.junos.junos_facts:
     gather_subset: "!hardware"
+  vars:
+    ansible_command_timeout: 100
 
 - name: Assertion
   ansible.builtin.assert:
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_hostname/tests/netconf/merged.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_hostname/tests/netconf/merged.yaml
index a49fb9e45..8d8b2dfd4 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_hostname/tests/netconf/merged.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_hostname/tests/netconf/merged.yaml
@@ -25,7 +25,7 @@
           - "{{ merged['after'] == result['after'] }}"
 
     - name: Merge the provided configuration with the existing running configuration (IDEMPOTENT)
-      junos_hostname: *merged
+      junipernetworks.junos.junos_hostname: *merged
       register: result
 
     - name: Assert that the previous task was idempotent
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_interfaces/tests/netconf/overridden.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_interfaces/tests/netconf/overridden.yaml
index 2cb15c8f2..34b9be83f 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_interfaces/tests/netconf/overridden.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_interfaces/tests/netconf/overridden.yaml
@@ -34,6 +34,7 @@
             description: Configured by Ansible - Interface 2
             mtu: 2048
             speed: 10m
+            enabled: false
             hold_time:
               up: 3000
               down: 3200
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_interfaces/tests/netconf/rendered.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_interfaces/tests/netconf/rendered.yaml
index e41c92b08..bee5568a5 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_interfaces/tests/netconf/rendered.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_interfaces/tests/netconf/rendered.yaml
@@ -4,14 +4,14 @@
       ansible_connection }}
 
 - ansible.builtin.set_fact:
-    expected_rendered_output: '<nc:interfaces xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0"><nc:interface><nc:name>ge-0/0/2</nc:name><nc:description>Configured by Ansibull</nc:description><nc:speed>20m</nc:speed><nc:mtu>2048</nc:mtu><nc:hold-time><nc:up>3200</nc:up><nc:down>3200</nc:down></nc:hold-time></nc:interface></nc:interfaces>'
+    expected_rendered_output: '<nc:interfaces xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0"><nc:interface><nc:name>ge-0/0/2</nc:name><nc:description>Configured by Ansible</nc:description><nc:speed>20m</nc:speed><nc:mtu>2048</nc:mtu><nc:enable/><nc:hold-time><nc:up>3200</nc:up><nc:down>3200</nc:down></nc:hold-time></nc:interface></nc:interfaces>'
 
 - name: Render platform specific commands from task input using rendered state
   register: result
   junipernetworks.junos.junos_interfaces:
     config:
       - name: ge-0/0/2
-        description: Configured by Ansibull
+        description: Configured by Ansible
         mtu: 2048
         speed: 20m
         hold_time:
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_l2_interfaces/tests/netconf/rtt.yml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_l2_interfaces/tests/netconf/rtt.yml
index 4b5501a05..634727a67 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_l2_interfaces/tests/netconf/rtt.yml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_l2_interfaces/tests/netconf/rtt.yml
@@ -7,16 +7,6 @@
 
 - ansible.builtin.include_tasks: _base_config.yaml
 
-- ansible.builtin.set_fact:
-    expected_revert_output:
-      - name: ge-0/0/2
-        trunk:
-          allowed_vlans:
-            - vlan100
-          native_vlan: "200"
-        enhanced_layer: true
-        unit: 0
-
 - block:
     - name: Apply the provided configuration (base config)
       register: base_config
@@ -64,8 +54,7 @@
 
     - name: Assert that config was reverted
       ansible.builtin.assert:
-        that:
-          "{{ expected_revert_output | symmetric_difference(revert['after'])\
+        that: "{{ base_config['after'] | symmetric_difference(revert['after'])\
           \ |length == 0 }}"
   always:
     - ansible.builtin.include_tasks: _remove_config.yaml
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_lldp_global/tests/netconf/gathered.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_lldp_global/tests/netconf/gathered.yaml
index 1d18ea0f9..26f57fa4a 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_lldp_global/tests/netconf/gathered.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_lldp_global/tests/netconf/gathered.yaml
@@ -21,10 +21,10 @@
 
 - ansible.builtin.set_fact:
     expected_merged_output:
-      - interval: 10000
-        address: 10.1.1.1
-        transmit_delay: 400
-        hold_multiplier: 1
+      address: 10.1.1.1
+      hold_multiplier: 10
+      interval: 10000
+      transmit_delay: 400
 
 - block:
     - name: Merge the provided configuration with the exisiting running configuration
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_logging_global/tests/netconf/_initial_config.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_logging_global/tests/netconf/_initial_config.yaml
index 289c92300..b5cae6f7f 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_logging_global/tests/netconf/_initial_config.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_logging_global/tests/netconf/_initial_config.yaml
@@ -5,6 +5,7 @@
 - name: Configure basic config relevant to logging global
   junipernetworks.junos.junos_config:
     lines:
+      - set routing-instances inst11 instance-type virtual-router
       - set routing-instances inst11 description "inst11"
 
 - ansible.builtin.debug:
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_logging_global/tests/netconf/merged.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_logging_global/tests/netconf/merged.yaml
index 9bcfcd7c8..bf0173191 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_logging_global/tests/netconf/merged.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_logging_global/tests/netconf/merged.yaml
@@ -96,7 +96,7 @@
           - "{{ merged['after'] == result['after'] }}"
 
     - name: Merge the provided configuration with the existing running configuration (IDEMPOTENT)
-      junos_logging_global: *merged
+      junipernetworks.junos.junos_logging_global: *merged
       register: result
 
     - name: Assert that the previous task was idempotent
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_logging_global/tests/netconf/overridden.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_logging_global/tests/netconf/overridden.yaml
index fbdc80f3b..a3107f67b 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_logging_global/tests/netconf/overridden.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_logging_global/tests/netconf/overridden.yaml
@@ -159,7 +159,7 @@
           - "{{ replaced['after'] == result.after }}"
 
     - name: Replaced the provided configuration with the existing running configuration (IDEMPOTENT)
-      junos_logging_global: *overridden
+      junipernetworks.junos.junos_logging_global: *overridden
       register: result
 
     - name: Assert that the previous task was idempotent
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_logging_global/tests/netconf/replaced.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_logging_global/tests/netconf/replaced.yaml
index fbfb074e3..f4214b470 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_logging_global/tests/netconf/replaced.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_logging_global/tests/netconf/replaced.yaml
@@ -159,7 +159,7 @@
           - "{{ replaced['after'] == result.after }}"
 
     - name: Replaced the provided configuration with the existing running configuration (IDEMPOTENT)
-      junos_logging_global: *replaced
+      junipernetworks.junos.junos_logging_global: *replaced
       register: result
 
     - name: Assert that the previous task was idempotent
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ntp_global/tests/netconf/_initial_config.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ntp_global/tests/netconf/_initial_config.yaml
index dc07e5102..7df565493 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ntp_global/tests/netconf/_initial_config.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ntp_global/tests/netconf/_initial_config.yaml
@@ -5,7 +5,9 @@
 - name: Configure basic config relevant to ntp global
   junipernetworks.junos.junos_config:
     lines:
+      - set routing-instances rt1 instance-type virtual-router
       - set routing-instances rt1 description "rt1"
+      - set routing-instances rt2 instance-type virtual-router
       - set routing-instances rt2 description "rt2"
 
 - ansible.builtin.debug:
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ntp_global/tests/netconf/merged.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ntp_global/tests/netconf/merged.yaml
index 78e943cd6..b7e24df9f 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ntp_global/tests/netconf/merged.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ntp_global/tests/netconf/merged.yaml
@@ -64,7 +64,7 @@
           - "{{ merged['after'] == result['after'] }}"
 
     - name: Merge the provided configuration with the existing running configuration (IDEMPOTENT)
-      junos_ntp_global: *merged
+      junipernetworks.junos.junos_ntp_global: *merged
       register: result
 
     - name: Assert that the previous task was idempotent
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ntp_global/tests/netconf/overridden.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ntp_global/tests/netconf/overridden.yaml
index 81db02e3d..8d7530e16 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ntp_global/tests/netconf/overridden.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ntp_global/tests/netconf/overridden.yaml
@@ -31,7 +31,7 @@
           - "{{ replaced['after'] == result.after }}"
 
     - name: Replaced the provided configuration with the existing running configuration (IDEMPOTENT)
-      junos_ntp_global: *overridden
+      junipernetworks.junos.junos_ntp_global: *overridden
       register: result
 
     - name: Assert that the previous task was idempotent
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ntp_global/tests/netconf/replaced.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ntp_global/tests/netconf/replaced.yaml
index fdca062c1..160a8ba3b 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ntp_global/tests/netconf/replaced.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ntp_global/tests/netconf/replaced.yaml
@@ -31,7 +31,7 @@
           - "{{ replaced['after'] == result.after }}"
 
     - name: Replaced the provided configuration with the existing running configuration (IDEMPOTENT)
-      junos_ntp_global: *replaced
+      junipernetworks.junos.junos_ntp_global: *replaced
       register: result
 
     - name: Assert that the previous task was idempotent
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf_interfaces/tests/netconf/deleted.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf_interfaces/tests/netconf/deleted.yaml
index 4ac54eb97..3e19d1de2 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf_interfaces/tests/netconf/deleted.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf_interfaces/tests/netconf/deleted.yaml
@@ -38,12 +38,6 @@
         state: deleted
       register: result
 
-    - ansible.builtin.debug:
-        var: result.after
-
-    - ansible.builtin.debug:
-        var: config
-
     - name: Assert changed
       ansible.builtin.assert: &changed
         that:
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf_interfaces/tests/netconf/merged.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf_interfaces/tests/netconf/merged.yaml
index 5d7d1980c..ca6099a57 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf_interfaces/tests/netconf/merged.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf_interfaces/tests/netconf/merged.yaml
@@ -11,24 +11,148 @@
               - afi: "ipv4"
                 processes:
                   area:
-                    area_id: "0.0.0.2"
-                  priority: 3
+                    area_id: "0.0.0.100"
+                  authentication:
+                    md5:
+                      - key_id: 56
+                        key_value: "VALUE_SPECIFIED_IN_NO_LOG_PARAMETER"
+                        start_time: "2023-7-1.02:00:00 +0000"
+                      - key_id: 50
+                        key_value: "VALUE_SPECIFIED_IN_NO_LOG_PARAMETER"
+                      - key_id: 40
+                        key_value: "VALUE_SPECIFIED_IN_NO_LOG_PARAMETER"
+                  bandwidth_based_metrics:
+                    - bandwidth: "1g"
+                      metric: 5
+                    - bandwidth: "10g"
+                      metric: 40
+                  dead_interval: 4
+                  demand_circuit: true
+                  hello_interval: 2
                   metric: 5
-            name: "ge-0/0/2.0"
+                  no_advertise_adjacency_segment: true
+                  no_eligible_backup: true
+                  no_eligible_remote_backup: true
+                  no_interface_state_traps: true
+                  no_neighbor_down_notification: true
+                  node_link_protection: true
+                  passive: true
+                  poll_interval: 2
+                  priority: 3
+                  retransmit_interval: 2
+            name: "so-0/0/0.0"
+            router_id: "10.200.16.75"
+          - address_family:
+              - afi: "ipv4"
+                processes:
+                  area:
+                    area_id: "0.0.0.200"
+                  authentication:
+                    simple_password: "VALUE_SPECIFIED_IN_NO_LOG_PARAMETER"
+                  priority: 3
+            name: "so-0/1/0.0"
+            router_id: "10.200.16.75"
+          - address_family:
+              - afi: "ipv4"
+                processes:
+                  area:
+                    area_id: "0.0.0.200"
+                  authentication:
+                    md5:
+                      - key_id: 10
+                        key_value: "VALUE_SPECIFIED_IN_NO_LOG_PARAMETER"
+                        start_time: "2023-7-12.03:00:00 +0000"
+                  priority: 2
+            name: "so-0/2/0.0"
+            router_id: "10.200.16.75"
+          - address_family:
+              - afi: "ipv4"
+                processes:
+                  area:
+                    area_id: "0.0.0.120"
+                  authentication:
+                    md5:
+                      - key_id: 10
+                        key_value: "VALUE_SPECIFIED_IN_NO_LOG_PARAMETER"
+                        start_time: "2023-7-12.03:00:00 +0000"
+                  priority: 2
+            name: so-0/2/0.1
             router_id: "10.200.16.75"
 
     - name: Merge the provided configuration with the exisiting running configuration
       junipernetworks.junos.junos_ospf_interfaces: &merged
         config:
-          - router_id: "10.200.16.75"
-            name: "ge-0/0/2.0"
-            address_family:
-              - afi: "ipv4"
+          - address_family:
+              - afi: ipv4
                 processes:
                   area:
-                    area_id: "0.0.0.2"
-                  priority: 3
+                    area_id: 0.0.0.100
+                  authentication:
+                    md5:
+                      - key_id: "56"
+                        key_value: ansible56
+                        start_time: 2023-7-1.02:00:00 +0000
+                      - key_id: "50"
+                        key_value: ansible50
+                      - key_id: "40"
+                        key_value: ansible40
+                  bandwidth_based_metrics:
+                    - bandwidth: 1g
+                      metric: 5
+                    - bandwidth: 10g
+                      metric: 40
+                  dead_interval: 4
+                  hello_interval: 2
                   metric: 5
+                  passive: true
+                  poll_interval: 2
+                  priority: 3
+                  retransmit_interval: 2
+                  no_advertise_adjacency_segment: true
+                  node_link_protection: true
+                  no_neighbor_down_notification: true
+                  no_interface_state_traps: true
+                  no_eligible_remote_backup: true
+                  no_eligible_backup: true
+                  demand_circuit: true
+            name: so-0/0/0.0
+            router_id: 10.200.16.75
+          - address_family:
+              - afi: ipv4
+                processes:
+                  area:
+                    area_id: 0.0.0.200
+                  authentication:
+                    simple_password: simple
+                  priority: 3
+            name: so-0/1/0.0
+            router_id: 10.200.16.75
+          - address_family:
+              - afi: ipv4
+                processes:
+                  area:
+                    area_id: 0.0.0.200
+                  authentication:
+                    md5:
+                      - key_id: "10"
+                        key_value: ansible10
+                        start_time: 2023-7-12.03:00:00 +0000
+                  priority: 2
+            name: so-0/2/0.0
+            router_id: 10.200.16.75
+          - address_family:
+              - afi: ipv4
+                processes:
+                  area:
+                    area_id: 0.0.0.120
+                  authentication:
+                    md5:
+                      - key_id: "10"
+                        key_value: ansible10
+                        start_time: 2023-7-12.03:00:00 +0000
+                  priority: 2
+            name: so-0/2/0.1
+            router_id: 10.200.16.75
         state: merged
       register: result
 
@@ -40,14 +164,9 @@
             \ == 0 }}"
 
     - name: Merge the provided configuration with the existing running configuration (IDEMPOTENT)
-      junos_ospf_interfaces: *merged
+      junipernetworks.junos.junos_ospf_interfaces: *merged
       register: result
 
-    - name: Assert that the previous task was idempotent
-      ansible.builtin.assert:
-        that:
-          - result.changed == False
-
   tags: merged
   always:
     - ansible.builtin.include_tasks: _reset_config.yaml
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf_interfaces/tests/netconf/merged_update.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf_interfaces/tests/netconf/merged_update.yaml
index 067698e19..fe3178e84 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf_interfaces/tests/netconf/merged_update.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf_interfaces/tests/netconf/merged_update.yaml
@@ -50,7 +50,7 @@
             \ == 0 }}"
 
     - name: Merge the provided configuration with the existing running configuration (IDEMPOTENT)
-      junos_ospf_interfaces: *merged
+      junipernetworks.junos.junos_ospf_interfaces: *merged
       register: result
 
     - name: Assert that the previous task was idempotent
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf_interfaces/tests/netconf/overridden.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf_interfaces/tests/netconf/overridden.yaml
index ad7df535d..c0eae03f9 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf_interfaces/tests/netconf/overridden.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf_interfaces/tests/netconf/overridden.yaml
@@ -53,7 +53,7 @@
             \ == 0 }}"
 
     - name: Override the provided configuration with the existing running configuration (IDEMPOTENT)
-      junos_ospf_interfaces: *overridden
+      junipernetworks.junos.junos_ospf_interfaces: *overridden
       register: result
 
     - name: Assert that the previous task was idempotent
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf/defaults/main.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospfv2/defaults/main.yaml
index 164afead2..164afead2 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf/defaults/main.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospfv2/defaults/main.yaml
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf/meta/main.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospfv2/meta/main.yaml
index d80f5fbf3..d80f5fbf3 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf/meta/main.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospfv2/meta/main.yaml
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf/tasks/main.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospfv2/tasks/main.yaml
index e9b22ba68..e9b22ba68 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf/tasks/main.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospfv2/tasks/main.yaml
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf/tasks/netconf.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospfv2/tasks/netconf.yaml
index 3db81d098..3db81d098 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf/tasks/netconf.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospfv2/tasks/netconf.yaml
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf/tests/netconf/_initial_config.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospfv2/tests/netconf/_initial_config.yaml
index 41932e7dd..41932e7dd 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf/tests/netconf/_initial_config.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospfv2/tests/netconf/_initial_config.yaml
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf/tests/netconf/_reset_config.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospfv2/tests/netconf/_reset_config.yaml
index 6c3974c8f..6c3974c8f 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf/tests/netconf/_reset_config.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospfv2/tests/netconf/_reset_config.yaml
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf/tests/netconf/deleted.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospfv2/tests/netconf/deleted.yaml
index 3318258e6..3318258e6 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf/tests/netconf/deleted.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospfv2/tests/netconf/deleted.yaml
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf/tests/netconf/empty_config.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospfv2/tests/netconf/empty_config.yaml
index 8d455dbaf..8d455dbaf 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf/tests/netconf/empty_config.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospfv2/tests/netconf/empty_config.yaml
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf/tests/netconf/fixtures/parsed.cfg b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospfv2/tests/netconf/fixtures/parsed.cfg
index 01d8294e2..01d8294e2 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf/tests/netconf/fixtures/parsed.cfg
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospfv2/tests/netconf/fixtures/parsed.cfg
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf/tests/netconf/gathered.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospfv2/tests/netconf/gathered.yaml
index 304246381..304246381 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf/tests/netconf/gathered.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospfv2/tests/netconf/gathered.yaml
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf/tests/netconf/merged.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospfv2/tests/netconf/merged.yaml
index 7207f62b6..4578127a8 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf/tests/netconf/merged.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospfv2/tests/netconf/merged.yaml
@@ -19,7 +19,7 @@
             router_id: 10.200.16.75
 
     - name: Merge the provided configuration with the exisiting running configuration
-      junos_ospfv2: &merged
+      junipernetworks.junos.junos_ospfv2: &merged
         config:
           - router_id: 10.200.16.75
             areas:
@@ -41,7 +41,7 @@
           - "{{ config|symmetric_difference(result.after) == [] }}"
 
     - name: Merge the provided configuration with the existing running configuration (IDEMPOTENT)
-      junos_ospfv2: *merged
+      junipernetworks.junos.junos_ospfv2: *merged
       register: result
 
     - name: Assert that the previous task was idempotent
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf/tests/netconf/overridden.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospfv2/tests/netconf/overridden.yaml
index 6cabbe25b..9716d3d48 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf/tests/netconf/overridden.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospfv2/tests/netconf/overridden.yaml
@@ -26,7 +26,7 @@
                   - name: ge-2/2/0.0
 
     - name: Override Junos OSPF config
-      junos_ospfv2:
+      junipernetworks.junos.junos_ospfv2:
         config:
           - router_id: 10.200.16.75
             areas:
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf/tests/netconf/parsed.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospfv2/tests/netconf/parsed.yaml
index 67e573c33..67e573c33 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf/tests/netconf/parsed.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospfv2/tests/netconf/parsed.yaml
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf/tests/netconf/rendered.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospfv2/tests/netconf/rendered.yaml
index 8e123b746..8e123b746 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf/tests/netconf/rendered.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospfv2/tests/netconf/rendered.yaml
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf/tests/netconf/replaced.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospfv2/tests/netconf/replaced.yaml
index 5c7f1967d..5c7f1967d 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf/tests/netconf/replaced.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospfv2/tests/netconf/replaced.yaml
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf/tests/netconf/rtt.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospfv2/tests/netconf/rtt.yaml
index 7e8080a63..6aab4d341 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospf/tests/netconf/rtt.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospfv2/tests/netconf/rtt.yaml
@@ -28,7 +28,7 @@
         gather_subset:
           - default
         gather_network_resources:
-          - ospf
+          - ospfv2
 
     - name: Apply the provided configuration (config to be reverted)
       register: result
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospfv3/tests/netconf/merged.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospfv3/tests/netconf/merged.yaml
index c0ff17516..81f3e3cab 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospfv3/tests/netconf/merged.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_ospfv3/tests/netconf/merged.yaml
@@ -41,7 +41,7 @@
           - "{{ config|symmetric_difference(result.after) == [] }}"
 
     - name: Merge the provided configuration with the existing running configuration (IDEMPOTENT)
-      junos_ospfv3: *merged
+      junipernetworks.junos.junos_ospfv3: *merged
       register: result
 
     - name: Assert that the previous task was idempotent
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_prefix_lists/tests/netconf/deleted.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_prefix_lists/tests/netconf/deleted.yaml
index ee5dc577e..b3010c2aa 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_prefix_lists/tests/netconf/deleted.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_prefix_lists/tests/netconf/deleted.yaml
@@ -42,7 +42,7 @@
             \ == 0 }}"
 
     - name: Delete the existing running configuration (IDEMPOTENT)
-      junos_prefix_lists: *deleted
+      junipernetworks.junos.junos_prefix_lists: *deleted
       register: result
 
     - name: Assert that the previous task was idempotent
@@ -54,7 +54,7 @@
         expected_deleted_output: []
 
     - name: Merge the existing config with provided configuration
-      junos_prefix_lists: *merged
+      junipernetworks.junos.junos_prefix_lists: *merged
       register: result
 
     - name: Delete complete existing bgp address family configuration
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_prefix_lists/tests/netconf/merged.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_prefix_lists/tests/netconf/merged.yaml
index 140601233..a780e0978 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_prefix_lists/tests/netconf/merged.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_prefix_lists/tests/netconf/merged.yaml
@@ -44,7 +44,7 @@
             \ == 0 }}"
 
     - name: Merge the provided configuration with the existing running configuration (IDEMPOTENT)
-      junos_prefix_lists: *merged
+      junipernetworks.junos.junos_prefix_lists: *merged
       register: result
 
     - name: Assert that the previous task was idempotent
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_prefix_lists/tests/netconf/overridden.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_prefix_lists/tests/netconf/overridden.yaml
index 5f1b7970d..9994c90cb 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_prefix_lists/tests/netconf/overridden.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_prefix_lists/tests/netconf/overridden.yaml
@@ -54,7 +54,7 @@
             \ == 0 }}"
 
     - name: Override existing running prefix lists configuration with provided (IDEMPOTENT)
-      junos_prefix_lists: *overridden
+      junipernetworks.junos.junos_prefix_lists: *overridden
       register: result
 
     - name: Assert that the previous task was idempotent
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_prefix_lists/tests/netconf/replaced.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_prefix_lists/tests/netconf/replaced.yaml
index 375813c1d..f38cc9d4a 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_prefix_lists/tests/netconf/replaced.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_prefix_lists/tests/netconf/replaced.yaml
@@ -56,7 +56,7 @@
             \ == 0 }}"
 
     - name: Replace existing running prefix lists configuration with provided (IDEMPOTENT)
-      junos_prefix_lists: *replaced
+      junipernetworks.junos.junos_prefix_lists: *replaced
       register: result
 
     - name: Assert that the previous task was idempotent
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_routing_instances/tests/netconf/deleted.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_routing_instances/tests/netconf/deleted.yaml
index e759b7c97..4fb1f7491 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_routing_instances/tests/netconf/deleted.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_routing_instances/tests/netconf/deleted.yaml
@@ -48,7 +48,7 @@
             \ == 0 }}"
 
     - name: Delete the existing running configuration (IDEMPOTENT)
-      junos_routing_instances: *deleted
+      junipernetworks.junos.junos_routing_instances: *deleted
       register: result
 
     - name: Assert that the previous task was idempotent
@@ -60,7 +60,7 @@
         expected_deleted_rints_output: []
 
     - name: Merge the existing config with provided configuration
-      junos_routing_instances: *merged
+      junipernetworks.junos.junos_routing_instances: *merged
       register: result
 
     - name: Delete complete existing bgp address family configuration
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_routing_instances/tests/netconf/merged.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_routing_instances/tests/netconf/merged.yaml
index 35d1168b4..b35b7767a 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_routing_instances/tests/netconf/merged.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_routing_instances/tests/netconf/merged.yaml
@@ -55,7 +55,7 @@
             \ == 0 }}"
 
     - name: Merge the provided configuration with the existing running configuration (IDEMPOTENT)
-      junos_routing_instances: *merged
+      junipernetworks.junos.junos_routing_instances: *merged
       register: result
 
     - name: Assert that the previous task was idempotent
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_routing_instances/tests/netconf/overridden.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_routing_instances/tests/netconf/overridden.yaml
index ea49cc6ea..8ccc0e222 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_routing_instances/tests/netconf/overridden.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_routing_instances/tests/netconf/overridden.yaml
@@ -95,7 +95,7 @@
             \ == 0 }}"
 
     - name: Override the existing running configuration with the provided configuration (IDEMPOTENT)
-      junos_routing_instances: *overridden
+      junipernetworks.junos.junos_routing_instances: *overridden
       register: result
 
     - name: Assert that the previous task was idempotent
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_routing_instances/tests/netconf/replaced.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_routing_instances/tests/netconf/replaced.yaml
index 33e88d048..82e178083 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_routing_instances/tests/netconf/replaced.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_routing_instances/tests/netconf/replaced.yaml
@@ -71,7 +71,7 @@
             \ == 0 }}"
 
     - name: Merge the provided configuration with the existing running configuration (IDEMPOTENT)
-      junos_routing_instances: *replaced
+      junipernetworks.junos.junos_routing_instances: *replaced
       register: result
 
     - name: Assert that the previous task was idempotent
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_routing_options/tests/netconf/merged.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_routing_options/tests/netconf/merged.yaml
index 48b4fad6f..a924e8d0a 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_routing_options/tests/netconf/merged.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_routing_options/tests/netconf/merged.yaml
@@ -24,7 +24,7 @@
           - "{{ merged['after'] == result['after'] }}"
 
     - name: Merge the provided configuration with the existing running configuration (IDEMPOTENT)
-      junos_routing_options: *merged
+      junipernetworks.junos.junos_routing_options: *merged
       register: result
 
     - name: Assert that the previous task was idempotent
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_routing_options/tests/netconf/overridden.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_routing_options/tests/netconf/overridden.yaml
index 63d5e08dd..789cf05f4 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_routing_options/tests/netconf/overridden.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_routing_options/tests/netconf/overridden.yaml
@@ -28,7 +28,7 @@
           - "{{ replaced['after'] == result.after }}"
 
     - name: Replaced the provided configuration with the existing running configuration (IDEMPOTENT)
-      junos_routing_options: *overridden
+      junipernetworks.junos.junos_routing_options: *overridden
       register: result
 
     - name: Assert that the previous task was idempotent
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_routing_options/tests/netconf/replaced.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_routing_options/tests/netconf/replaced.yaml
index 60c0c9aff..4a6a9a2f7 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_routing_options/tests/netconf/replaced.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_routing_options/tests/netconf/replaced.yaml
@@ -28,7 +28,7 @@
           - "{{ replaced['after'] == result.after }}"
 
     - name: Replaced the provided configuration with the existing running configuration (IDEMPOTENT)
-      junos_routing_options: *replaced
+      junipernetworks.junos.junos_routing_options: *replaced
       register: result
 
     - name: Assert that the previous task was idempotent
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_security_policies/tests/netconf/gathered.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_security_policies/tests/netconf/gathered.yaml
index 585837f36..8cde24c6e 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_security_policies/tests/netconf/gathered.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_security_policies/tests/netconf/gathered.yaml
@@ -12,12 +12,6 @@
       junipernetworks.junos.junos_security_policies:
         state: gathered
 
-    - ansible.builtin.debug:
-        msg: "{{ result['gathered'] }}"
-
-    - ansible.builtin.debug:
-        msg: "{{ merged['after'] }}"
-
     - name: Assert that facts were correctly generated
       ansible.builtin.assert:
         that: "{{ merged['after'] == result['gathered'] }}"
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_security_policies/tests/netconf/merged.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_security_policies/tests/netconf/merged.yaml
index 4b8a5915d..bbf1b26ab 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_security_policies/tests/netconf/merged.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_security_policies/tests/netconf/merged.yaml
@@ -126,7 +126,7 @@
           - "{{ merged['after'] == result['after'] }}"
 
     - name: Merge the provided configuration with the existing running configuration (IDEMPOTENT)
-      junos_security_policies: *merged
+      junipernetworks.junos.junos_security_policies: *merged
       register: result
 
     - name: Assert that the previous task was idempotent
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_security_policies/tests/netconf/overridden.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_security_policies/tests/netconf/overridden.yaml
index fcb34c0b0..904340918 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_security_policies/tests/netconf/overridden.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_security_policies/tests/netconf/overridden.yaml
@@ -37,7 +37,7 @@
           - "{{ replaced['after'] == result['after'] }}"
 
     - name: Replaced the provided configuration with the existing running configuration (IDEMPOTENT)
-      junos_security_policies: *overridden
+      junipernetworks.junos.junos_security_policies: *overridden
       register: result
 
     - name: Assert that the previous task was idempotent
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_security_policies/tests/netconf/replaced.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_security_policies/tests/netconf/replaced.yaml
index a9c835c0b..f4682e911 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_security_policies/tests/netconf/replaced.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_security_policies/tests/netconf/replaced.yaml
@@ -37,7 +37,7 @@
           - "{{ replaced['after'] == result.after }}"
 
     - name: Replaced the provided configuration with the existing running configuration (IDEMPOTENT)
-      junos_security_policies: *replaced
+      junipernetworks.junos.junos_security_policies: *replaced
       register: result
 
     - name: Assert that the previous task was idempotent
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_smoke/tasks/cli.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_smoke/tasks/cli.yaml
index 0092e0d5d..d3ff7ceca 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_smoke/tasks/cli.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_smoke/tasks/cli.yaml
@@ -23,7 +23,6 @@
   vars:
     ansible_connection: ansible.netcommon.network_cli
     ansible_network_single_user_mode: "True"
-    connection: "{{ cli }}"
-
+    test_connection: "{{ cli }}"
   tags:
     - network_cli
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_smoke/tests/cli/reboot.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_smoke/tests/cli/reboot.yaml
index 4ed3094ee..2aa32655d 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_smoke/tests/cli/reboot.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_smoke/tests/cli/reboot.yaml
@@ -9,9 +9,11 @@
         answer:
           - y
 
+      tags:
+        - reboot
     - wait_for_connection:
-        delay: 30
-        sleep: 20
+        delay: 60
+        sleep: 40
 
     - ansible.netcommon.cli_command:
         command: show version
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_snmp_server/tests/netconf/_initial_config.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_snmp_server/tests/netconf/_initial_config.yaml
index 5cfd90cfe..ab69bef61 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_snmp_server/tests/netconf/_initial_config.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_snmp_server/tests/netconf/_initial_config.yaml
@@ -5,7 +5,9 @@
 - name: Configure basic config relevant to ntp global
   junipernetworks.junos.junos_config:
     lines:
+      - set routing-instances clv1 instance-type virtual-router
       - set routing-instances clv1 description "clv1"
+      - set routing-instances clv2 instance-type virtual-router
       - set routing-instances clv2 description "clv2"
 
 - ansible.builtin.debug:
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_snmp_server/tests/netconf/_reset_config.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_snmp_server/tests/netconf/_reset_config.yaml
index 4bf7a9664..07575c600 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_snmp_server/tests/netconf/_reset_config.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_snmp_server/tests/netconf/_reset_config.yaml
@@ -2,7 +2,7 @@
 - ansible.builtin.debug:
     msg: "START junos_snmp_server reset config on connection={{ ansible_connection }}"
 
-- name: Reset the config releavent to ntp global resource
+- name: Reset the config releavent to snmp resource
   junipernetworks.junos.junos_config:
     lines:
       - delete snmp
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_snmp_server/tests/netconf/merged.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_snmp_server/tests/netconf/merged.yaml
index f689a69e5..8c0d3ffe3 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_snmp_server/tests/netconf/merged.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_snmp_server/tests/netconf/merged.yaml
@@ -40,7 +40,7 @@
           - "{{ merged['after'] == result['after'] }}"
 
     - name: Merge the provided configuration with the existing running configuration (IDEMPOTENT)
-      junos_snmp_server: *merged
+      junipernetworks.junos.junos_snmp_server: *merged
       register: result
 
     - name: Assert that the previous task was idempotent
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_snmp_server/tests/netconf/overridden.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_snmp_server/tests/netconf/overridden.yaml
index 4f40e59e2..679d9dd8f 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_snmp_server/tests/netconf/overridden.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_snmp_server/tests/netconf/overridden.yaml
@@ -23,6 +23,10 @@
               - "eth1"
               - "eth2"
             set: true
+          views:
+            - name: "all"
+              oids:
+                - oid: ".1"
         state: overridden
       register: result
 
@@ -37,7 +41,7 @@
           - "{{ replaced['after'] == result['after'] }}"
 
     - name: Replaced the provided configuration with the existing running configuration (IDEMPOTENT)
-      junos_snmp_server: *overridden
+      junipernetworks.junos.junos_snmp_server: *overridden
       register: result
 
     - name: Assert that the previous task was idempotent
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_snmp_server/tests/netconf/replaced.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_snmp_server/tests/netconf/replaced.yaml
index d8b66546b..5bdbf72fc 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_snmp_server/tests/netconf/replaced.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_snmp_server/tests/netconf/replaced.yaml
@@ -23,6 +23,10 @@
               - "eth1"
               - "eth2"
             set: true
+          views:
+            - name: "all"
+              oids:
+                - oid: ".1"
         state: replaced
       register: result
 
@@ -37,7 +41,7 @@
           - "{{ replaced['after'] == result['after'] }}"
 
     - name: Replaced the provided configuration with the existing running configuration (IDEMPOTENT)
-      junos_snmp_server: *replaced
+      junipernetworks.junos.junos_snmp_server: *replaced
       register: result
 
     - name: Assert that the previous task was idempotent
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_snmp_server/vars/main.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_snmp_server/vars/main.yaml
index fdb1d777c..86a29df27 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_snmp_server/vars/main.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_snmp_server/vars/main.yaml
@@ -95,3 +95,7 @@ replaced:
       interfaces:
         - "eth1"
         - "eth2"
+    views:
+      - name: "all"
+        oids:
+          - oid: ".1"
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_user/tasks/netconf.yaml b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_user/tasks/netconf.yaml
index 2f24bb1a3..3fa0553b5 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_user/tasks/netconf.yaml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/junos_user/tasks/netconf.yaml
@@ -1,5 +1,5 @@
 ---
-- name: collect netconf test cases
+- name: Collect netconf test cases
   ansible.builtin.find:
     paths: "{{ role_path }}/tests/netconf"
     patterns: "{{ testcase }}.yaml"
diff --git a/ansible_collections/junipernetworks/junos/tests/integration/targets/prepare_junos_tests/tasks/main.yml b/ansible_collections/junipernetworks/junos/tests/integration/targets/prepare_junos_tests/tasks/main.yml
index 1b9977466..179fb0d95 100644
--- a/ansible_collections/junipernetworks/junos/tests/integration/targets/prepare_junos_tests/tasks/main.yml
+++ b/ansible_collections/junipernetworks/junos/tests/integration/targets/prepare_junos_tests/tasks/main.yml
@@ -1,6 +1,7 @@
 ---
 - name: Debug task
-  ansible.builtin.debug: msg="START prepare_junos_tests/main.yaml"
+  ansible.builtin.debug:
+    msg: "START prepare_junos_tests/main.yaml"
 
 - name: Ensure netconf is enabled
   connection: ansible.netcommon.network_cli