Fix platform agnostic network integration test cases (#32378)

* Fix platform agnostic network test cases

* Fix vyos_interface CI failure

test/integration/targets/net_interface/tests/vyos/basic.yaml

@@ -1,60 +1,85 @@
 ---
 - debug: msg="START net_interface vyos/basic.yaml"
 
+- name: Run vyos lsmod command
+  vyos_command:
+    commands:
+      - lsmod
+  register: lsmod_out
+
 - name: Set up - delete interface
   net_interface:
     name: eth1
     state: absent
 
-- name: Configure interface params
+- name: Set up - Create interface
   net_interface:
     name: eth1
     state: present
     description: test-interface
-    speed: 100
-    duplex: half
-    mtu: 256
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
+      - '"set interfaces ethernet eth1" in result.commands'
       - '"set interfaces ethernet eth1 description test-interface" in result.commands'
-      - '"set interfaces ethernet eth1 speed 100" in result.commands'
-      - '"set interfaces ethernet eth1 duplex half" in result.commands'
-      - '"set interfaces ethernet eth1 mtu 256" in result.commands'
 
-- name: Configure interface params (idempotent)
-  net_interface:
-    name: eth1
-    state: present
-    description: test-interface
-    speed: 100
-    duplex: half
-    mtu: 256
-  register: result
-
-- assert:
-    that:
-      - 'result.changed == false'
-
-- name: Change interface params
+- name: Configure interface params
   net_interface:
     name: eth1
     state: present
     description: test-interface-1
-    speed: 1000
-    duplex: full
-    mtu: 512
+    speed: 100
+    duplex: half
+    mtu: 256
+  when: "'virtio_net' not in lsmod_out.stdout[0]"
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
       - '"set interfaces ethernet eth1 description test-interface-1" in result.commands'
+      - '"set interfaces ethernet eth1 speed 100" in result.commands'
+      - '"set interfaces ethernet eth1 duplex half" in result.commands'
+      - '"set interfaces ethernet eth1 mtu 256" in result.commands'
+  when: "'virtio_net' not in lsmod_out.stdout[0]"
+
+- name: Configure interface params (idempotent)
+  net_interface:
+    name: eth1
+    state: present
+    description: test-interface-1
+    speed: 100
+    duplex: half
+    mtu: 256
+  register: result
+  when: "'virtio_net' not in lsmod_out.stdout[0]"
+
+- assert:
+    that:
+      - 'result.changed == false'
+  when: "'virtio' not in lsmod_out.stdout[0]"
+
+- name: Change interface params
+  net_interface:
+    name: eth1
+    state: present
+    description: test-interface-2
+    speed: 1000
+    duplex: full
+    mtu: 512
+  register: result
+  when: "'virtio_net' not in lsmod_out.stdout[0]"
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"set interfaces ethernet eth1 description test-interface-2" in result.commands'
       - '"set interfaces ethernet eth1 speed 1000" in result.commands'
       - '"set interfaces ethernet eth1 duplex full" in result.commands'
       - '"set interfaces ethernet eth1 mtu 512" in result.commands'
+  when: "'virtio_net' not in lsmod_out.stdout[0]"
 
 - name: Disable interface
   net_interface:
@@ -111,6 +136,7 @@
       - { name: eth1, description: test-interface-1,  speed: 100, duplex: half, mtu: 512}
       - { name: eth2, description: test-interface-2,  speed: 1000, duplex: full, mtu: 256}
   register: result
+  when: "'virtio_net' not in lsmod_out.stdout[0]"
 
 - assert:
     that:
@@ -123,6 +149,7 @@
       - '"set interfaces ethernet eth2 speed 1000" in result.commands'
       - '"set interfaces ethernet eth2 duplex full" in result.commands'
       - '"set interfaces ethernet eth2 mtu 256" in result.commands'
+  when: "'virtio_net' not in lsmod_out.stdout[0]"
 
 - name: Set interface on aggregate (idempotent)
   net_interface:
@@ -130,16 +157,19 @@
       - { name: eth1, description: test-interface-1,  speed: 100, duplex: half, mtu: 512}
       - { name: eth2, description: test-interface-2,  speed: 1000, duplex: full, mtu: 256}
   register: result
+  when: "'virtio_net' not in lsmod_out.stdout[0]"
 
 - assert:
     that:
       - 'result.changed == false'
+  when: "'virtio_net' not in lsmod_out.stdout[0]"
 
 - name: Disable interface on aggregate
   net_interface:
     aggregate:
       - name: eth1
       - name: eth2
+    description: test-interface
     enabled: False
   register: result
 
@@ -189,4 +219,5 @@
     that:
       - 'result.changed == false'
 
+
 - debug: msg="END net_interface vyos/basic.yaml"

test/integration/targets/net_interface/tests/vyos/intent.yaml

@@ -1,30 +1,46 @@
 ---
 - debug: msg="START net_interface vyos/intent.yaml"
 
+- name: Run vyos lsmod command
+  vyos_command:
+    commands:
+      - lsmod
+  register: lsmod_out
+
 - name: Setup (interface is up)
   net_interface:
     name: eth1
     enabled: True
     state: present
-    provider: "{{ cli }}"
   register: result
 
 - name: Check intent arguments
   net_interface:
     name: eth1
     state: up
-    provider: "{{ cli }}"
   register: result
 
 - assert:
     that:
       - "result.failed == false"
 
+- name: Check lldp neighbors intent arguments
+  net_interface:
+    name: eth0
+    neighbors:
+    - port: eth0
+  when: "'virtio_net' not in lsmod_out.stdout[0]"
+  register: result
+
+- assert:
+    that:
+      - "result.failed == false"
+  when: "'virtio_net' not in lsmod_out.stdout[0]"
+
 - name: Check intent arguments (failed condition)
   net_interface:
     name: eth1
     state: down
-    provider: "{{ cli }}"
   ignore_errors: yes
   register: result
 
@@ -33,12 +49,28 @@
       - "result.failed == true"
       - "'state eq(down)' in result.failed_conditions"
 
+- name: Check lldp neighbors intent arguments (failed)
+  net_interface:
+    name: eth0
+    neighbors:
+    - port: dummy_port
+      host: dummy_host
+  ignore_errors: yes
+  when: "'virtio_net' not in lsmod_out.stdout[0]"
+  register: result
+
+- assert:
+    that:
+      - "result.failed == true"
+      - "'host dummy_host' in result.failed_conditions"
+      - "'port dummy_port' in result.failed_conditions"
+  when: "'virtio_net' not in lsmod_out.stdout[0]"
+
 - name: Config + intent
   net_interface:
     name: eth1
     enabled: False
     state: down
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -50,7 +82,6 @@
     name: eth1
     enabled: False
     state: up
-    provider: "{{ cli }}"
   ignore_errors: yes
   register: result
 
@@ -65,10 +96,42 @@
     - name: eth1
       enabled: True
       state: up
-    provider: "{{ cli }}"
   ignore_errors: yes
   register: result
 
 - assert:
     that:
       - "result.failed == false"
+
+- name: Check lldp neighbors intent aggregate arguments
+  net_interface:
+    aggregate:
+    - name: eth0
+      neighbors:
+      - port: eth0
+  when: "'virtio_net' not in lsmod_out.stdout[0]"
+  register: result
+
+- assert:
+    that:
+      - "result.failed == false"
+  when: "'virtio_net' not in lsmod_out.stdout[0]"
+
+- name: Check lldp neighbors intent aggregate arguments (failed)
+  net_interface:
+    aggregate:
+    - name: eth0
+      neighbors:
+      - port: eth0
+      - port: dummy_port
+        host: dummy_host
+  ignore_errors: yes
+  when: "'virtio_net' not in lsmod_out.stdout[0]"
+  register: result
+
+- assert:
+    that:
+      - "result.failed == true"
+      - "'host dummy_host' in result.failed_conditions"
+      - "'port dummy_port' in result.failed_conditions"
+  when: "'virtio_net' not in lsmod_out.stdout[0]"