65 files changed, 153 insertions, 323 deletions
diff --git a/test/integration/targets/eos_interfaces/tasks/cli.yaml b/test/integration/targets/eos_interfaces/tasks/cli.yaml
deleted file mode 100644
index 475fe83154..0000000000
--- a/test/integration/targets/eos_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_interfaces/tasks/eapi.yaml b/test/integration/targets/eos_interfaces/tasks/eapi.yaml
deleted file mode 100644
index 34ce8f6347..0000000000
--- a/test/integration/targets/eos_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_interfaces/tasks/main.yaml b/test/integration/targets/eos_interfaces/tasks/main.yaml
index 970e74171e..068963b4c3 100644
--- a/test/integration/targets/eos_interfaces/tasks/main.yaml
+++ b/test/integration/targets/eos_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"
+  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_interfaces/tests/common/deleted.yaml b/test/integration/targets/eos_interfaces/tests/cli/deleted.yaml
index b447fb6b72..b447fb6b72 100644
--- a/test/integration/targets/eos_interfaces/tests/common/deleted.yaml
+++ b/test/integration/targets/eos_interfaces/tests/cli/deleted.yaml
diff --git a/test/integration/targets/eos_interfaces/tests/common/merged.yaml b/test/integration/targets/eos_interfaces/tests/cli/merged.yaml
index 8030f09d58..8030f09d58 100644
--- a/test/integration/targets/eos_interfaces/tests/common/merged.yaml
+++ b/test/integration/targets/eos_interfaces/tests/cli/merged.yaml
diff --git a/test/integration/targets/eos_interfaces/tests/common/overridden.yaml b/test/integration/targets/eos_interfaces/tests/cli/overridden.yaml
index b1b1777bfe..b1b1777bfe 100644
--- a/test/integration/targets/eos_interfaces/tests/common/overridden.yaml
+++ b/test/integration/targets/eos_interfaces/tests/cli/overridden.yaml
diff --git a/test/integration/targets/eos_interfaces/tests/common/replaced.yaml b/test/integration/targets/eos_interfaces/tests/cli/replaced.yaml
index ab9fd6fd2e..ab9fd6fd2e 100644
--- a/test/integration/targets/eos_interfaces/tests/common/replaced.yaml
+++ b/test/integration/targets/eos_interfaces/tests/cli/replaced.yaml
diff --git a/test/integration/targets/eos_interfaces/tests/common/reset_config.yml b/test/integration/targets/eos_interfaces/tests/cli/reset_config.yml
index 7932f9f948..0613582955 100644
--- a/test/integration/targets/eos_interfaces/tests/common/reset_config.yml
+++ b/test/integration/targets/eos_interfaces/tests/cli/reset_config.yml
@@ -1,7 +1,7 @@
 ---
 - name: Reset initial config
-  eos_config:
-    lines: |
+  cli_config:
+    config: |
       interface Ethernet1
          description "Interface 1"
          no shutdown
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
diff --git a/test/integration/targets/eos_l3_interfaces/tasks/cli.yaml b/test/integration/targets/eos_l3_interfaces/tasks/cli.yaml
deleted file mode 100644
index 475fe83154..0000000000
--- a/test/integration/targets/eos_l3_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_l3_interfaces/tasks/eapi.yaml b/test/integration/targets/eos_l3_interfaces/tasks/eapi.yaml
deleted file mode 100644
index acddad170e..0000000000
--- a/test/integration/targets/eos_l3_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_network_cli
diff --git a/test/integration/targets/eos_l3_interfaces/tasks/main.yaml b/test/integration/targets/eos_l3_interfaces/tasks/main.yaml
index 970e74171e..82d196e4ed 100644
--- a/test/integration/targets/eos_l3_interfaces/tasks/main.yaml
+++ b/test/integration/targets/eos_l3_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_l3_interfaces/tests/common/deleted.yaml b/test/integration/targets/eos_l3_interfaces/tests/cli/deleted.yaml
index 43483358f6..43483358f6 100644
--- a/test/integration/targets/eos_l3_interfaces/tests/common/deleted.yaml
+++ b/test/integration/targets/eos_l3_interfaces/tests/cli/deleted.yaml
diff --git a/test/integration/targets/eos_l3_interfaces/tests/common/merged.yaml b/test/integration/targets/eos_l3_interfaces/tests/cli/merged.yaml
index dd36fd371d..dd36fd371d 100644
--- a/test/integration/targets/eos_l3_interfaces/tests/common/merged.yaml
+++ b/test/integration/targets/eos_l3_interfaces/tests/cli/merged.yaml
diff --git a/test/integration/targets/eos_l3_interfaces/tests/common/overridden.yaml b/test/integration/targets/eos_l3_interfaces/tests/cli/overridden.yaml
index d7c7b97e7d..d7c7b97e7d 100644
--- a/test/integration/targets/eos_l3_interfaces/tests/common/overridden.yaml
+++ b/test/integration/targets/eos_l3_interfaces/tests/cli/overridden.yaml
diff --git a/test/integration/targets/eos_l3_interfaces/tests/common/replaced.yaml b/test/integration/targets/eos_l3_interfaces/tests/cli/replaced.yaml
index f1f84ab2a5..f1f84ab2a5 100644
--- a/test/integration/targets/eos_l3_interfaces/tests/common/replaced.yaml
+++ b/test/integration/targets/eos_l3_interfaces/tests/cli/replaced.yaml
diff --git a/test/integration/targets/eos_l3_interfaces/tests/common/reset_config.yml b/test/integration/targets/eos_l3_interfaces/tests/cli/reset_config.yml
index f74d1f521c..3efc086a4b 100644
--- a/test/integration/targets/eos_l3_interfaces/tests/common/reset_config.yml
+++ b/test/integration/targets/eos_l3_interfaces/tests/cli/reset_config.yml
@@ -1,7 +1,7 @@
 ---
 - name: Reset state
