nxos_l2_interfaces: fix for integration tests failing to setup layer2 (#61887)

(cherry picked from commit c0f3777fe2)

changelogs/fragments/nxos_l2_interfaces29.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+- nxos_l2_interfaces fix for integration tests failing to setup layer2 (https://github.com/ansible/ansible/pull/61887).

test/integration/targets/nxos_l2_interfaces/tests/cli/deleted.yaml

@@ -17,8 +17,10 @@
     cli_config:
       config: |
         interface {{ test_int1 }}
+          switchport
           switchport trunk native vlan 10
         interface {{ test_int2 }}
+          switchport
           switchport trunk allowed vlan 20
 
   - name: Gather l2_interfaces facts

test/integration/targets/nxos_l2_interfaces/tests/cli/merged.yaml

@@ -11,6 +11,12 @@
   ignore_errors: yes
 
 - block:
+  - name: setup2
+    cli_config:
+      config: |
+        interface {{ test_int1 }}
+          switchport
+
   - name: Merged
     nxos_l2_interfaces: &merged
       config:

test/integration/targets/nxos_l2_interfaces/tests/cli/overridden.yaml

@@ -17,7 +17,10 @@
     cli_config:
       config: |
         interface {{ test_int1 }}
+          switchport
           switchport trunk allowed vlan 11
+        interface {{ test_int2 }}
+          switchport
 
   - name: Gather l2_interfaces facts
     nxos_facts: &facts

test/integration/targets/nxos_l2_interfaces/tests/cli/replaced.yaml

@@ -17,8 +17,10 @@
     cli_config:
       config: |
         interface {{ test_int1 }}
+          switchport
           switchport access vlan 5
         interface {{ test_int2 }}
+          switchport
           switchport trunk native vlan 15
 
   - name: Gather l2_interfaces facts