9 files changed, 27 insertions, 52 deletions
diff --git a/test/integration/targets/eos_l2_interfaces/tasks/cli.yaml b/test/integration/targets/eos_l2_interfaces/tasks/cli.yaml
deleted file mode 100644
index 92c7271ce9..0000000000
--- a/test/integration/targets/eos_l2_interfaces/tasks/cli.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-- name: collect all cli test cases
-  find:
-    paths: "{{ role_path }}/tests/common"
-    patterns: "{{ testcase }}.yaml"
-  delegate_to: localhost
-  register: test_cases
-
-- name: set test_items
-  set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
-
-- block:
-  - name: run test cases (connection=network_cli)
-    include: "{{ test_case_to_run }} ansible_connection=network_cli"
-    with_items: "{{ test_items }}"
-    loop_control:
-      loop_var: test_case_to_run
-    tags: connection_network_cli
-
-  always:
-  - name: Clean up test state
-    include: "{{ role_path }}/tests/common/cleanup.yml ansible_connection=network_cli"
diff --git a/test/integration/targets/eos_l2_interfaces/tasks/eapi.yaml b/test/integration/targets/eos_l2_interfaces/tasks/eapi.yaml
deleted file mode 100644
index f67b3d7214..0000000000
--- a/test/integration/targets/eos_l2_interfaces/tasks/eapi.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-- name: collect all eapi test cases
-  find:
-    paths: "{{ role_path }}/tests/common"
-    patterns: "{{ testcase }}.yaml"
-  delegate_to: localhost
-  register: test_cases
-
-- name: set test_items
-  set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
-
-- block:
-  - name: run test cases (connection=httpapi)
-    include: "{{ test_case_to_run }} ansible_connection=httpapi"
-    with_items: "{{ test_items }}"
-    loop_control:
-      loop_var: test_case_to_run
-    tags: connection_httpapi
-
-  always:
-  - name: Clean up test state
-    include: "{{ role_path }}/tests/common/cleanup.yml ansible_connection=httpapi"
diff --git a/test/integration/targets/eos_l2_interfaces/tasks/main.yaml b/test/integration/targets/eos_l2_interfaces/tasks/main.yaml
index 970e74171e..35abc8e876 100644
--- a/test/integration/targets/eos_l2_interfaces/tasks/main.yaml
+++ b/test/integration/targets/eos_l2_interfaces/tasks/main.yaml
@@ -1,3 +1,22 @@
 ---
-- { include: cli.yaml, tags: ['cli'] }
-- { include: eapi.yaml, tags: ['eapi'] }
+- name: collect all cli test cases
+  find:
+    paths: "{{ role_path }}/tests/cli"
+    patterns: "{{ testcase }}.yaml"
+  delegate_to: localhost
+  register: test_cases
+
+- name: set test_items
+  set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
+
+- block:
+  - name: run test cases (connection=network_cli)
+    include: "{{ test_case_to_run }} ansible_connection=network_cli"
+    with_items: "{{ test_items }}"
+    loop_control:
+      loop_var: test_case_to_run
+  tags: connection_network_cli
+
+  always:
+  - name: Clean up test state
+    include: "{{ role_path }}/tests/cli/cleanup.yml ansible_connection=network_cli"
diff --git a/test/integration/targets/eos_l2_interfaces/tests/common/cleanup.yml b/test/integration/targets/eos_l2_interfaces/tests/cli/cleanup.yml
index 7a6f44dd04..d71a6a9db4 100644
--- a/test/integration/targets/eos_l2_interfaces/tests/common/cleanup.yml
+++ b/test/integration/targets/eos_l2_interfaces/tests/cli/cleanup.yml
@@ -1,12 +1,12 @@
 ---
 - name: Remove all vlans
-  eos_config:
-    lines: no vlan 1-4094
+  cli_config:
+    config: no vlan 1-4094
   become: yes
 
 - name: Completely remove vlans from interfaces
-  eos_config:
-    lines: |
+  cli_config:
+    config: |
       interface {{ item }}
         no switchport mode
         no switchport access vlan
diff --git a/test/integration/targets/eos_l2_interfaces/tests/common/deleted.yaml b/test/integration/targets/eos_l2_interfaces/tests/cli/deleted.yaml
index 6bc0099e29..6bc0099e29 100644
--- a/test/integration/targets/eos_l2_interfaces/tests/common/deleted.yaml
+++ b/test/integration/targets/eos_l2_interfaces/tests/cli/deleted.yaml
diff --git a/test/integration/targets/eos_l2_interfaces/tests/common/merged.yaml b/test/integration/targets/eos_l2_interfaces/tests/cli/merged.yaml
index f49994401a..f49994401a 100644
--- a/test/integration/targets/eos_l2_interfaces/tests/common/merged.yaml
+++ b/test/integration/targets/eos_l2_interfaces/tests/cli/merged.yaml
diff --git a/test/integration/targets/eos_l2_interfaces/tests/common/overridden.yaml b/test/integration/targets/eos_l2_interfaces/tests/cli/overridden.yaml
index 8fe7f45990..8fe7f45990 100644
--- a/test/integration/targets/eos_l2_interfaces/tests/common/overridden.yaml
+++ b/test/integration/targets/eos_l2_interfaces/tests/cli/overridden.yaml
diff --git a/test/integration/targets/eos_l2_interfaces/tests/common/replaced.yaml b/test/integration/targets/eos_l2_interfaces/tests/cli/replaced.yaml
index 46c7a2dd07..46c7a2dd07 100644
--- a/test/integration/targets/eos_l2_interfaces/tests/common/replaced.yaml
+++ b/test/integration/targets/eos_l2_interfaces/tests/cli/replaced.yaml
diff --git a/test/integration/targets/eos_l2_interfaces/tests/common/reset_config.yml b/test/integration/targets/eos_l2_interfaces/tests/cli/reset_config.yml
index cc43075cfd..f4474ce1b7 100644
--- a/test/integration/targets/eos_l2_interfaces/tests/common/reset_config.yml
+++ b/test/integration/targets/eos_l2_interfaces/tests/cli/reset_config.yml
@@ -1,7 +1,7 @@
 ---
 - name: Reset state
-  eos_config:
-    lines: |
+  cli_config:
+    config: |
       interface Ethernet1
          switchport access vlan 20
          no switchport trunk native vlan