-  eos_config:
-    lines: |
+  cli_config:
+    config: |
       interface Ethernet1
          ip address 192.0.2.12/24
          ip address 203.0.113.27/31 secondary
diff --git a/test/integration/targets/eos_lacp_interfaces/tasks/cli.yaml b/test/integration/targets/eos_lacp_interfaces/tasks/cli.yaml
deleted file mode 100644
index 475fe83154..0000000000
--- a/test/integration/targets/eos_lacp_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_lacp_interfaces/tasks/eapi.yaml b/test/integration/targets/eos_lacp_interfaces/tasks/eapi.yaml
deleted file mode 100644
index 34ce8f6347..0000000000
--- a/test/integration/targets/eos_lacp_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_lacp_interfaces/tasks/main.yaml b/test/integration/targets/eos_lacp_interfaces/tasks/main.yaml
index 970e74171e..068963b4c3 100644
--- a/test/integration/targets/eos_lacp_interfaces/tasks/main.yaml
+++ b/test/integration/targets/eos_lacp_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"
+  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_lacp_interfaces/tests/common/deleted.yaml b/test/integration/targets/eos_lacp_interfaces/tests/cli/deleted.yaml
index ceed51e75b..ceed51e75b 100644
--- a/test/integration/targets/eos_lacp_interfaces/tests/common/deleted.yaml
+++ b/test/integration/targets/eos_lacp_interfaces/tests/cli/deleted.yaml
diff --git a/test/integration/targets/eos_lacp_interfaces/tests/common/merged.yaml b/test/integration/targets/eos_lacp_interfaces/tests/cli/merged.yaml
index 8f3a4eadff..8f3a4eadff 100644
--- a/test/integration/targets/eos_lacp_interfaces/tests/common/merged.yaml
+++ b/test/integration/targets/eos_lacp_interfaces/tests/cli/merged.yaml
diff --git a/test/integration/targets/eos_lacp_interfaces/tests/common/overridden.yaml b/test/integration/targets/eos_lacp_interfaces/tests/cli/overridden.yaml
index b858a822dc..b858a822dc 100644
--- a/test/integration/targets/eos_lacp_interfaces/tests/common/overridden.yaml
+++ b/test/integration/targets/eos_lacp_interfaces/tests/cli/overridden.yaml
diff --git a/test/integration/targets/eos_lacp_interfaces/tests/common/replaced.yaml b/test/integration/targets/eos_lacp_interfaces/tests/cli/replaced.yaml
index f33b32fd15..f33b32fd15 100644
--- a/test/integration/targets/eos_lacp_interfaces/tests/common/replaced.yaml
+++ b/test/integration/targets/eos_lacp_interfaces/tests/cli/replaced.yaml
diff --git a/test/integration/targets/eos_lacp_interfaces/tests/common/reset_config.yml b/test/integration/targets/eos_lacp_interfaces/tests/cli/reset_config.yml
index b4e6851365..45caea1f4a 100644
--- a/test/integration/targets/eos_lacp_interfaces/tests/common/reset_config.yml
+++ b/test/integration/targets/eos_lacp_interfaces/tests/cli/reset_config.yml
@@ -1,7 +1,7 @@
 ---
 - name: Reset initial config
