Add active param to junos declarative modules (#26222)

*  active/deactivate configuration capability
*  integration test refactor

1 files changed, 69 insertions, 25 deletions

diff --git a/test/integration/targets/junos_interface/tests/netconf/basic.yaml b/test/integration/targets/junos_interface/tests/netconf/basic.yaml
index 70f993ba05..1a84965d37 100644
--- a/test/integration/targets/junos_interface/tests/netconf/basic.yaml
+++ b/test/integration/targets/junos_interface/tests/netconf/basic.yaml
@@ -16,14 +16,17 @@
     provider: "{{ netconf }}"
   register: result
 
-- debug:
-    msg: "{{ result }}"
+- name: Get running configuration
+  junos_rpc:
+    rpc: get-configuration
+    provider: "{{ netconf }}"
+  register: config
 
 - assert:
     that:
       - "result.changed == true"
-      - "'<name>ge-0/0/1</name>' in result.rpc"
-      - "'<description>test-interface</description>' in result.rpc"
+      - "'<name>ge-0/0/1</name>' in config.xml"
+      - "'<description>test-interface</description>' in config.xml"
 
 - name: Create interface (idempotent)
   junos_interface:
@@ -41,29 +44,43 @@
   junos_interface:
     name: ge-0/0/1
     description: test-interface
-    state: suspend
+    state: present
+    active: False
     provider: "{{ netconf }}"
   register: result
 
+- name: Get running configuration
+  junos_rpc:
+    rpc: get-configuration
+    provider: "{{ netconf }}"
+  register: config
+
 - assert:
     that:
       - "result.changed == true"
-      - "'<interface inactive=\"inactive\">' in result.rpc"
-      - "'<name>ge-0/0/1</name>' in result.rpc"
+      - "'<interface inactive=\"inactive\">' in config.xml"
+      - "'<name>ge-0/0/1</name>' in config.xml"
 
 - name: Activate interface configuration
   junos_interface:
     name: ge-0/0/1
     description: test-interface
-    state: active
+    state: present
+    active: True
     provider: "{{ netconf }}"
   register: result
 
+- name: Get running configuration
+  junos_rpc:
+    rpc: get-configuration
+    provider: "{{ netconf }}"
+  register: config
+
 - assert:
     that:
       - "result.changed == true"
-      - "'<interface active=\"active\">' in result.rpc"
-      - "'<name>ge-0/0/1</name>' in result.rpc"
+      - "'<interface>' in config.xml"
+      - "'<name>ge-0/0/1</name>' in config.xml"
 
 - name: Configure interface attributes
   junos_interface:
@@ -76,44 +93,60 @@
     provider: "{{ netconf }}"
   register: result
 
+- name: Get running configuration
+  junos_rpc:
+    rpc: get-configuration
+    provider: "{{ netconf }}"
+  register: config
+
 - assert:
     that:
       - "result.changed == true"
-      - "'<name>ge-0/0/1</name>' in result.rpc"
-      - "'<link-mode>full-duplex</link-mode>' in result.rpc"
-      - "'<mtu>256</mtu>' in result.rpc"
-      - "'<speed>1g</speed>' in result.rpc"
-      - "'<description>test-interface</description>' in result.rpc"
+      - "'<name>ge-0/0/1</name>' in config.xml"
+      - "'<link-mode>full-duplex</link-mode>' in config.xml"
+      - "'<mtu>256</mtu>' in config.xml"
+      - "'<speed>1g</speed>' in config.xml"
+      - "'<description>test-interface</description>' in config.xml"
 
 - name: Disable interface
   junos_interface:
     name: ge-0/0/1
     description: test-interface
-    state: present
-    enabled: False
+    state: down
     provider: "{{ netconf }}"
   register: result
 
+- name: Get running configuration
+  junos_rpc:
+    rpc: get-configuration
+    provider: "{{ netconf }}"
+  register: config
+
 - assert:
     that:
       - "result.changed == true"
-      - "'<disable />' in result.rpc"
-      - "'<name>ge-0/0/1</name>' in result.rpc"
+      - "'<disable/>' in config.xml"
+      - "'<name>ge-0/0/1</name>' in config.xml"
 
 - name: Enable interface
   junos_interface:
     name: ge-0/0/1
     description: test-interface
-    state: present
-    enabled: True
+    state: up
     provider: "{{ netconf }}"
   register: result
 
+- name: Get running configuration
+  junos_rpc:
+    rpc: get-configuration
+    provider: "{{ netconf }}"
+  register: config
+
 - assert:
     that:
       - "result.changed == true"
-      - "'<disable delete=\"delete\" />' in result.rpc"
-      - "'<name>ge-0/0/1</name>' in result.rpc"
+      - "'<disable/>' not in config.xml"
+      - "'<name>ge-0/0/1</name>' in config.xml"
 
 - name: Delete interface
   junos_interface:
@@ -123,8 +156,19 @@
     provider: "{{ netconf }}"
   register: result
 
+- name: Get running configuration
+  junos_rpc:
+    rpc: get-configuration
+    provider: "{{ netconf }}"
+  register: config
+
+- name: Get running configuration
+  junos_rpc:
+    rpc: get-configuration
+    provider: "{{ netconf }}"
+  register: config
+
 - assert:
     that:
       - "result.changed == true"
-      - "'<interface delete=\"delete\">' in result.rpc"
-      - "'<name>ge-0/0/1</name>' in result.rpc"
+      - "'<name>ge-0/0/1</name>' not in config.xml"