8 files changed, 18 insertions, 38 deletions
diff --git a/test/integration/targets/eos_lag_interfaces/tasks/cli.yaml b/test/integration/targets/eos_lag_interfaces/tasks/cli.yaml
deleted file mode 100644
index 475fe83154..0000000000
--- a/test/integration/targets/eos_lag_interfaces/tasks/cli.yaml
+++ /dev/null
@@ -1,17 +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 }}"
-
-- 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
diff --git a/test/integration/targets/eos_lag_interfaces/tasks/eapi.yaml b/test/integration/targets/eos_lag_interfaces/tasks/eapi.yaml
deleted file mode 100644
index 34ce8f6347..0000000000
--- a/test/integration/targets/eos_lag_interfaces/tasks/eapi.yaml
+++ /dev/null
@@ -1,17 +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 }}"
-
-- 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
diff --git a/test/integration/targets/eos_lag_interfaces/tasks/main.yaml b/test/integration/targets/eos_lag_interfaces/tasks/main.yaml
index 970e74171e..82d196e4ed 100644
--- a/test/integration/targets/eos_lag_interfaces/tasks/main.yaml
+++ b/test/integration/targets/eos_lag_interfaces/tasks/main.yaml
@@ -1,3 +1,17 @@
 ---
-- { 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"
+  register: test_cases
+  delegate_to: localhost
+
+- name: set test_items
+  set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
+
+- 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
diff --git a/test/integration/targets/eos_lag_interfaces/tests/common/deleted.yaml b/test/integration/targets/eos_lag_interfaces/tests/cli/deleted.yaml
index dbf63d64bf..dbf63d64bf 100644
--- a/test/integration/targets/eos_lag_interfaces/tests/common/deleted.yaml
+++ b/test/integration/targets/eos_lag_interfaces/tests/cli/deleted.yaml
diff --git a/test/integration/targets/eos_lag_interfaces/tests/common/merged.yaml b/test/integration/targets/eos_lag_interfaces/tests/cli/merged.yaml
index 2399cc73e1..2399cc73e1 100644
--- a/test/integration/targets/eos_lag_interfaces/tests/common/merged.yaml
+++ b/test/integration/targets/eos_lag_interfaces/tests/cli/merged.yaml
diff --git a/test/integration/targets/eos_lag_interfaces/tests/common/overridden.yaml b/test/integration/targets/eos_lag_interfaces/tests/cli/overridden.yaml
index e62d3f335b..e62d3f335b 100644
--- a/test/integration/targets/eos_lag_interfaces/tests/common/overridden.yaml
+++ b/test/integration/targets/eos_lag_interfaces/tests/cli/overridden.yaml
diff --git a/test/integration/targets/eos_lag_interfaces/tests/common/replaced.yaml b/test/integration/targets/eos_lag_interfaces/tests/cli/replaced.yaml
index f1e8a255f8..f1e8a255f8 100644
--- a/test/integration/targets/eos_lag_interfaces/tests/common/replaced.yaml
+++ b/test/integration/targets/eos_lag_interfaces/tests/cli/replaced.yaml
diff --git a/test/integration/targets/eos_lag_interfaces/tests/common/reset_config.yml b/test/integration/targets/eos_lag_interfaces/tests/cli/reset_config.yml
index 31ef209866..ba7cf513a2 100644
--- a/test/integration/targets/eos_lag_interfaces/tests/common/reset_config.yml
+++ b/test/integration/targets/eos_lag_interfaces/tests/cli/reset_config.yml
@@ -1,7 +1,7 @@
 ---
 - name: Reset state
-  eos_config:
-    lines: |
+  cli_config:
+    config: |
       interface Ethernet1
          channel-group 5 mode on
       interface Ethernet2