-  eos_config:
-    lines: |
+  cli_config:
+    config: |
       interface Ethernet1
          lacp port-priority 30
          lacp rate normal
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
diff --git a/test/integration/targets/eos_lldp_global/tasks/cli.yaml b/test/integration/targets/eos_lldp_global/tasks/cli.yaml
deleted file mode 100644
index 475fe83154..0000000000
--- a/test/integration/targets/eos_lldp_global/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_lldp_global/tasks/eapi.yaml b/test/integration/targets/eos_lldp_global/tasks/eapi.yaml
deleted file mode 100644
index 34ce8f6347..0000000000
--- a/test/integration/targets/eos_lldp_global/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_lldp_global/tasks/main.yaml b/test/integration/targets/eos_lldp_global/tasks/main.yaml
index 970e74171e..068963b4c3 100644
--- a/test/integration/targets/eos_lldp_global/tasks/main.yaml
+++ b/test/integration/targets/eos_lldp_global/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"
+  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_lldp_global/tests/common/deleted.yaml b/test/integration/targets/eos_lldp_global/tests/cli/deleted.yaml
index 98233e1a1e..98233e1a1e 100644
--- a/test/integration/targets/eos_lldp_global/tests/common/deleted.yaml
+++ b/test/integration/targets/eos_lldp_global/tests/cli/deleted.yaml
diff --git a/test/integration/targets/eos_lldp_global/tests/common/merged.yaml b/test/integration/targets/eos_lldp_global/tests/cli/merged.yaml
index 7cbc16f41d..7cbc16f41d 100644
--- a/test/integration/targets/eos_lldp_global/tests/common/merged.yaml
+++ b/test/integration/targets/eos_lldp_global/tests/cli/merged.yaml
diff --git a/test/integration/targets/eos_lldp_global/tests/common/replaced.yaml b/test/integration/targets/eos_lldp_global/tests/cli/replaced.yaml
index f8cbcd13cc..f8cbcd13cc 100644
--- a/test/integration/targets/eos_lldp_global/tests/common/replaced.yaml
+++ b/test/integration/targets/eos_lldp_global/tests/cli/replaced.yaml
diff --git a/test/integration/targets/eos_lldp_global/tests/common/reset_config.yml b/test/integration/targets/eos_lldp_global/tests/cli/reset_config.yml
index 441edf3891..4e5fd33746 100644
--- a/test/integration/targets/eos_lldp_global/tests/common/reset_config.yml
+++ b/test/integration/targets/eos_lldp_global/tests/cli/reset_config.yml
@@ -1,7 +1,7 @@
 ---
 - name: Reset initial config
-  eos_config:
-    lines: |
+  cli_config:
+    config: |
       lldp timer 3000
       lldp holdtime 100
       lldp reinit 5
diff --git a/test/integration/targets/eos_lldp_interfaces/tasks/cli.yaml b/test/integration/targets/eos_lldp_interfaces/tasks/cli.yaml
deleted file mode 100644
index 475fe83154..0000000000
--- a/test/integration/targets/eos_lldp_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_lldp_interfaces/tasks/eapi.yaml b/test/integration/targets/eos_lldp_interfaces/tasks/eapi.yaml
deleted file mode 100644
index 34ce8f6347..0000000000
--- a/test/integration/targets/eos_lldp_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_lldp_interfaces/tasks/main.yaml b/test/integration/targets/eos_lldp_interfaces/tasks/main.yaml
index 970e74171e..068963b4c3 100644
--- a/test/integration/targets/eos_lldp_interfaces/tasks/main.yaml
+++ b/test/integration/targets/eos_lldp_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"
+  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_lldp_interfaces/tests/common/deleted.yaml b/test/integration/targets/eos_lldp_interfaces/tests/cli/deleted.yaml
index b3f94f93da..b3f94f93da 100644
--- a/test/integration/targets/eos_lldp_interfaces/tests/common/deleted.yaml
+++ b/test/integration/targets/eos_lldp_interfaces/tests/cli/deleted.yaml
diff --git a/test/integration/targets/eos_lldp_interfaces/tests/common/merged.yaml b/test/integration/targets/eos_lldp_interfaces/tests/cli/merged.yaml
index 4d56ca50a6..4d56ca50a6 100644
--- a/test/integration/targets/eos_lldp_interfaces/tests/common/merged.yaml
+++ b/test/integration/targets/eos_lldp_interfaces/tests/cli/merged.yaml
diff --git a/test/integration/targets/eos_lldp_interfaces/tests/common/overridden.yaml b/test/integration/targets/eos_lldp_interfaces/tests/cli/overridden.yaml
index 82ad0beb89..82ad0beb89 100644
--- a/test/integration/targets/eos_lldp_interfaces/tests/common/overridden.yaml
+++ b/test/integration/targets/eos_lldp_interfaces/tests/cli/overridden.yaml
diff --git a/test/integration/targets/eos_lldp_interfaces/tests/common/replaced.yaml b/test/integration/targets/eos_lldp_interfaces/tests/cli/replaced.yaml
index 56f3d34580..56f3d34580 100644
--- a/test/integration/targets/eos_lldp_interfaces/tests/common/replaced.yaml
+++ b/test/integration/targets/eos_lldp_interfaces/tests/cli/replaced.yaml
diff --git a/test/integration/targets/eos_lldp_interfaces/tests/common/reset_config.yml b/test/integration/targets/eos_lldp_interfaces/tests/cli/reset_config.yml
index c2085aef61..99688d8478 100644
--- a/test/integration/targets/eos_lldp_interfaces/tests/common/reset_config.yml
+++ b/test/integration/targets/eos_lldp_interfaces/tests/cli/reset_config.yml
@@ -1,7 +1,7 @@
 ---
 - name: Reset initial config
