Fix platform agnostic network integration test cases (#32378)

* Fix platform agnostic network test cases

* Fix vyos_interface CI failure

test/integration/targets/net_logging/tests/junos/basic.yaml

@@ -1,21 +1,21 @@
 ---
 - debug: msg="START net_logging junos/basic.yaml"
 
-- name: setup - remove host logging
+- name: setup - remove file logging
   net_logging:
-    dest: host
-    name: 1.1.1.1
+    dest: file
+    name: test
     facility: pfe
-    level: critical
+    level: error
     state: absent
     provider: "{{ netconf }}"
 
 - name: Create file logging
   net_logging:
-    dest: host
-    name: 1.1.1.1
+    dest: file
+    name: test_file
     facility: pfe
-    level: critical
+    level: error
     state: present
     provider: "{{ netconf }}"
   register: result
@@ -29,16 +29,16 @@
 - assert:
     that:
       - "result.changed == true"
-      - "'<name>1.1.1.1</name>' in config.xml"
+      - "'<name>test_file</name>' in config.xml"
       - "'<name>pfe</name>' in config.xml"
-      - "'<critical/>' in config.xml"
+      - "'<error/>' in config.xml"
 
 - name: Create file logging (idempotent)
   net_logging:
-    dest: host
-    name: 1.1.1.1
+    dest: file
+    name: test_file
     facility: pfe
-    level: critical
+    level: error
     state: present
     provider: "{{ netconf }}"
   register: result
@@ -47,12 +47,59 @@
     that:
       - "result.changed == false"
 
+- name: Deactivate logging configuration
+  net_logging:
+    dest: file
+    name: test_file
+    facility: pfe
+    level: error
+    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"
+      - "'<file inactive=\"inactive\">' in config.xml"
+      - "'<contents inactive=\"inactive\">' in config.xml"
+
+- name: Activate logging configuration
+  net_logging:
+    dest: file
+    name: test_file
+    facility: pfe
+    level: error
+    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"
+      - "'<name>test_file</name>' in config.xml"
+      - "'<name>pfe</name>' in config.xml"
+      - "'<error/>' in config.xml"
+
 - name: Delete logging configuration
   net_logging:
-    dest: host
-    name: 1.1.1.1
+    dest: file
+    name: test_file
     facility: pfe
-    level: critical
+    level: error
     state: absent
     provider: "{{ netconf }}"
   register: result
@@ -66,7 +113,7 @@
 - assert:
     that:
       - "result.changed == true"
-      - "'<name>1.1.1.1</name>' not in config.xml"
+      - "'<name>test_file</name>' not in config.xml"
 
 - name: Configure console logging
   net_logging:
@@ -74,6 +121,7 @@
     facility: kernel
     level: emergency
     state: present
+    active: True
     provider: "{{ netconf }}"
   register: result
 
@@ -91,11 +139,12 @@
       - "'<emergency/>' in config.xml"
 
 - name: Configure console logging (idempotent)
-  junos_logging:
+  net_logging:
     dest: console
     facility: kernel
     level: emergency
     state: present
+    active: True
     provider: "{{ netconf }}"
   register: result
 
@@ -103,6 +152,27 @@
     that:
       - "result.changed == false"
 
+- name: Disable console logging
+  net_logging:
+    dest: console
+    facility: kernel
+    level: emergency
+    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"
+      - "'<console inactive=\"inactive\">' in config.xml"
+
 - name: Delete console logging
   net_logging:
     dest: console
@@ -123,17 +193,123 @@
       - "result.changed == true"
       - "'<console>' not in config.xml"
 
+- name: Configure logging parameters
+  net_logging:
+    size: 65536
+    files: 40
+    rotate_frequency: 20
+    state: present
+    provider: "{{ netconf }}"
+  register: result
+
+- name: Get running configuration
+  junos_rpc:
+    rpc: get-configuration
+    provider: "{{ netconf }}"
+  register: config
+
+- assert:
+    that:
+      - "result.changed == true"
+      - "'<size>64k</size>' in config.xml"
+      - "'<files>40</files>' in config.xml"
+      - "'<log-rotate-frequency>20</log-rotate-frequency>' in config.xml"
+
+- name: Configure logging parameters (idempotent)
+  net_logging:
+    size: 65536
+    files: 40
+    rotate_frequency: 20
+    state: present
+    active: True
+    provider: "{{ netconf }}"
+  register: result
+
+- assert:
+    that:
+      - "result.changed == false"
+
+- name: Disable logging parameters
+  net_logging:
+    size: 65536
+    files: 40
+    rotate_frequency: 20
+    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"
+      - "'<size inactive=\"inactive\">64k</size>' in config.xml"
+      - "'<files inactive=\"inactive\">40</files>' in config.xml"
+      - "'<log-rotate-frequency inactive=\"inactive\">20</log-rotate-frequency>' in config.xml"
+
+- name: Activate logging parameters
+  net_logging:
+    size: 65536
+    files: 40
+    rotate_frequency: 20
+    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"
+      - "'<size>64k</size>' in config.xml"
+      - "'<files>40</files>' in config.xml"
+      - "'<log-rotate-frequency>20</log-rotate-frequency>' in config.xml"
+
+- name: Delete logging parameters
+  net_logging:
+    size: 65536
+    files: 40
+    rotate_frequency: 20
+    state: absent
+    provider: "{{ netconf }}"
+  register: result
+
+- name: Get running configuration
+  junos_rpc:
+    rpc: get-configuration
+    provider: "{{ netconf }}"
+  register: config
+
+- assert:
+    that:
+      - "result.changed == true"
+      - "'<size>64k</size>' not in config.xml"
+      - "'<files>40</files>' not in config.xml"
+      - "'<log-rotate-frequency>20</log-rotate-frequency>' not in config.xml"
+
+- name: Seup file logging using aggregate
+  net_logging:
+    aggregate:
+    - {dest: file, name: test-1,  facility: pfe, level: critical, state: absent}
+    - {dest: file, name: test-2,  facility: kernel, level: emergency, state: absent}
+    provider: "{{ netconf }}"
+  register: result
+
 - name: Configure file logging using aggregate
   net_logging:
     aggregate:
-    - dest: file
-      name: test-1
-      facility: pfe
-      level: critical
-    - dest: file
-      name: test-2
-      facility: kernel
-      level: emergency
+    - {dest: file, name: test-1,  facility: pfe, level: critical, active: True}
+    - {dest: file, name: test-2,  facility: kernel, level: emergency, active: True}
     provider: "{{ netconf }}"
   register: result
 
@@ -145,7 +321,7 @@
       - result.diff.prepared | search("\+ *file test-2")
       - result.diff.prepared | search("\+ *kernel emergency")
 
-- name: Delete file logging using aggregate
+- name: Deactivate file logging configuration using aggregate
   net_logging:
     aggregate:
     - dest: file
@@ -156,6 +332,40 @@
       name: test-2
       facility: kernel
       level: emergency
+    active: False
+    provider: "{{ netconf }}"
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - result.diff.prepared | search("! *inactive[:] file test-1")
+      - result.diff.prepared | search("! *inactive[:] pfe")
+      - result.diff.prepared | search("! *inactive[:] file test-2")
+      - result.diff.prepared | search("! *inactive[:] kernel")
+
+- name: activate file logging configuration using aggregate
+  net_logging:
+    aggregate:
+    - { dest: file, name: test-1,  facility: pfe, level: critical }
+    - { dest: file, name: test-2,  facility: kernel, level: emergency }
+    active: True
+    provider: "{{ netconf }}"
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - result.diff.prepared | search("! *active[:] file test-1")
+      - result.diff.prepared | search("! *active[:] pfe")
+      - result.diff.prepared | search("! *active[:] file test-2")
+      - result.diff.prepared | search("! *active[:] kernel")
+
+- name: Delete file logging using aggregate
+  net_logging:
+    aggregate:
+    - { dest: file, name: test-1,  facility: pfe, level: critical }
+    - { dest: file, name: test-2,  facility: kernel, level: emergency }
     state: absent
     provider: "{{ netconf }}"
   register: result
@@ -171,18 +381,12 @@
 - name: Delete file logging using aggregate (idempotent)
   net_logging:
     aggregate:
-    - dest: file
-      name: test-1
-      facility: pfe
-      level: critical
-    - dest: file
-      name: test-2
-      facility: kernel
-      level: emergency
+    - { dest: file, name: test-1,  facility: pfe, level: critical }
+    - { dest: file, name: test-2,  facility: kernel, level: emergency }
     state: absent
     provider: "{{ netconf }}"
   register: result
 
 - assert:
     that:
-      - 'result.changed == false'
+      - "result.changed == false"