-  eos_config:
-    lines: |
+  cli_config:
+    config: |
       interface Ethernet1
          no lldp receive
          lldp transmit
diff --git a/test/integration/targets/eos_vlans/tasks/cli.yaml b/test/integration/targets/eos_vlans/tasks/cli.yaml
deleted file mode 100644
index 475fe83154..0000000000
--- a/test/integration/targets/eos_vlans/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_vlans/tasks/eapi.yaml b/test/integration/targets/eos_vlans/tasks/eapi.yaml
deleted file mode 100644
index 34ce8f6347..0000000000
--- a/test/integration/targets/eos_vlans/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_vlans/tasks/main.yaml b/test/integration/targets/eos_vlans/tasks/main.yaml
index 970e74171e..068963b4c3 100644
--- a/test/integration/targets/eos_vlans/tasks/main.yaml
+++ b/test/integration/targets/eos_vlans/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"
+  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_vlans/tests/common/deleted.yaml b/test/integration/targets/eos_vlans/tests/cli/deleted.yaml
index 6cd5130428..6cd5130428 100644
--- a/test/integration/targets/eos_vlans/tests/common/deleted.yaml
+++ b/test/integration/targets/eos_vlans/tests/cli/deleted.yaml
diff --git a/test/integration/targets/eos_vlans/tests/common/idempotent.yaml b/test/integration/targets/eos_vlans/tests/cli/idempotent.yaml
index d88e318ba9..d88e318ba9 100644
--- a/test/integration/targets/eos_vlans/tests/common/idempotent.yaml
+++ b/test/integration/targets/eos_vlans/tests/cli/idempotent.yaml
diff --git a/test/integration/targets/eos_vlans/tests/common/merged.yaml b/test/integration/targets/eos_vlans/tests/cli/merged.yaml
index 5ad3f08597..5ad3f08597 100644
--- a/test/integration/targets/eos_vlans/tests/common/merged.yaml
+++ b/test/integration/targets/eos_vlans/tests/cli/merged.yaml
diff --git a/test/integration/targets/eos_vlans/tests/common/overridden.yaml b/test/integration/targets/eos_vlans/tests/cli/overridden.yaml
index ea406b6b47..ea406b6b47 100644
--- a/test/integration/targets/eos_vlans/tests/common/overridden.yaml
+++ b/test/integration/targets/eos_vlans/tests/cli/overridden.yaml
diff --git a/test/integration/targets/eos_vlans/tests/common/replaced.yaml b/test/integration/targets/eos_vlans/tests/cli/replaced.yaml
index ca502ff156..ca502ff156 100644
--- a/test/integration/targets/eos_vlans/tests/common/replaced.yaml
+++ b/test/integration/targets/eos_vlans/tests/cli/replaced.yaml
diff --git a/test/integration/targets/eos_vlans/tests/common/reset_config.yml b/test/integration/targets/eos_vlans/tests/cli/reset_config.yml
index 38736d88b5..513a1199b1 100644
--- a/test/integration/targets/eos_vlans/tests/common/reset_config.yml
+++ b/test/integration/targets/eos_vlans/tests/cli/reset_config.yml
@@ -1,17 +1,12 @@
 ---
 - name: Reset initial config
-  eos_config:
-    before:
+  cli_config:
+    config: |
       no vlan 1-4094
-    defaults: yes
-    match: exact
-    lines: |
       vlan 10
          name ten
-         state active
       vlan 20
          name twenty
-         state active
   become: yes
 
 - eos_facts: