network integration tests

101 files changed, 3165 insertions, 0 deletions

diff --git a/test/integration/targets/vyos_banner/vyos_banner/aliases b/test/integration/targets/vyos_banner/vyos_banner/aliases
new file mode 100644
index 0000000..539d957
--- /dev/null
+++ b/test/integration/targets/vyos_banner/vyos_banner/aliases
@@ -0,0 +1 @@
+shippable/network
diff --git a/test/integration/targets/vyos_banner/vyos_banner/defaults/main.yaml b/test/integration/targets/vyos_banner/vyos_banner/defaults/main.yaml
new file mode 100644
index 0000000..9ef5ba5
--- /dev/null
+++ b/test/integration/targets/vyos_banner/vyos_banner/defaults/main.yaml
@@ -0,0 +1,3 @@
+---
+testcase: "*"
+test_items: []
diff --git a/test/integration/targets/vyos_banner/vyos_banner/tasks/cli.yaml b/test/integration/targets/vyos_banner/vyos_banner/tasks/cli.yaml
new file mode 100644
index 0000000..890d3ac
--- /dev/null
+++ b/test/integration/targets/vyos_banner/vyos_banner/tasks/cli.yaml
@@ -0,0 +1,22 @@
+---
+- 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 case (connection=network_cli)
+  include: "{{ test_case_to_run }} ansible_connection=network_cli"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
+
+- name: run test case (connection=local)
+  include: "{{ test_case_to_run }} ansible_connection=local"
+  with_first_found: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
diff --git a/test/integration/targets/vyos_banner/vyos_banner/tasks/main.yaml b/test/integration/targets/vyos_banner/vyos_banner/tasks/main.yaml
new file mode 100644
index 0000000..415c99d
--- /dev/null
+++ b/test/integration/targets/vyos_banner/vyos_banner/tasks/main.yaml
@@ -0,0 +1,2 @@
+---
+- { include: cli.yaml, tags: ['cli'] }
diff --git a/test/integration/targets/vyos_banner/vyos_banner/tests/cli/basic-no-login.yaml b/test/integration/targets/vyos_banner/vyos_banner/tests/cli/basic-no-login.yaml
new file mode 100644
index 0000000..d513d2e
--- /dev/null
+++ b/test/integration/targets/vyos_banner/vyos_banner/tests/cli/basic-no-login.yaml
@@ -0,0 +1,41 @@
+---
+- debug:
+    msg: "cli/basic-no-login.yaml on connection={{ ansible_connection }}"
+
+- name: Setup
+  vyos_banner:
+    banner: pre-login
+    text: |
+      Junk pre-login banner
+      over multiple lines
+    state: present
+
+- name: remove pre-login
+  vyos_banner:
+    banner: pre-login
+    state: absent
+  register: result
+
+- debug:
+    msg: "{{ result }}"
+
+- assert:
+    that:
+      - "result.changed == true"
+      - "'delete system login banner pre-login' in result.commands"
+
+- name: remove pre-login (idempotent)
+  vyos_banner:
+    banner: pre-login
+    state: absent
+  register: result
+
+- assert:
+    that:
+      - "result.changed == false"
+      - "result.commands | length == 0"
+
+
+# FIXME add in tests for everything defined in docs
+# FIXME Test state:absent + test:
+# FIXME Without powers ensure "privileged mode required"
diff --git a/test/integration/targets/vyos_banner/vyos_banner/tests/cli/basic-post-login.yaml b/test/integration/targets/vyos_banner/vyos_banner/tests/cli/basic-post-login.yaml
new file mode 100644
index 0000000..bda84a8
--- /dev/null
+++ b/test/integration/targets/vyos_banner/vyos_banner/tests/cli/basic-post-login.yaml
@@ -0,0 +1,47 @@
+---
+- debug:
+    msg: "cli/basic-post-login.yaml on connection={{ ansible_connection }}"
+
+- name: setup - remove post-login
+  vyos_banner:
+    banner: post-login
+    state: absent
+
+- name: Set post-login
+  vyos_banner:
+    banner: post-login
+    text: |
+      this is my post-login banner
+      that has a multiline
+      string
+    state: present
+  register: result
+
+- debug:
+    msg: "{{ result }}"
+
+- assert:
+    that:
+      - "result.changed == true"
+      - "'this is my post-login banner' in result.commands[0]"
+      - "'that has a multiline' in result.commands[0]"
+
+- name: Set post-login again (idempotent)
+  vyos_banner:
+    banner: post-login
+    text: |
+      this is my post-login banner
+      that has a multiline
+      string
+    state: present
+  register: result
+
+- assert:
+    that:
+      - "result.changed == false"
+      - "result.commands | length == 0"
+
+
+# FIXME add in tests for everything defined in docs
+# FIXME Test state:absent + test:
+# FIXME Without powers ensure "privileged mode required"
diff --git a/test/integration/targets/vyos_banner/vyos_banner/tests/cli/basic-pre-login.yaml b/test/integration/targets/vyos_banner/vyos_banner/tests/cli/basic-pre-login.yaml
new file mode 100644
index 0000000..eb66a73
--- /dev/null
+++ b/test/integration/targets/vyos_banner/vyos_banner/tests/cli/basic-pre-login.yaml
@@ -0,0 +1,47 @@
+---
+- debug:
+    msg: "cli/basic-pre-login.yaml on connection={{ ansible_connection }}"
+
+- name: setup - remove pre-login
+  vyos_banner:
+    banner: pre-login
+    state: absent
+
+- name: Set pre-login
+  vyos_banner:
+    banner: pre-login
+    text: |
+      this is my pre-login banner
+      that has a multiline
+      string
+    state: present
+  register: result
+
+- debug:
+    msg: "{{ result }}"
+
+- assert:
+    that:
+      - "result.changed == true"
+      - "'this is my pre-login banner' in result.commands[0]"
+      - "'that has a multiline' in result.commands[0]"
+
+- name: Set pre-login again (idempotent)
+  vyos_banner:
+    banner: pre-login
+    text: |
+      this is my pre-login banner
+      that has a multiline
+      string
+    state: present
+  register: result
+
+- assert:
+    that:
+      - "result.changed == false"
+      - "result.commands | length == 0"
+
+
+# FIXME add in tests for everything defined in docs
+# FIXME Test state:absent + test:
+# FIXME Without powers ensure "privileged mode required"
diff --git a/test/integration/targets/vyos_command/vyos_command/aliases b/test/integration/targets/vyos_command/vyos_command/aliases
new file mode 100644
index 0000000..539d957
--- /dev/null
+++ b/test/integration/targets/vyos_command/vyos_command/aliases
@@ -0,0 +1 @@
+shippable/network
diff --git a/test/integration/targets/vyos_command/vyos_command/defaults/main.yaml b/test/integration/targets/vyos_command/vyos_command/defaults/main.yaml
new file mode 100644
index 0000000..9ef5ba5
--- /dev/null
+++ b/test/integration/targets/vyos_command/vyos_command/defaults/main.yaml
@@ -0,0 +1,3 @@
+---
+testcase: "*"
+test_items: []
diff --git a/test/integration/targets/vyos_command/vyos_command/tasks/cli.yaml b/test/integration/targets/vyos_command/vyos_command/tasks/cli.yaml
new file mode 100644
index 0000000..890d3ac
--- /dev/null
+++ b/test/integration/targets/vyos_command/vyos_command/tasks/cli.yaml
@@ -0,0 +1,22 @@
+---
+- 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 case (connection=network_cli)
+  include: "{{ test_case_to_run }} ansible_connection=network_cli"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
+
+- name: run test case (connection=local)
+  include: "{{ test_case_to_run }} ansible_connection=local"
+  with_first_found: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
diff --git a/test/integration/targets/vyos_command/vyos_command/tasks/main.yaml b/test/integration/targets/vyos_command/vyos_command/tasks/main.yaml
new file mode 100644
index 0000000..415c99d
--- /dev/null
+++ b/test/integration/targets/vyos_command/vyos_command/tasks/main.yaml
@@ -0,0 +1,2 @@
+---
+- { include: cli.yaml, tags: ['cli'] }
diff --git a/test/integration/targets/vyos_command/vyos_command/tests/cli/bad_operator.yaml b/test/integration/targets/vyos_command/vyos_command/tests/cli/bad_operator.yaml
new file mode 100644
index 0000000..9e9de9f
--- /dev/null
+++ b/test/integration/targets/vyos_command/vyos_command/tests/cli/bad_operator.yaml
@@ -0,0 +1,19 @@
+---
+- debug: msg="START cli/bad_operator.yaml on connection={{ ansible_connection }}"
+
+- name: test bad operator
+  vyos_command:
+    commands:
+      - show version
+      - show interfaces
+    wait_for:
+      - result[0] is 'VyOS'
+  register: result
+  ignore_errors: yes
+
+- assert:
+    that:
+      - result.failed == true
+      - result.msg is defined
+
+- debug: msg="END cli/bad_operator.yaml on connection={{ ansible_connection }}"
diff --git a/test/integration/targets/vyos_command/vyos_command/tests/cli/cli_command.yaml b/test/integration/targets/vyos_command/vyos_command/tests/cli/cli_command.yaml
new file mode 100644
index 0000000..caeb202
--- /dev/null
+++ b/test/integration/targets/vyos_command/vyos_command/tests/cli/cli_command.yaml
@@ -0,0 +1,41 @@
+---
+- debug:
+    msg: "START cli/cli_command.yaml on connection={{ ansible_connection }}"
+
+- block:
+  - name: get output for single command
+    cli_command:
+      command: show version
+    register: result
+
+  - assert:
+      that:
+        - "result.changed == false"
+        - "result.stdout is defined"
+
+  - name: send invalid command
+    cli_command:
+      command: 'show foo'
+    register: result
+    ignore_errors: yes
+
+  - assert:
+      that:
+        - "result.failed == true"
+        - "result.msg is defined"
+  when: "ansible_connection == 'network_cli'"
+
+- block:
+  - name: test failure for local connection
+    cli_command:
+      command: show version
+    register: result
+    ignore_errors: yes
+
+  - assert:
+      that:
+        - 'result.failed == true'
+        - "'Connection type local is not valid for this module' in result.msg"
+  when: "ansible_connection == 'local'"
+
+- debug: msg="END cli/cli_command.yaml on connection={{ ansible_connection }}"
diff --git a/test/integration/targets/vyos_command/vyos_command/tests/cli/contains.yaml b/test/integration/targets/vyos_command/vyos_command/tests/cli/contains.yaml
new file mode 100644
index 0000000..85c6e86
--- /dev/null
+++ b/test/integration/targets/vyos_command/vyos_command/tests/cli/contains.yaml
@@ -0,0 +1,20 @@
+---
+- debug: msg="START cli/contains.yaml on connection={{ ansible_connection }}"
+
+- name: test contains operator
+  vyos_command:
+    commands:
+      - show version
+      - show interface
+    wait_for:
+      - result[0] contains VyOS
+      - result[1] contains eth0
+  register: result
+
+- assert:
+    that:
+      - result.changed == false
+      - result.stdout is defined
+      - result.stdout_lines is defined
+
+- debug: msg="END cli/contains.yaml on connection={{ ansible_connection }}"
diff --git a/test/integration/targets/vyos_command/vyos_command/tests/cli/invalid.yaml b/test/integration/targets/vyos_command/vyos_command/tests/cli/invalid.yaml
new file mode 100644
index 0000000..e6d25e4
--- /dev/null
+++ b/test/integration/targets/vyos_command/vyos_command/tests/cli/invalid.yaml
@@ -0,0 +1,22 @@
+---
+- debug: msg="START cli/invalid.yaml on connection={{ ansible_connection }}"
+
+- name: run invalid command
+  vyos_command:
+    commands: show foo
+  register: result
+  ignore_errors: yes
+
+- assert: { that: result.failed }
+
+- name: run commands that include invalid command
+  vyos_command:
+    commands:
+      - show version
+      - show foo
+  register: result
+  ignore_errors: yes
+
+- assert: { that: result.failed }
+
+- debug: msg="END cli/invalid.yaml on connection={{ ansible_connection }}"
diff --git a/test/integration/targets/vyos_command/vyos_command/tests/cli/output.yaml b/test/integration/targets/vyos_command/vyos_command/tests/cli/output.yaml
new file mode 100644
index 0000000..294f62f
--- /dev/null
+++ b/test/integration/targets/vyos_command/vyos_command/tests/cli/output.yaml
@@ -0,0 +1,44 @@
+---
+- debug: msg="START cli/output.yaml on connection={{ ansible_connection }}"
+
+- name: get output for single command
+  vyos_command:
+    commands: show version
+  register: result
+
+- assert:
+    that:
+      - result.changed == false
+      - result.stdout is defined
+      - result.stdout_lines is defined
+
+- name: get output for multiple commands
+  vyos_command:
+    commands:
+      - show version
+      - show interfaces
+  register: result
+
+- assert:
+    that:
+      - result.changed == false
+      - result.stdout is defined
+      - result.stdout | length == 2
+
+- name: Get output for multiple commands that call less explicitly
+  vyos_command:
+    commands:
+        # NOTE: We only test show commands that will output <ANSIBLE_VYOS_TERMINAL_LENGTH
+        # Otherwise you will get ": "command timeout triggered"
+      - show hardware cpu detail
+      - show hardware mem
+      - show license
+  register: result
+
+- assert:
+    that:
+      - result.changed == false
+      - result.stdout_lines is defined
+      - result.stdout_lines[2] | length >= 20
+
+- debug: msg="END cli/output.yaml on connection={{ ansible_connection }}"
diff --git a/test/integration/targets/vyos_command/vyos_command/tests/cli/timeout.yaml b/test/integration/targets/vyos_command/vyos_command/tests/cli/timeout.yaml
new file mode 100644
index 0000000..4994ebf
--- /dev/null
+++ b/test/integration/targets/vyos_command/vyos_command/tests/cli/timeout.yaml
@@ -0,0 +1,18 @@
+---
+- debug: msg="START cli/timeout.yaml on connection={{ ansible_connection }}"
+
+- name: test bad condition
+  vyos_command:
+    commands:
+      - show version
+    wait_for:
+      - result[0] contains bad_value_string
+  register: result
+  ignore_errors: yes
+
+- assert:
+    that:
+      - result.failed == true
+      - result.msg is defined
+
+- debug: msg="END cli/timeout.yaml on connection={{ ansible_connection }}"
diff --git a/test/integration/targets/vyos_config/vyos_config/aliases b/test/integration/targets/vyos_config/vyos_config/aliases
new file mode 100644
index 0000000..539d957
--- /dev/null
+++ b/test/integration/targets/vyos_config/vyos_config/aliases
@@ -0,0 +1 @@
+shippable/network
diff --git a/test/integration/targets/vyos_config/vyos_config/defaults/main.yaml b/test/integration/targets/vyos_config/vyos_config/defaults/main.yaml
new file mode 100644
index 0000000..9ef5ba5
--- /dev/null
+++ b/test/integration/targets/vyos_config/vyos_config/defaults/main.yaml
@@ -0,0 +1,3 @@
+---
+testcase: "*"
+test_items: []
diff --git a/test/integration/targets/vyos_config/vyos_config/tasks/cli.yaml b/test/integration/targets/vyos_config/vyos_config/tasks/cli.yaml
new file mode 100644
index 0000000..890d3ac
--- /dev/null
+++ b/test/integration/targets/vyos_config/vyos_config/tasks/cli.yaml
@@ -0,0 +1,22 @@
+---
+- 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 case (connection=network_cli)
+  include: "{{ test_case_to_run }} ansible_connection=network_cli"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
+
+- name: run test case (connection=local)
+  include: "{{ test_case_to_run }} ansible_connection=local"
+  with_first_found: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
diff --git a/test/integration/targets/vyos_config/vyos_config/tasks/cli_config.yaml b/test/integration/targets/vyos_config/vyos_config/tasks/cli_config.yaml
new file mode 100644
index 0000000..f5d5b55
--- /dev/null
+++ b/test/integration/targets/vyos_config/vyos_config/tasks/cli_config.yaml
@@ -0,0 +1,16 @@
+---
+- name: collect all cli_config test cases
+  find:
+    paths: "{{ role_path }}/tests/cli_config"
+    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 case (connection=network_cli)
+  include: "{{ test_case_to_run }} ansible_connection=network_cli"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
diff --git a/test/integration/targets/vyos_config/vyos_config/tasks/main.yaml b/test/integration/targets/vyos_config/vyos_config/tasks/main.yaml
new file mode 100644
index 0000000..5e327e8
--- /dev/null
+++ b/test/integration/targets/vyos_config/vyos_config/tasks/main.yaml
@@ -0,0 +1,3 @@
+---
+- { include: cli.yaml, tags: ['cli'] }
+- { include: cli_config.yaml, tags: ['cli_config'] }
diff --git a/test/integration/targets/vyos_config/vyos_config/tests/cli/backup.yaml b/test/integration/targets/vyos_config/vyos_config/tests/cli/backup.yaml
new file mode 100644
index 0000000..9f57c44
--- /dev/null
+++ b/test/integration/targets/vyos_config/vyos_config/tests/cli/backup.yaml
@@ -0,0 +1,113 @@
+---
+- debug: msg="START vyos/backup.yaml on connection={{ ansible_connection }}"
+
+- name: collect any backup files
+  find:
+    paths: "{{ role_path }}/backup"
+    pattern: "{{ inventory_hostname_short }}_config*"
+  register: backup_files
+  connection: local
+
+- name: delete backup files
+  file:
+    path: "{{ item.path }}"
+    state: absent
+  with_items: "{{backup_files.files|default([])}}"
+
+- name: take configure backup
+  vyos_config:
+    backup: yes
+  register: result
+
+- assert:
+    that:
+      - "result.changed == true"
+
+- name: collect any backup files
+  find:
+    paths: "{{ role_path }}/backup"
+    pattern: "{{ inventory_hostname_short }}_config*"
+  register: backup_files
+  connection: local
+
+- assert:
+    that:
+      - "backup_files.files is defined"
+
+- name: delete configurable backup file path
+  file:
+    path: "{{ item }}"
+    state: absent
+  with_items:
+    - "{{ role_path }}/backup_test_dir/"
+    - "{{ role_path }}/backup/backup.cfg"
+
+- name: take configuration backup in custom filename and directory path
+  vyos_config:
+    backup: yes
+    backup_options:
+      filename: backup.cfg
+      dir_path: "{{ role_path }}/backup_test_dir/{{ inventory_hostname_short }}"
+  become: yes
+  register: result
+
+- assert:
+    that:
+      - "result.changed == true"
+
+- name: check if the backup file-1 exist
+  find:
+    paths: "{{ role_path }}/backup_test_dir/{{ inventory_hostname_short }}/backup.cfg"
+  register: backup_file
+  connection: local
+
+- assert:
+    that:
+      - "backup_file.files is defined"
+
+- name: take configuration backup in custom filename
+  vyos_config:
+    backup: yes
+    backup_options:
+      filename: backup.cfg
+  become: yes
+  register: result
+
+- assert:
+    that:
+      - "result.changed == true"
+
+- name: check if the backup file-2 exist
+  find:
+    paths: "{{ role_path }}/backup/backup.cfg"
+  register: backup_file
+  connection: local
+
+- assert:
+    that:
+      - "backup_file.files is defined"
+
+- name: take configuration backup in custom path and default filename
+  vyos_config:
+    backup: yes
+    backup_options:
+      dir_path: "{{ role_path }}/backup_test_dir/{{ inventory_hostname_short }}"
+  become: yes
+  register: result
+
+- assert:
+    that:
+      - "result.changed == true"
+
+- name: check if the backup file-3 exist
+  find:
+    paths: "{{ role_path }}/backup_test_dir/{{ inventory_hostname_short }}"
+    pattern: "{{ inventory_hostname_short }}_config*"
+  register: backup_file
+  connection: local
+
+- assert:
+    that:
+      - "backup_file.files is defined"
+
+- debug: msg="END vyos/backup.yaml on connection={{ ansible_connection }}"
diff --git a/test/integration/targets/vyos_config/vyos_config/tests/cli/check_config.yaml b/test/integration/targets/vyos_config/vyos_config/tests/cli/check_config.yaml
new file mode 100644
index 0000000..65076b3
--- /dev/null
+++ b/test/integration/targets/vyos_config/vyos_config/tests/cli/check_config.yaml
@@ -0,0 +1,63 @@
+---
+- debug: msg="START cli/config_check.yaml on connection={{ ansible_connection }}"
+
+- name: setup- ensure interface is not present
+  vyos_config:
+    lines: delete interfaces loopback lo
+
+- name: setup- create interface
+  vyos_config:
+    lines:
+      - interfaces
+      - interfaces loopback lo
+      - interfaces loopback lo description test
+  register: result
+
+# note collapsing the duplicate lines doesn't work if
+# lines:
+#   - interfaces loopback lo description test
+#   - interfaces loopback lo
+#   - interfaces
+
+- name: Check that multiple duplicate lines collapse into a single commands
+  assert:
+    that:
+      - "{{ result.commands|length }} == 1"
+
+- name: Check that set is correctly prepended
+  assert:
+    that:
+      - "result.commands[0] == 'set interfaces loopback lo description test'"
+
+- name: configure config_check config command
+  vyos_config:
+    lines: delete interfaces loopback lo
+  register: result
+
+- assert:
+    that:
+      - "result.changed == true"
+
+- name: check config_check config command idempontent
+  vyos_config:
+    lines: delete interfaces loopback lo
+  register: result
+
+- assert:
+    that:
+      - "result.changed == false"
+
+- name: check multiple line config filter is working
+  vyos_config:
+      lines:
+          - set system login user esa level admin
+          - set system login user esa authentication encrypted-password '!abc!'
+          - set system login user vyos level admin
+          - set system login user vyos authentication encrypted-password 'abc'
+  register: result
+
+- assert:
+    that:
+      - "{{ result.filtered|length }} == 2"
+
+- debug: msg="END cli/config_check.yaml on connection={{ ansible_connection }}"
diff --git a/test/integration/targets/vyos_config/vyos_config/tests/cli/comment.yaml b/test/integration/targets/vyos_config/vyos_config/tests/cli/comment.yaml
new file mode 100644
index 0000000..3c71dfc
--- /dev/null
+++ b/test/integration/targets/vyos_config/vyos_config/tests/cli/comment.yaml
@@ -0,0 +1,34 @@
+---
+- debug: msg="START cli/comment.yaml on connection={{ ansible_connection }}"
+
+- name: setup
+  vyos_config:
+    lines: set system host-name {{ inventory_hostname_short }}
+    match: none
+
+- name: configure using comment
+  vyos_config:
+    lines: set system host-name foo
+    comment: this is a test
+  register: result
+
+- assert:
+    that:
+      - "result.changed == true"
+      - "'set system host-name foo' in result.commands"
+
+- name: collect system commits
+  vyos_command:
+    commands: show system commit
+  register: result
+
+- assert:
+    that:
+      - "'this is a test' in result.stdout_lines[0][1]"
+
+- name: teardown
+  vyos_config:
+    lines: set system host-name {{ inventory_hostname_short }}
+    match: none
+
+- debug: msg="END cli/comment.yaml on connection={{ ansible_connection }}"
diff --git a/test/integration/targets/vyos_config/vyos_config/tests/cli/save.yaml b/test/integration/targets/vyos_config/vyos_config/tests/cli/save.yaml
new file mode 100644
index 0000000..7b058a7
--- /dev/null
+++ b/test/integration/targets/vyos_config/vyos_config/tests/cli/save.yaml
@@ -0,0 +1,54 @@
+---
+- debug: msg="START cli/save.yaml on connection={{ ansible_connection }}"
+
+- name: setup
+  vyos_config:
+    lines: set system host-name {{ inventory_hostname_short }}
+    match: none
+
+- name: configure hostaname and save
+  vyos_config:
+    lines: set system host-name foo
+    save: true
+  register: result
+
+- assert:
+    that:
+      - "result.changed == true"
+      - "'set system host-name foo' in result.commands"
+
+- name: configure hostaname and don't save
+  vyos_config:
+    lines: set system host-name bar
+  register: result
+
+- assert:
+    that:
+      - "result.changed == true"
+      - "'set system host-name bar' in result.commands"
+
+- name: save config
+  vyos_config:
+    save: true
+  register: result
+
+- assert:
+    that:
+      - "result.changed == true"
+
+- name: save config again
+  vyos_config:
+    save: true
+  register: result
+
+- assert:
+    that:
+      - "result.changed == false"
+
+- name: teardown
+  vyos_config:
+    lines: set system host-name {{ inventory_hostname_short }}
+    match: none
+    save: true
+
+- debug: msg="END cli/simple.yaml on connection={{ ansible_connection }}"
diff --git a/test/integration/targets/vyos_config/vyos_config/tests/cli/simple.yaml b/test/integration/targets/vyos_config/vyos_config/tests/cli/simple.yaml
new file mode 100644
index 0000000..a4a8799
--- /dev/null
+++ b/test/integration/targets/vyos_config/vyos_config/tests/cli/simple.yaml
@@ -0,0 +1,33 @@
+---
+- debug: msg="START cli/simple.yaml on connection={{ ansible_connection }}"
+
+- name: setup
+  vyos_config:
+    lines: set system host-name {{ inventory_hostname_short }}
+    match: none
+
+- name: configure simple config command
+  vyos_config:
+    lines: set system host-name foo
+  register: result
+
+- assert:
+    that:
+      - "result.changed == true"
+      - "'set system host-name foo' in result.commands"
+
+- name: check simple config command idempontent
+  vyos_config:
+    lines: set system host-name foo
+  register: result
+
+- assert:
+    that:
+      - "result.changed == false"
+
+- name: teardown
+  vyos_config:
+    lines: set system host-name {{ inventory_hostname_short }}
+    match: none
+
+- debug: msg="END cli/simple.yaml on connection={{ ansible_connection }}"
diff --git a/test/integration/targets/vyos_config/vyos_config/tests/cli_config/cli_backup.yaml b/test/integration/targets/vyos_config/vyos_config/tests/cli_config/cli_backup.yaml
new file mode 100644
index 0000000..a431c01
--- /dev/null
+++ b/test/integration/targets/vyos_config/vyos_config/tests/cli_config/cli_backup.yaml
@@ -0,0 +1,113 @@
+- debug: msg="END cli_config/backup.yaml on connection={{ ansible_connection }}"
+
+- name: delete configurable backup file path
+  file:
+    path: "{{ item }}"
+    state: absent
+  with_items:
+    - "{{ role_path }}/backup_test_dir/"
+    - "{{ role_path }}/backup/backup.cfg"
+
+- name: collect any backup files
+  find:
+    paths: "{{ role_path }}/backup"
+    pattern: "{{ inventory_hostname_short }}_config*"
+  register: backup_files
+  connection: local
+
+- name: delete backup files
+  file:
+    path: "{{ item.path }}"
+    state: absent
+  with_items: "{{backup_files.files|default([])}}"
+
+- name: take config backup
+  cli_config:
+    backup: yes
+  become: yes
+  register: result
+
+- assert:
+    that:
+      - "result.changed == true"
+
+- name: collect any backup files
+  find:
+    paths: "{{ role_path }}/backup"
+    pattern: "{{ inventory_hostname_short }}_config*"
+  register: backup_files
+  connection: local
+
+- assert:
+    that:
+      - "backup_files.files is defined"
+
+- name: take configuration backup in custom filename and directory path
+  cli_config:
+    backup: yes
+    backup_options:
+      filename: backup.cfg
+      dir_path: "{{ role_path }}/backup_test_dir/{{ inventory_hostname_short }}"
+  become: yes
+  register: result
+
+- assert:
+    that:
+      - "result.changed == true"
+
+- name: check if the backup file-1 exist
+  find:
+    paths: "{{ role_path }}/backup_test_dir/{{ inventory_hostname_short }}/backup.cfg"
+  register: backup_file
+  connection: local
+
+- assert:
+    that:
+      - "backup_file.files is defined"
+
+- name: take configuration backup in custom filename
+  cli_config:
+    backup: yes
+    backup_options:
+      filename: backup.cfg
+  become: yes
+  register: result
+
+- assert:
+    that:
+      - "result.changed == true"
+
+- name: check if the backup file-2 exist
+  find:
+    paths: "{{ role_path }}/backup/backup.cfg"
+  register: backup_file
+  connection: local
+
+- assert:
+    that:
+      - "backup_file.files is defined"
+
+- name: take configuration backup in custom path and default filename
+  cli_config:
+    backup: yes
+    backup_options:
+      dir_path: "{{ role_path }}/backup_test_dir/{{ inventory_hostname_short }}"
+  become: yes
+  register: result
+
+- assert:
+    that:
+      - "result.changed == true"
+
+- name: check if the backup file-3 exist
+  find:
+    paths: "{{ role_path }}/backup_test_dir/{{ inventory_hostname_short }}"
+    pattern: "{{ inventory_hostname_short }}_config*"
+  register: backup_file
+  connection: local
+
+- assert:
+    that:
+      - "backup_file.files is defined"
+
+- debug: msg="END cli_config/backup.yaml on connection={{ ansible_connection }}"
diff --git a/test/integration/targets/vyos_config/vyos_config/tests/cli_config/cli_basic.yaml b/test/integration/targets/vyos_config/vyos_config/tests/cli_config/cli_basic.yaml
new file mode 100644
index 0000000..e83db1e
--- /dev/null
+++ b/test/integration/targets/vyos_config/vyos_config/tests/cli_config/cli_basic.yaml
@@ -0,0 +1,28 @@
+---
+- debug: msg="START cli_config/cli_basic.yaml on connection={{ ansible_connection }}"
+
+- name: setup - remove interface description
+  cli_config: &rm
+    config: delete interfaces loopback lo description
+
+- name: configure device with config
+  cli_config: &conf
+    config: set interfaces loopback lo description 'this is a test'
+  register: result
+
+- assert:
+    that:
+      - "result.changed == true"
+
+- name: Idempotence
+  cli_config: *conf
+  register: result
+
+- assert:
+    that:
+      - "result.changed == false"
+
+- name: teardown
+  cli_config: *rm
+
+- debug: msg="END cli_config/cli_basic.yaml on connection={{ ansible_connection }}"
diff --git a/test/integration/targets/vyos_config/vyos_config/tests/cli_config/cli_comment.yaml b/test/integration/targets/vyos_config/vyos_config/tests/cli_config/cli_comment.yaml
new file mode 100644
index 0000000..163f05e
--- /dev/null
+++ b/test/integration/targets/vyos_config/vyos_config/tests/cli_config/cli_comment.yaml
@@ -0,0 +1,30 @@
+---
+- debug: msg="START cli_config/cli_comment.yaml on connection={{ ansible_connection }}"
+
+- name: setup
+  cli_config: &rm
+    config: set system host-name {{ inventory_hostname_short }}
+
+- name: configure using comment
+  cli_config:
+    config: set system host-name foo
+    commit_comment: this is a test
+  register: result
+
+- assert:
+    that:
+      - "result.changed == true"
+
+- name: collect system commits
+  vyos_command:
+    commands: show system commit
+  register: result
+
+- assert:
+    that:
+      - "'this is a test' in result.stdout_lines[0][1]"
+
+- name: teardown
+  cli_config: *rm
+
+- debug: msg="END cli_config/cli_comment.yaml on connection={{ ansible_connection }}"
diff --git a/test/integration/targets/vyos_facts/vyos_facts/aliases b/test/integration/targets/vyos_facts/vyos_facts/aliases
new file mode 100644
index 0000000..539d957
--- /dev/null
+++ b/test/integration/targets/vyos_facts/vyos_facts/aliases
@@ -0,0 +1 @@
+shippable/network
diff --git a/test/integration/targets/vyos_facts/vyos_facts/defaults/main.yaml b/test/integration/targets/vyos_facts/vyos_facts/defaults/main.yaml
new file mode 100644
index 0000000..9ef5ba5
--- /dev/null
+++ b/test/integration/targets/vyos_facts/vyos_facts/defaults/main.yaml
@@ -0,0 +1,3 @@
+---
+testcase: "*"
+test_items: []
diff --git a/test/integration/targets/vyos_facts/vyos_facts/tasks/cli.yaml b/test/integration/targets/vyos_facts/vyos_facts/tasks/cli.yaml
new file mode 100644
index 0000000..890d3ac
--- /dev/null
+++ b/test/integration/targets/vyos_facts/vyos_facts/tasks/cli.yaml
@@ -0,0 +1,22 @@
+---
+- 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 case (connection=network_cli)
+  include: "{{ test_case_to_run }} ansible_connection=network_cli"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
+
+- name: run test case (connection=local)
+  include: "{{ test_case_to_run }} ansible_connection=local"
+  with_first_found: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
diff --git a/test/integration/targets/vyos_facts/vyos_facts/tasks/main.yaml b/test/integration/targets/vyos_facts/vyos_facts/tasks/main.yaml
new file mode 100644
index 0000000..415c99d
--- /dev/null
+++ b/test/integration/targets/vyos_facts/vyos_facts/tasks/main.yaml
@@ -0,0 +1,2 @@
+---
+- { include: cli.yaml, tags: ['cli'] }
diff --git a/test/integration/targets/vyos_facts/vyos_facts/tests/cli/basic_facts.yaml b/test/integration/targets/vyos_facts/vyos_facts/tests/cli/basic_facts.yaml
new file mode 100644
index 0000000..16850cb
--- /dev/null
+++ b/test/integration/targets/vyos_facts/vyos_facts/tests/cli/basic_facts.yaml
@@ -0,0 +1,45 @@
+- name: get host name
+  vyos_command:
+    commands:
+      - show host name
+  register: vyos_host
+
+- name: get version info
+  vyos_command:
+    commands:
+      - show version
+  register: vyos_version
+
+- name: collect all facts from the device
+  vyos_facts:
+    gather_subset: all
+  register: result
+
+- name: "check that hostname is present"
+  assert:
+    that:
+      # hostname
+      - result.ansible_facts.ansible_net_hostname == vyos_host.stdout[0]
+
+- name: "check that subsets are present"
+  assert:
+    that:
+      # subsets
+      - "'neighbors' in result.ansible_facts.ansible_net_gather_subset"
+      - "'default' in result.ansible_facts.ansible_net_gather_subset"
+      - "'config' in result.ansible_facts.ansible_net_gather_subset"
+
+- name: "check that version info is present"
+  assert:
+    that:
+      # version info
+      - result.ansible_facts.ansible_net_version in vyos_version.stdout_lines[0][0]
+      - result.ansible_facts.ansible_net_model in vyos_version.stdout_lines[0][9]
+      - result.ansible_facts.ansible_net_serialnum in vyos_version.stdout_lines[0][10]
+
+- name: "check that config info is present"
+  assert:
+    that:
+      # config info
+      - result.ansible_facts.ansible_net_commits is defined
+      - result.ansible_facts.ansible_net_config is defined
diff --git a/test/integration/targets/vyos_interface/vyos_interface/aliases b/test/integration/targets/vyos_interface/vyos_interface/aliases
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test/integration/targets/vyos_interface/vyos_interface/aliases
diff --git a/test/integration/targets/vyos_interface/vyos_interface/defaults/main.yaml b/test/integration/targets/vyos_interface/vyos_interface/defaults/main.yaml
new file mode 100644
index 0000000..9ef5ba5
--- /dev/null
+++ b/test/integration/targets/vyos_interface/vyos_interface/defaults/main.yaml
@@ -0,0 +1,3 @@
+---
+testcase: "*"
+test_items: []
diff --git a/test/integration/targets/vyos_interface/vyos_interface/tasks/cli.yaml b/test/integration/targets/vyos_interface/vyos_interface/tasks/cli.yaml
new file mode 100644
index 0000000..890d3ac
--- /dev/null
+++ b/test/integration/targets/vyos_interface/vyos_interface/tasks/cli.yaml
@@ -0,0 +1,22 @@
+---
+- 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 case (connection=network_cli)
+  include: "{{ test_case_to_run }} ansible_connection=network_cli"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
+
+- name: run test case (connection=local)
+  include: "{{ test_case_to_run }} ansible_connection=local"
+  with_first_found: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
diff --git a/test/integration/targets/vyos_interface/vyos_interface/tasks/main.yaml b/test/integration/targets/vyos_interface/vyos_interface/tasks/main.yaml
new file mode 100644
index 0000000..415c99d
--- /dev/null
+++ b/test/integration/targets/vyos_interface/vyos_interface/tasks/main.yaml
@@ -0,0 +1,2 @@
+---
+- { include: cli.yaml, tags: ['cli'] }
diff --git a/test/integration/targets/vyos_interface/vyos_interface/tests/cli/basic.yaml b/test/integration/targets/vyos_interface/vyos_interface/tests/cli/basic.yaml
new file mode 100644
index 0000000..2b9ce12
--- /dev/null
+++ b/test/integration/targets/vyos_interface/vyos_interface/tests/cli/basic.yaml
@@ -0,0 +1,220 @@
+---
+- debug: msg="START cli/basic.yaml on connection={{ ansible_connection }}"
+
+- name: Run vyos lsmod command
+  vyos_command:
+    commands:
+      - lsmod
+  register: lsmod_out
+
+- name: Set up - delete interface
+  vyos_interface:
+    name: eth1
+    state: absent
+
+- name: Set up - Create interface
+  vyos_interface:
+    name: eth1
+    state: present
+    description: test-interface
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"set interfaces ethernet eth1" in result.commands'
+      - '"set interfaces ethernet eth1 description ''test-interface''" in result.commands'
+
+- name: Configure interface params
+  vyos_interface:
+    name: eth1
+    state: present
+    description: test-interface-1
+    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)
+  vyos_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
+  vyos_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
+  vyos_interface:
+    name: eth1
+    enabled: False
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"set interfaces ethernet eth1 disable" in result.commands'
+
+- name: Enable interface
+  vyos_interface:
+    name: eth1
+    enabled: True
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"delete interfaces ethernet eth1 disable" in result.commands'
+
+- name: Delete interface
+  vyos_interface:
+    name: eth1
+    state: absent
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"delete interfaces ethernet eth1" in result.commands'
+
+- name: Delete interface (idempotent)
+  vyos_interface:
+    name: eth1
+    state: absent
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == false'
+
+- name: Aggregate setup- delete interface
+  vyos_interface:
+    name: eth2
+    state: absent
+  register: result
+
+- name: Set interface on aggregate
+  vyos_interface:
+    aggregate:
+      - { 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 == 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 512" in result.commands'
+      - '"set interfaces ethernet eth2 description ''test-interface-2''" in result.commands'
+      - '"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)
+  vyos_interface:
+    aggregate:
+      - { 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
+  vyos_interface:
+    aggregate:
+      - name: eth1
+      - name: eth2
+    description: test-interface
+    enabled: False
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"set interfaces ethernet eth1 disable" in result.commands'
+      - '"set interfaces ethernet eth2 disable" in result.commands'
+
+- name: Enable interface on aggregate
+  vyos_interface:
+    aggregate:
+      - name: eth1
+      - name: eth2
+    enabled: True
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"delete interfaces ethernet eth1 disable" in result.commands'
+      - '"delete interfaces ethernet eth2 disable" in result.commands'
+
+- name: Delete interface aggregate
+  vyos_interface:
+    aggregate:
+      - name: eth1
+      - name: eth2
+    state: absent
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"delete interfaces ethernet eth1" in result.commands'
+      - '"delete interfaces ethernet eth2" in result.commands'
+
+- name: Delete interface aggregate (idempotent)
+  vyos_interface:
+    aggregate:
+      - name: eth1
+      - name: eth2
+    state: absent
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == false'
diff --git a/test/integration/targets/vyos_interface/vyos_interface/tests/cli/intent.yaml b/test/integration/targets/vyos_interface/vyos_interface/tests/cli/intent.yaml
new file mode 100644
index 0000000..008dd56
--- /dev/null
+++ b/test/integration/targets/vyos_interface/vyos_interface/tests/cli/intent.yaml
@@ -0,0 +1,157 @@
+---
+- debug: msg="START cli/intent.yaml on connection={{ ansible_connection }}" #"
+
+# To be able to run the lldp test we need to have a neighbor configured to talk to
+# In DCI & Zuul we (currently) only spin up a single network VM, so we can't configure a neighbor
+# In the future when we have multi-network-nodes running we can run these tests again
+# https://github.com/ansible/ansible/issues/39667
+
+- name: Detect if we have existing lldp neighbors configured
+  vyos_command:
+    commands:
+      - show lldp neighbors detail
+  register: neighbors_out
+
+- name: Should we run lldp tests?
+  set_fact:
+    run_lldp_tests: "'PortDescr:    eth0' in neighbors_out.stdout[0]"
+
+- name: Enable LLDP service
+  vyos_lldp:
+    state: present
+  when: run_lldp_tests
+
+- name: Create LLDP configuration
+  vyos_lldp_interface:
+    name: eth1
+    state: present
+  when: run_lldp_tests
+
+- name: Setup (interface is up)
+  vyos_interface:
+    name: eth1
+    enabled: True
+    state: present
+  register: result
+
+- name: Check intent arguments
+  vyos_interface:
+    name: eth1
+    state: up
+  register: result
+
+- assert:
+    that:
+      - "result.failed == false"
+
+- name: Check lldp neighbors intent arguments
+  vyos_interface:
+    name: eth0
+    neighbors:
+    - port: eth0
+  when: run_lldp_tests
+  register: result
+
+- assert:
+    that:
+      - "result.failed == false"
+  when: run_lldp_tests
+
+- name: Check intent arguments (failed condition)
+  vyos_interface:
+    name: eth1
+    state: down
+  ignore_errors: yes
+  register: result
+
+- assert:
+    that:
+      - "result.failed == true"
+      - "'state eq(down)' in result.failed_conditions"
+
+- name: Check lldp neighbors intent arguments (failed)
+  vyos_interface:
+    name: eth0
+    neighbors:
+    - port: dummy_port
+      host: dummy_host
+  ignore_errors: yes
+  when: run_lldp_tests
+  register: result
+
+- assert:
+    that:
+      - "result.failed == true"
+      - "'host dummy_host' in result.failed_conditions"
+      - "'port dummy_port' in result.failed_conditions"
+  when: run_lldp_tests
+
+- name: Config + intent
+  vyos_interface:
+    name: eth1
+    enabled: False
+    state: down
+  register: result
+
+- assert:
+    that:
+      - "result.failed == false"
+
+- name: Config + intent (fail)
+  vyos_interface:
+    name: eth1
+    enabled: False
+    state: up
+  ignore_errors: yes
+  register: result
+
+- assert:
+    that:
+      - "result.failed == true"
+      - "'state eq(up)' in result.failed_conditions"
+
+- name: Aggregate config + intent (pass)
+  vyos_interface:
+    aggregate:
+    - name: eth1
+      enabled: True
+      state: up
+  ignore_errors: yes
+  register: result
+
+- assert:
+    that:
+      - "result.failed == false"
+
+- name: Check lldp neighbors intent aggregate arguments
+  vyos_interface:
+    aggregate:
+    - name: eth0
+      neighbors:
+      - port: eth0
+  when: run_lldp_tests
+  register: result
+
+- assert:
+    that:
+      - "result.failed == false"
+  when: run_lldp_tests
+
+- name: Check lldp neighbors intent aggregate arguments (failed)
+  vyos_interface:
+    aggregate:
+    - name: eth0
+      neighbors:
+      - port: eth0
+      - port: dummy_port
+        host: dummy_host
+  ignore_errors: yes
+  when: run_lldp_tests
+  register: result
+
+- assert:
+    that:
+      - "result.failed == true"
+      - "'host dummy_host' in result.failed_conditions"
+      - "'port dummy_port' in result.failed_conditions"
+  when: run_lldp_tests
diff --git a/test/integration/targets/vyos_interface/vyos_interface/tests/cli/net_interface.yaml b/test/integration/targets/vyos_interface/vyos_interface/tests/cli/net_interface.yaml
new file mode 100644
index 0000000..ced273d
--- /dev/null
+++ b/test/integration/targets/vyos_interface/vyos_interface/tests/cli/net_interface.yaml
@@ -0,0 +1,56 @@
+---
+- debug: msg="START vyos cli/net_interface.yaml on connection={{ ansible_connection }}"
+
+# Add minimal testcase to check args are passed correctly to
+# implementation module and module run is successful.
+
+- name: Run vyos lsmod command
+  vyos_command:
+    commands:
+      - lsmod
+  register: lsmod_out
+
+- name: Set up - delete interface
+  net_interface:
+    name: eth1
+    state: absent
+
+- name: Create interface using platform agnostic module
+  net_interface:
+    name: eth1
+    state: present
+    description: test-interface
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"set interfaces ethernet eth1" in result.commands'
+      - '"set interfaces ethernet eth1 description ''test-interface''" in result.commands'
+
+- name: Configure interface params using platform agnostic module
+  net_interface:
+    name: eth1
+    state: present
+    description: test-interface-1
+    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: teardown - delete interface
+  net_interface:
+    name: eth1
+    state: absent
+
+- debug: msg="END vyos cli/net_interface.yaml on connection={{ ansible_connection }}"
diff --git a/test/integration/targets/vyos_l3_interface/vyos_l3_interface/aliases b/test/integration/targets/vyos_l3_interface/vyos_l3_interface/aliases
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test/integration/targets/vyos_l3_interface/vyos_l3_interface/aliases
diff --git a/test/integration/targets/vyos_l3_interface/vyos_l3_interface/defaults/main.yaml b/test/integration/targets/vyos_l3_interface/vyos_l3_interface/defaults/main.yaml
new file mode 100644
index 0000000..9ef5ba5
--- /dev/null
+++ b/test/integration/targets/vyos_l3_interface/vyos_l3_interface/defaults/main.yaml
@@ -0,0 +1,3 @@
+---
+testcase: "*"
+test_items: []
diff --git a/test/integration/targets/vyos_l3_interface/vyos_l3_interface/tasks/cli.yaml b/test/integration/targets/vyos_l3_interface/vyos_l3_interface/tasks/cli.yaml
new file mode 100644
index 0000000..890d3ac
--- /dev/null
+++ b/test/integration/targets/vyos_l3_interface/vyos_l3_interface/tasks/cli.yaml
@@ -0,0 +1,22 @@
+---
+- 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 case (connection=network_cli)
+  include: "{{ test_case_to_run }} ansible_connection=network_cli"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
+
+- name: run test case (connection=local)
+  include: "{{ test_case_to_run }} ansible_connection=local"
+  with_first_found: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
diff --git a/test/integration/targets/vyos_l3_interface/vyos_l3_interface/tasks/main.yaml b/test/integration/targets/vyos_l3_interface/vyos_l3_interface/tasks/main.yaml
new file mode 100644
index 0000000..415c99d
--- /dev/null
+++ b/test/integration/targets/vyos_l3_interface/vyos_l3_interface/tasks/main.yaml
@@ -0,0 +1,2 @@
+---
+- { include: cli.yaml, tags: ['cli'] }
diff --git a/test/integration/targets/vyos_l3_interface/vyos_l3_interface/tests/cli/basic.yaml b/test/integration/targets/vyos_l3_interface/vyos_l3_interface/tests/cli/basic.yaml
new file mode 100644
index 0000000..73feadc
--- /dev/null
+++ b/test/integration/targets/vyos_l3_interface/vyos_l3_interface/tests/cli/basic.yaml
@@ -0,0 +1,203 @@
+---
+- debug: msg="START cli/basic.yaml on connection={{ ansible_connection }}"
+
+- name: Remove IP address
+  vyos_l3_interface:
+    name: eth1
+    state: absent
+
+- name: Remove IP address
+  vyos_l3_interface:
+    name: eth2
+    state: absent
+
+- name: Set IPv4 address
+  vyos_l3_interface:
+    name: eth1
+    ipv4: 192.168.2.10/24
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"set interfaces ethernet eth1 address 192.168.2.10/24" in result.commands'
+
+- name: Set IPv4 address (idempotent)
+  vyos_l3_interface:
+    name: eth1
+    ipv4: 192.168.2.10/24
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == false'
+
+- name: Set IPv6 address
+  vyos_l3_interface:
+    name: eth1
+    ipv6: fd5d:12c9:2201:1::1/64
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"set interfaces ethernet eth1 address fd5d:12c9:2201:1::1/64" in result.commands'
+
+- name: Set IPv6 address (idempotent)
+  vyos_l3_interface:
+    name: eth1
+    ipv6: fd5d:12c9:2201:1::1/64
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == false'
+
+- name: Remove all IP addresses
+  vyos_l3_interface:
+    name: eth1
+    state: absent
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"delete interfaces ethernet eth1 address" in result.commands'
+
+- name: Remove all IP addresses again (idempotent)
+  vyos_l3_interface:
+    name: eth1
+    state: absent
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == false'
+
+- name: Set IPv4 and IPv6 address
+  vyos_l3_interface:
+    name: eth1
+    ipv4: 192.168.2.10/24
+    ipv6: fd5d:12c9:2201:1::1/64
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"set interfaces ethernet eth1 address 192.168.2.10/24" in result.commands'
+      - '"set interfaces ethernet eth1 address fd5d:12c9:2201:1::1/64" in result.commands'
+
+- name: Set IPv4 and IPv6 address again (idempotent)
+  vyos_l3_interface:
+    name: eth1
+    ipv4: 192.168.2.10/24
+    ipv6: fd5d:12c9:2201:1::1/64
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == false'
+
+- name: Remove IPv4 address
+  vyos_l3_interface:
+    name: eth1
+    ipv4: 192.168.2.10/24
+    state: absent
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"delete interfaces ethernet eth1 address 192.168.2.10/24" in result.commands'
+
+- name: Remove IPv4 address again (idempotent)
+  vyos_l3_interface:
+    name: eth1
+    ipv4: 192.168.2.10/24
+    state: absent
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == false'
+
+- name: Remove IPv6 address
+  vyos_l3_interface:
+    name: eth1
+    ipv6: fd5d:12c9:2201:1::1/64
+    state: absent
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"delete interfaces ethernet eth1 address fd5d:12c9:2201:1::1/64" in result.commands'
+
+- name: Remove IPv6 address again (idempotent)
+  vyos_l3_interface:
+    name: eth1
+    ipv6: fd5d:12c9:2201:1::1/64
+    state: absent
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == false'
+
+- name: Set IP addresses on aggregate
+  vyos_l3_interface:
+    aggregate:
+      - { name: eth1, ipv4: 192.168.2.10/24 }
+      - { name: eth2, ipv4: 192.168.3.10/24, ipv6: "fd5d:12c9:2201:1::1/64" }
+      - { name: eth2, ipv4: 192.168.4.10/24 }
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"set interfaces ethernet eth1 address 192.168.2.10/24" in result.commands'
+      - '"set interfaces ethernet eth2 address 192.168.3.10/24" in result.commands'
+      - '"set interfaces ethernet eth2 address fd5d:12c9:2201:1::1/64" in result.commands'
+      - '"set interfaces ethernet eth2 address 192.168.4.10/24" in result.commands'
+
+- name: Set IP addresses on aggregate (idempotent)
+  vyos_l3_interface:
+    aggregate:
+      - { name: eth1, ipv4: 192.168.2.10/24 }
+      - { name: eth2, ipv4: 192.168.3.10/24, ipv6: "fd5d:12c9:2201:1::1/64" }
+      - { name: eth2, ipv4: 192.168.4.10/24 }
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == false'
+
+- name: Remove IP addresses on aggregate
+  vyos_l3_interface:
+    aggregate:
+      - { name: eth1, ipv4: 192.168.2.10/24 }
+      - { name: eth2, ipv4: 192.168.3.10/24, ipv6: "fd5d:12c9:2201:1::1/64" }
+      - { name: eth2, ipv4: 192.168.4.10/24 }
+    state: absent
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"delete interfaces ethernet eth1 address 192.168.2.10/24" in result.commands'
+      - '"delete interfaces ethernet eth2 address 192.168.3.10/24" in result.commands'
+      - '"delete interfaces ethernet eth2 address fd5d:12c9:2201:1::1/64" in result.commands'
+      - '"delete interfaces ethernet eth2 address 192.168.4.10/24" in result.commands'
+
+- name: Remove IP addresses on aggregate (idempotent)
+  vyos_l3_interface:
+    aggregate:
+      - { name: eth1, ipv4: 192.168.2.10/24 }
+      - { name: eth2, ipv4: 192.168.3.10/24, ipv6: "fd5d:12c9:2201:1::1/64" }
+      - { name: eth2, ipv4: 192.168.4.10/24 }
+    state: absent
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == false'
diff --git a/test/integration/targets/vyos_linkagg/vyos_linkagg/aliases b/test/integration/targets/vyos_linkagg/vyos_linkagg/aliases
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test/integration/targets/vyos_linkagg/vyos_linkagg/aliases
diff --git a/test/integration/targets/vyos_linkagg/vyos_linkagg/defaults/main.yaml b/test/integration/targets/vyos_linkagg/vyos_linkagg/defaults/main.yaml
new file mode 100644
index 0000000..9ef5ba5
--- /dev/null
+++ b/test/integration/targets/vyos_linkagg/vyos_linkagg/defaults/main.yaml
@@ -0,0 +1,3 @@
+---
+testcase: "*"
+test_items: []
diff --git a/test/integration/targets/vyos_linkagg/vyos_linkagg/tasks/cli.yaml b/test/integration/targets/vyos_linkagg/vyos_linkagg/tasks/cli.yaml
new file mode 100644
index 0000000..890d3ac
--- /dev/null
+++ b/test/integration/targets/vyos_linkagg/vyos_linkagg/tasks/cli.yaml
@@ -0,0 +1,22 @@
+---
+- 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 case (connection=network_cli)
+  include: "{{ test_case_to_run }} ansible_connection=network_cli"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
+
+- name: run test case (connection=local)
+  include: "{{ test_case_to_run }} ansible_connection=local"
+  with_first_found: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
diff --git a/test/integration/targets/vyos_linkagg/vyos_linkagg/tasks/main.yaml b/test/integration/targets/vyos_linkagg/vyos_linkagg/tasks/main.yaml
new file mode 100644
index 0000000..415c99d
--- /dev/null
+++ b/test/integration/targets/vyos_linkagg/vyos_linkagg/tasks/main.yaml
@@ -0,0 +1,2 @@
+---
+- { include: cli.yaml, tags: ['cli'] }
diff --git a/test/integration/targets/vyos_linkagg/vyos_linkagg/tests/cli/basic.yaml b/test/integration/targets/vyos_linkagg/vyos_linkagg/tests/cli/basic.yaml
new file mode 100644
index 0000000..1a171a7
--- /dev/null
+++ b/test/integration/targets/vyos_linkagg/vyos_linkagg/tests/cli/basic.yaml
@@ -0,0 +1,184 @@
+---
+- debug: msg="cli/basic.yaml on connection={{ ansible_connection }}"
+
+- name: Remove linkagg
+  vyos_linkagg:
+    name: bond0
+    state: absent
+
+- name: Remove linkagg
+  vyos_linkagg:
+    name: bond1
+    state: absent
+
+- name: Create linkagg
+  vyos_linkagg:
+    name: bond0
+    members:
+      - eth1
+    state: present
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"set interfaces bonding bond0 mode 802.3ad" in result.commands'
+      - '"set interfaces ethernet eth1 bond-group bond0" in result.commands'
+
+- name: Create linkagg again (idempotent)
+  vyos_linkagg:
+    name: bond0
+    members:
+      - eth1
+    state: present
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == false'
+
+- name: Add linkagg member
+  vyos_linkagg:
+    name: bond0
+    members:
+      - eth2
+    state: present
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"set interfaces ethernet eth2 bond-group bond0" in result.commands'
+
+- name: Add linkagg member again (idempotent)
+  vyos_linkagg:
+    name: bond0
+    members:
+      - eth2
+    state: present
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == false'
+
+- name: Disable linkagg
+  vyos_linkagg:
+    name: bond0
+    state: down
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"set interfaces bonding bond0 disable" in result.commands'
+
+- name: Disable linkagg again (idempotent)
+  vyos_linkagg:
+    name: bond0
+    state: down
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == false'
+
+- name: Enable linkagg
+  vyos_linkagg:
+    name: bond0
+    state: up
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"delete interfaces bonding bond0 disable" in result.commands[0]'
+
+- name: Enable linkagg again (idempotent)
+  vyos_linkagg:
+    name: bond0
+    state: up
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == false'
+
+- name: Remove linkagg
+  vyos_linkagg:
+    name: bond0
+    state: absent
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"delete interfaces ethernet eth1 bond-group" in result.commands'
+      - '"delete interfaces ethernet eth2 bond-group" in result.commands'
+      - '"delete interfaces bonding bond0" in result.commands'
+
+- name: Remove linkagg again (idempotent)
+  vyos_linkagg:
+    name: bond0
+    state: absent
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == false'
+
+- name: Create collection of linkagg definitions
+  vyos_linkagg:
+    aggregate:
+        - { name: bond0, members: [eth1] }
+        - { name: bond1, members: [eth2] }
+    state: present
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"set interfaces bonding bond0 mode 802.3ad" in result.commands'
+      - '"set interfaces ethernet eth1 bond-group bond0" in result.commands'
+      - '"set interfaces bonding bond1 mode 802.3ad" in result.commands'
+      - '"set interfaces ethernet eth2 bond-group bond1" in result.commands'
+
+- name: Create collection of linkagg definitions again (idempotent)
+  vyos_linkagg:
+    aggregate:
+        - { name: bond0, members: [eth1] }
+        - { name: bond1, members: [eth2] }
+    state: present
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == false'
+
+- name: Remove collection of linkagg definitions
+  vyos_linkagg:
+    aggregate:
+      - name: bond0
+      - name: bond1
+    state: absent
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"delete interfaces ethernet eth1 bond-group" in result.commands'
+      - '"delete interfaces bonding bond0" in result.commands'
+      - '"delete interfaces ethernet eth2 bond-group" in result.commands'
+      - '"delete interfaces bonding bond1" in result.commands'
+
+- name: Remove collection of linkagg definitions again (idempotent)
+  vyos_linkagg:
+    aggregate:
+      - name: bond0
+      - name: bond1
+    state: absent
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == false'
diff --git a/test/integration/targets/vyos_linkagg/vyos_linkagg/tests/cli/net_linkagg.yaml b/test/integration/targets/vyos_linkagg/vyos_linkagg/tests/cli/net_linkagg.yaml
new file mode 100644
index 0000000..93f98e7
--- /dev/null
+++ b/test/integration/targets/vyos_linkagg/vyos_linkagg/tests/cli/net_linkagg.yaml
@@ -0,0 +1,31 @@
+---
+- debug: msg="START vyos cli/net_linkagg.yaml on connection={{ ansible_connection }}"
+
+# Add minimal testcase to check args are passed correctly to
+# implementation module and module run is successful.
+
+- name: Remove linkagg - set
+  net_linkagg:
+    name: bond0
+    state: absent
+
+- name: Create linkagg using platform agnostic module
+  net_linkagg:
+    name: bond0
+    members:
+      - eth1
+    state: present
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"set interfaces bonding bond0 mode 802.3ad" in result.commands'
+      - '"set interfaces ethernet eth1 bond-group bond0" in result.commands'
+
+- name: Remove linkagg - teardown
+  net_linkagg:
+    name: bond0
+    state: absent
+
+- debug: msg="END vyos cli/net_linkagg.yaml on connection={{ ansible_connection }}"
diff --git a/test/integration/targets/vyos_lldp/vyos_lldp/aliases b/test/integration/targets/vyos_lldp/vyos_lldp/aliases
new file mode 100644
index 0000000..539d957
--- /dev/null
+++ b/test/integration/targets/vyos_lldp/vyos_lldp/aliases
@@ -0,0 +1 @@
+shippable/network
diff --git a/test/integration/targets/vyos_lldp/vyos_lldp/defaults/main.yaml b/test/integration/targets/vyos_lldp/vyos_lldp/defaults/main.yaml
new file mode 100644
index 0000000..9ef5ba5
--- /dev/null
+++ b/test/integration/targets/vyos_lldp/vyos_lldp/defaults/main.yaml
@@ -0,0 +1,3 @@
+---
+testcase: "*"
+test_items: []
diff --git a/test/integration/targets/vyos_lldp/vyos_lldp/tasks/cli.yaml b/test/integration/targets/vyos_lldp/vyos_lldp/tasks/cli.yaml
new file mode 100644
index 0000000..890d3ac
--- /dev/null
+++ b/test/integration/targets/vyos_lldp/vyos_lldp/tasks/cli.yaml
@@ -0,0 +1,22 @@
+---
+- 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 case (connection=network_cli)
+  include: "{{ test_case_to_run }} ansible_connection=network_cli"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
+
+- name: run test case (connection=local)
+  include: "{{ test_case_to_run }} ansible_connection=local"
+  with_first_found: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
diff --git a/test/integration/targets/vyos_lldp/vyos_lldp/tasks/main.yaml b/test/integration/targets/vyos_lldp/vyos_lldp/tasks/main.yaml
new file mode 100644
index 0000000..415c99d
--- /dev/null
+++ b/test/integration/targets/vyos_lldp/vyos_lldp/tasks/main.yaml
@@ -0,0 +1,2 @@
+---
+- { include: cli.yaml, tags: ['cli'] }
diff --git a/test/integration/targets/vyos_lldp/vyos_lldp/tests/cli/basic.yaml b/test/integration/targets/vyos_lldp/vyos_lldp/tests/cli/basic.yaml
new file mode 100644
index 0000000..bc7774f
--- /dev/null
+++ b/test/integration/targets/vyos_lldp/vyos_lldp/tests/cli/basic.yaml
@@ -0,0 +1,44 @@
+---
+- debug: msg="START cli/basic.yaml on connection={{ ansible_connection }}"
+
+- name: Make sure LLDP is not running before tests
+  vyos_config:
+    lines: delete service lldp
+
+- name: Enable LLDP service
+  vyos_lldp:
+    state: present
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"set service lldp" in result.commands'
+
+- name: Enable LLDP service again (idempotent)
+  vyos_lldp:
+    state: present
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == false'
+
+- name: Disable LLDP service
+  vyos_lldp:
+    state: absent
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"delete service lldp" in result.commands'
+
+- name:
+  vyos_lldp:
+    state: absent
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == false'
diff --git a/test/integration/targets/vyos_lldp/vyos_lldp/tests/cli/net_lldp.yaml b/test/integration/targets/vyos_lldp/vyos_lldp/tests/cli/net_lldp.yaml
new file mode 100644
index 0000000..cf8f97c
--- /dev/null
+++ b/test/integration/targets/vyos_lldp/vyos_lldp/tests/cli/net_lldp.yaml
@@ -0,0 +1,25 @@
+---
+- debug: msg="START vyos cli/net_lldp.yaml on connection={{ ansible_connection }}"
+
+# Add minimal testcase to check args are passed correctly to
+# implementation module and module run is successful.
+
+- name: Make sure LLDP is not running - setup
+  vyos_config:
+    lines: delete service lldp
+
+- name: Enable LLDP service using platform agnostic module
+  net_lldp:
+    state: present
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"set service lldp" in result.commands'
+
+- name: Make sure LLDP is not running - teardown
+  vyos_config:
+    lines: delete service lldp
+
+- debug: msg="END vyos cli/net_lldp.yaml on connection={{ ansible_connection }}"
diff --git a/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/aliases b/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/aliases
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/aliases
diff --git a/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/defaults/main.yaml b/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/defaults/main.yaml
new file mode 100644
index 0000000..9ef5ba5
--- /dev/null
+++ b/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/defaults/main.yaml
@@ -0,0 +1,3 @@
+---
+testcase: "*"
+test_items: []
diff --git a/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/tasks/cli.yaml b/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/tasks/cli.yaml
new file mode 100644
index 0000000..890d3ac
--- /dev/null
+++ b/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/tasks/cli.yaml
@@ -0,0 +1,22 @@
+---
+- 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 case (connection=network_cli)
+  include: "{{ test_case_to_run }} ansible_connection=network_cli"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
+
+- name: run test case (connection=local)
+  include: "{{ test_case_to_run }} ansible_connection=local"
+  with_first_found: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
diff --git a/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/tasks/main.yaml b/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/tasks/main.yaml
new file mode 100644
index 0000000..415c99d
--- /dev/null
+++ b/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/tasks/main.yaml
@@ -0,0 +1,2 @@
+---
+- { include: cli.yaml, tags: ['cli'] }
diff --git a/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/tests/cli/basic.yaml b/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/tests/cli/basic.yaml
new file mode 100644
index 0000000..362d181
--- /dev/null
+++ b/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/tests/cli/basic.yaml
@@ -0,0 +1,167 @@
+---
+- debug: msg="START cli/basic.yaml on connection={{ ansible_connection }}"
+
+- name: Make sure LLDP is not running before tests
+  vyos_config:
+    lines: delete service lldp
+
+- name: Create LLDP configuration
+  vyos_lldp_interface:
+    name: eth1
+    state: present
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"set service lldp interface eth1" in result.commands'
+
+- name: Create LLDP configuration again (idempotent)
+  vyos_lldp_interface:
+    name: eth1
+    state: present
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == false'
+
+- name: Disable LLDP configuration
+  vyos_lldp_interface:
+    name: eth1
+    state: disabled
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"set service lldp interface eth1 disable" in result.commands'
+
+- name: Disable LLDP configuration again (idempotent)
+  vyos_lldp_interface:
+    name: eth1
+    state: disabled
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == false'
+
+- name: Enable LLDP configuration
+  vyos_lldp_interface:
+    name: eth1
+    state: enabled
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"delete service lldp interface eth1 disable" in result.commands'
+
+- name: Enable LLDP configuration again (idempotent)
+  vyos_lldp_interface:
+    name: eth1
+    state: enabled
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == false'
+
+- name: Delete LLDP configuration
+  vyos_lldp_interface:
+    name: eth1
+    state: absent
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"delete service lldp interface eth1" in result.commands'
+
+- name: Delete LLDP configuration again (idempotent)
+  vyos_lldp_interface:
+    name: eth1
+    state: absent
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == false'
+
+- name: Create aggregate of LLDP interface configurations
+  vyos_lldp_interface:
+    aggregate:
+    - name: eth1
+    - name: eth2
+    state: present
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"set service lldp interface eth1" in result.commands'
+      - '"set service lldp interface eth2" in result.commands'
+
+- name: Create aggregate of LLDP interface configurations again (idempotent)
+  vyos_lldp_interface:
+    aggregate:
+    - name: eth1
+    - name: eth2
+    state: present
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == false'
+
+- name: Override LLDP interface configuration on aggregate
+  vyos_lldp_interface:
+    aggregate:
+    - name: eth1
+    - { name: eth2, state: disabled }
+    state: present
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"set service lldp interface eth2 disable" in result.commands'
+
+- name: Override LLDP interface configuration on aggregate again (idempotent)
+  vyos_lldp_interface:
+    aggregate:
+    - name: eth1
+    - { name: eth2, state: disabled }
+    state: present
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == false'
+
+- name: Delete aggregate of LLDP interface configurations
+  vyos_lldp_interface:
+    aggregate:
+    - name: eth1
+    - name: eth2
+    state: absent
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"delete service lldp interface eth1" in result.commands'
+      - '"delete service lldp interface eth2" in result.commands'
+
+- name: Delete aggregate of LLDP interface configurations (idempotent)
+  vyos_lldp_interface:
+    aggregate:
+    - name: eth1
+    - name: eth2
+    state: absent
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == false'
diff --git a/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/tests/cli/net_lldp_interface.yaml b/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/tests/cli/net_lldp_interface.yaml
new file mode 100644
index 0000000..49cd8b0
--- /dev/null
+++ b/test/integration/targets/vyos_lldp_interface/vyos_lldp_interface/tests/cli/net_lldp_interface.yaml
@@ -0,0 +1,26 @@
+---
+- debug: msg="START vyos cli/net_lldp_interface.yaml on connection={{ ansible_connection }}"
+
+# Add minimal testcase to check args are passed correctly to
+# implementation module and module run is successful.
+
+- name: Make sure LLDP is not running - setup
+  vyos_config:
+    lines: delete service lldp
+
+- name: Create LLDP configuration using platform agnostic module
+  net_lldp_interface:
+    name: eth1
+    state: present
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"set service lldp interface eth1" in result.commands'
+
+- name: Make sure LLDP is not running - teardown
+  vyos_config:
+    lines: delete service lldp
+
+- debug: msg="END vyos cli/net_lldp_interface.yaml on connection={{ ansible_connection }}"
diff --git a/test/integration/targets/vyos_logging/vyos_logging/aliases b/test/integration/targets/vyos_logging/vyos_logging/aliases
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test/integration/targets/vyos_logging/vyos_logging/aliases
diff --git a/test/integration/targets/vyos_logging/vyos_logging/defaults/main.yaml b/test/integration/targets/vyos_logging/vyos_logging/defaults/main.yaml
new file mode 100644
index 0000000..9ef5ba5
--- /dev/null
+++ b/test/integration/targets/vyos_logging/vyos_logging/defaults/main.yaml
@@ -0,0 +1,3 @@
+---
+testcase: "*"
+test_items: []
diff --git a/test/integration/targets/vyos_logging/vyos_logging/tasks/cli.yaml b/test/integration/targets/vyos_logging/vyos_logging/tasks/cli.yaml
new file mode 100644
index 0000000..890d3ac
--- /dev/null
+++ b/test/integration/targets/vyos_logging/vyos_logging/tasks/cli.yaml
@@ -0,0 +1,22 @@
+---
+- 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 case (connection=network_cli)
+  include: "{{ test_case_to_run }} ansible_connection=network_cli"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
+
+- name: run test case (connection=local)
+  include: "{{ test_case_to_run }} ansible_connection=local"
+  with_first_found: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
diff --git a/test/integration/targets/vyos_logging/vyos_logging/tasks/main.yaml b/test/integration/targets/vyos_logging/vyos_logging/tasks/main.yaml
new file mode 100644
index 0000000..415c99d
--- /dev/null
+++ b/test/integration/targets/vyos_logging/vyos_logging/tasks/main.yaml
@@ -0,0 +1,2 @@
+---
+- { include: cli.yaml, tags: ['cli'] }
diff --git a/test/integration/targets/vyos_logging/vyos_logging/tests/cli/basic.yaml b/test/integration/targets/vyos_logging/vyos_logging/tests/cli/basic.yaml
new file mode 100644
index 0000000..6b13334
--- /dev/null
+++ b/test/integration/targets/vyos_logging/vyos_logging/tests/cli/basic.yaml
@@ -0,0 +1,126 @@
+---
+- debug: msg="START cli/basic.yaml on connection={{ ansible_connection }}"
+
+- name: set-up logging
+  vyos_logging:
+    dest: console
+    facility: all
+    level: info
+    state: present
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"set system syslog console facility all level info" in result.commands'
+
+- name: set-up logging again (idempotent)
+  vyos_logging:
+    dest: console
+    facility: all
+    level: info
+    state: present
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == false'
+
+- name: file logging
+  vyos_logging:
+    dest: file
+    name: test
+    facility: all
+    level: notice
+    state: present
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"set system syslog file test facility all level notice" in result.commands'
+
+- name: file logging again (idempotent)
+  vyos_logging:
+    dest: file
+    name: test
+    facility: all
+    level: notice
+    state: present
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == false'
+
+- name: delete logging
+  vyos_logging:
+    dest: file
+    name: test
+    facility: all
+    level: notice
+    state: absent
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"delete system syslog file test facility all level notice" in result.commands'
+
+- name: delete logging again (idempotent)
+  vyos_logging:
+    dest: file
+    name: test
+    facility: all
+    level: notice
+    state: absent
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == false'
+
+- name: Add logging collections
+  vyos_logging:
+    aggregate:
+      - { dest: file, name: test1, facility: all, level: info }
+      - { dest: file, name: test2, facility: news, level: debug }
+    state: present
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"set system syslog file test1 facility all level info" in result.commands'
+      - '"set system syslog file test2 facility news level debug" in result.commands'
+
+- name: Add and remove logging collections with overrides
+  vyos_logging:
+    aggregate:
+      - { dest: console, facility: all, level: info }
+      - { dest: file, name: test1, facility: all, level: info, state: absent }
+      - { dest: console, facility: daemon, level: warning }
+    state: present
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"delete system syslog file test1 facility all level info" in result.commands'
+      - '"set system syslog console facility daemon level warning" in result.commands'
+
+- name: Remove logging collections
+  vyos_logging:
+    aggregate:
+      - { dest: console, facility: all, level: info }
+      - { dest: console, facility: daemon, level: warning }
+      - { dest: file, name: test2, facility: news, level: debug }
+    state: absent
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"delete system syslog console facility all level info" in result.commands'
+      - '"delete system syslog console facility daemon level warning" in result.commands'
+      - '"delete system syslog file test2 facility news level debug" in result.commands'
diff --git a/test/integration/targets/vyos_logging/vyos_logging/tests/cli/net_logging.yaml b/test/integration/targets/vyos_logging/vyos_logging/tests/cli/net_logging.yaml
new file mode 100644
index 0000000..7c62d72
--- /dev/null
+++ b/test/integration/targets/vyos_logging/vyos_logging/tests/cli/net_logging.yaml
@@ -0,0 +1,39 @@
+---
+- debug: msg="START vyos cli/net_logging.yaml on connection={{ ansible_connection }}"
+
+# Add minimal testcase to check args are passed correctly to
+# implementation module and module run is successful.
+
+- name: delete logging - setup
+  net_logging:
+    dest: file
+    name: test
+    facility: all
+    level: notice
+    state: absent
+  register: result
+
+- name: file logging using platform agnostic module
+  net_logging:
+    dest: file
+    name: test
+    facility: all
+    level: notice
+    state: present
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"set system syslog file test facility all level notice" in result.commands'
+
+- name: delete logging - teardown
+  net_logging:
+    dest: file
+    name: test
+    facility: all
+    level: notice
+    state: absent
+  register: result
+
+- debug: msg="END vyos cli/net_logging.yaml on connection={{ ansible_connection }}"
diff --git a/test/integration/targets/vyos_smoke/vyos_smoke/defaults/main.yaml b/test/integration/targets/vyos_smoke/vyos_smoke/defaults/main.yaml
new file mode 100644
index 0000000..9ef5ba5
--- /dev/null
+++ b/test/integration/targets/vyos_smoke/vyos_smoke/defaults/main.yaml
@@ -0,0 +1,3 @@
+---
+testcase: "*"
+test_items: []
diff --git a/test/integration/targets/vyos_smoke/vyos_smoke/tasks/cli.yaml b/test/integration/targets/vyos_smoke/vyos_smoke/tasks/cli.yaml
new file mode 100644
index 0000000..890d3ac
--- /dev/null
+++ b/test/integration/targets/vyos_smoke/vyos_smoke/tasks/cli.yaml
@@ -0,0 +1,22 @@
+---
+- 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 case (connection=network_cli)
+  include: "{{ test_case_to_run }} ansible_connection=network_cli"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
+
+- name: run test case (connection=local)
+  include: "{{ test_case_to_run }} ansible_connection=local"
+  with_first_found: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
diff --git a/test/integration/targets/vyos_smoke/vyos_smoke/tasks/main.yaml b/test/integration/targets/vyos_smoke/vyos_smoke/tasks/main.yaml
new file mode 100644
index 0000000..415c99d
--- /dev/null
+++ b/test/integration/targets/vyos_smoke/vyos_smoke/tasks/main.yaml
@@ -0,0 +1,2 @@
+---
+- { include: cli.yaml, tags: ['cli'] }
diff --git a/test/integration/targets/vyos_smoke/vyos_smoke/tests/cli/common_config.yaml b/test/integration/targets/vyos_smoke/vyos_smoke/tests/cli/common_config.yaml
new file mode 100644
index 0000000..bad66f5
--- /dev/null
+++ b/test/integration/targets/vyos_smoke/vyos_smoke/tests/cli/common_config.yaml
@@ -0,0 +1,10 @@
+# vyos.py in plugins and module_utils/network covered by these as well
+# hit NetworkConfig
+- name: configure simple config command
+  vyos_config:
+    lines: set system host-name smoke
+
+- name: return host name to inventory_hostname
+  vyos_config:
+    lines: set system host-name {{ inventory_hostname_short }}
+    match: none
diff --git a/test/integration/targets/vyos_smoke/vyos_smoke/tests/cli/common_utils.yaml b/test/integration/targets/vyos_smoke/vyos_smoke/tests/cli/common_utils.yaml
new file mode 100644
index 0000000..7dfbb41
--- /dev/null
+++ b/test/integration/targets/vyos_smoke/vyos_smoke/tests/cli/common_utils.yaml
@@ -0,0 +1,49 @@
+# vyos.py in plugins and module_utils/network covered by these as well
+# remove_default_spec() hit by multiple plays
+
+# hit ComplexList
+- name: get output for single command
+  vyos_command:
+    commands:
+      - show version
+  register: result
+
+- assert:
+    that:
+      - result.changed == false
+      - result.stdout is defined
+      - result.stdout_lines is defined
+
+# hit conditional() - used for declarative intent
+# Note, this can't be run on AWS because fully testing the vyos_interface dependencies
+# requires the ability to create and remove interfaces other than eth0
+- name: enable eth1
+  vyos_interface:
+    name: eth1
+    enabled: True
+    state: present
+  register: result
+
+- name: Check intent arguments
+  vyos_interface:
+    name: eth1
+    state: up
+  register: result
+
+- name: Check intent arguments (failed condition)
+  vyos_interface:
+    name: eth1
+    state: down
+  ignore_errors: yes
+  register: result
+
+- assert:
+    that:
+      - "result.failed == true"
+      - "'state eq(down)' in result.failed_conditions"
+
+- name: Config + intent
+  vyos_interface:
+    name: eth1
+    enabled: False
+    state: down
diff --git a/test/integration/targets/vyos_smoke/vyos_smoke/tests/cli/misc_tests.yaml b/test/integration/targets/vyos_smoke/vyos_smoke/tests/cli/misc_tests.yaml
new file mode 100644
index 0000000..a56d057
--- /dev/null
+++ b/test/integration/targets/vyos_smoke/vyos_smoke/tests/cli/misc_tests.yaml
@@ -0,0 +1,13 @@
+# hit check conditional in module_utils.network.vyos -> load_config()
+- name: configure simple config command
+  vyos_config:
+    lines: set system host-name check-test
+  check_mode: yes
+
+- name: get host name
+  vyos_command:
+    commands: show host name
+  register: result
+
+- assert:
+    that: '"check-test" not in result.stdout'
diff --git a/test/integration/targets/vyos_static_route/vyos_static_route/aliases b/test/integration/targets/vyos_static_route/vyos_static_route/aliases
new file mode 100644
index 0000000..539d957
--- /dev/null
+++ b/test/integration/targets/vyos_static_route/vyos_static_route/aliases
@@ -0,0 +1 @@
+shippable/network
diff --git a/test/integration/targets/vyos_static_route/vyos_static_route/defaults/main.yaml b/test/integration/targets/vyos_static_route/vyos_static_route/defaults/main.yaml
new file mode 100644
index 0000000..9ef5ba5
--- /dev/null
+++ b/test/integration/targets/vyos_static_route/vyos_static_route/defaults/main.yaml
@@ -0,0 +1,3 @@
+---
+testcase: "*"
+test_items: []
diff --git a/test/integration/targets/vyos_static_route/vyos_static_route/tasks/cli.yaml b/test/integration/targets/vyos_static_route/vyos_static_route/tasks/cli.yaml
new file mode 100644
index 0000000..890d3ac
--- /dev/null
+++ b/test/integration/targets/vyos_static_route/vyos_static_route/tasks/cli.yaml
@@ -0,0 +1,22 @@
+---
+- 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 case (connection=network_cli)
+  include: "{{ test_case_to_run }} ansible_connection=network_cli"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
+
+- name: run test case (connection=local)
+  include: "{{ test_case_to_run }} ansible_connection=local"
+  with_first_found: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
diff --git a/test/integration/targets/vyos_static_route/vyos_static_route/tasks/main.yaml b/test/integration/targets/vyos_static_route/vyos_static_route/tasks/main.yaml
new file mode 100644
index 0000000..415c99d
--- /dev/null
+++ b/test/integration/targets/vyos_static_route/vyos_static_route/tasks/main.yaml
@@ -0,0 +1,2 @@
+---
+- { include: cli.yaml, tags: ['cli'] }
diff --git a/test/integration/targets/vyos_static_route/vyos_static_route/tests/cli/basic.yaml b/test/integration/targets/vyos_static_route/vyos_static_route/tests/cli/basic.yaml
new file mode 100644
index 0000000..f8fa87d
--- /dev/null
+++ b/test/integration/targets/vyos_static_route/vyos_static_route/tests/cli/basic.yaml
@@ -0,0 +1,120 @@
+---
+- debug: msg="START cli/basic.yaml on connection={{ ansible_connection }}"
+
+- name: create static route
+  vyos_static_route:
+    prefix: 172.24.0.0/24
+    next_hop: 192.168.42.64
+    state: present
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"set protocols static route 172.24.0.0/24 next-hop 192.168.42.64" in result.commands'
+
+- name: create static route again (idempotent)
+  vyos_static_route:
+    prefix: 172.24.0.0
+    mask: 24
+    next_hop: 192.168.42.64
+    state: present
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == false'
+
+- name: modify admin distance of static route
+  vyos_static_route:
+    prefix: 172.24.0.0/24
+    next_hop: 192.168.42.64
+    admin_distance: 1
+    state: present
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"set protocols static route 172.24.0.0/24 next-hop 192.168.42.64 distance 1" in result.commands'
+
+- name: modify admin distance of static route again (idempotent)
+  vyos_static_route:
+    prefix: 172.24.0.0
+    mask: 24
+    next_hop: 192.168.42.64
+    admin_distance: 1
+    state: present
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == false'
+
+- name: delete static route
+  vyos_static_route:
+    prefix: 172.24.0.0/24
+    next_hop: 192.168.42.64
+    admin_distance: 1
+    state: absent
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"delete protocols static route 172.24.0.0/24" in result.commands'
+
+- name: delete static route again (idempotent)
+  vyos_static_route:
+    prefix: 172.24.0.0/24
+    next_hop: 192.168.42.64
+    admin_distance: 1
+    state: absent
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == false'
+
+- name: Add static route collections
+  vyos_static_route:
+    aggregate:
+      - { prefix: 172.24.1.0/24, next_hop: 192.168.42.64 }
+      - { prefix: 172.24.2.0, mask: 24, next_hop: 192.168.42.64 }
+    state: present
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"set protocols static route 172.24.1.0/24 next-hop 192.168.42.64" in result.commands'
+      - '"set protocols static route 172.24.2.0/24 next-hop 192.168.42.64" in result.commands'
+
+- name: Add and remove static route collections with overrides
+  vyos_static_route:
+    aggregate:
+      - { prefix: 172.24.1.0/24, next_hop: 192.168.42.64 }
+      - { prefix: 172.24.2.0/24, next_hop: 192.168.42.64, state: absent }
+      - { prefix: 172.24.3.0/24, next_hop: 192.168.42.64 }
+    state: present
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"delete protocols static route 172.24.2.0/24" in result.commands'
+      - '"set protocols static route 172.24.3.0/24 next-hop 192.168.42.64" in result.commands'
+
+- name: Remove static route collections
+  vyos_static_route:
+    aggregate:
+      - { prefix: 172.24.1.0/24, next_hop: 192.168.42.64 }
+      - { prefix: 172.24.3.0/24, next_hop: 192.168.42.64 }
+    state: absent
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"delete protocols static route 172.24.1.0/24" in result.commands'
+      - '"delete protocols static route 172.24.3.0/24" in result.commands'
diff --git a/test/integration/targets/vyos_static_route/vyos_static_route/tests/cli/net_static_route.yaml b/test/integration/targets/vyos_static_route/vyos_static_route/tests/cli/net_static_route.yaml
new file mode 100644
index 0000000..e2529eb
--- /dev/null
+++ b/test/integration/targets/vyos_static_route/vyos_static_route/tests/cli/net_static_route.yaml
@@ -0,0 +1,33 @@
+---
+- debug: msg="START vyos cli/net_static_route.yaml on connection={{ ansible_connection }}"
+
+# Add minimal testcase to check args are passed correctly to
+# implementation module and module run is successful.
+
+- name: delete static route - setup
+  net_static_route:
+    prefix: 172.24.0.0/24
+    next_hop: 192.168.42.64
+    state: absent
+  register: result
+
+- name: create static route using platform agnostic module
+  net_static_route:
+    prefix: 172.24.0.0/24
+    next_hop: 192.168.42.64
+    state: present
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"set protocols static route 172.24.0.0/24 next-hop 192.168.42.64" in result.commands'
+
+- name: delete static route - teardown
+  net_static_route:
+    prefix: 172.24.0.0/24
+    next_hop: 192.168.42.64
+    state: absent
+  register: result
+
+- debug: msg="END vyos cli/net_static_route.yaml on connection={{ ansible_connection }}"
diff --git a/test/integration/targets/vyos_system/vyos_system/defaults/main.yaml b/test/integration/targets/vyos_system/vyos_system/defaults/main.yaml
new file mode 100644
index 0000000..9ef5ba5
--- /dev/null
+++ b/test/integration/targets/vyos_system/vyos_system/defaults/main.yaml
@@ -0,0 +1,3 @@
+---
+testcase: "*"
+test_items: []
diff --git a/test/integration/targets/vyos_system/vyos_system/tasks/cli.yaml b/test/integration/targets/vyos_system/vyos_system/tasks/cli.yaml
new file mode 100644
index 0000000..890d3ac
--- /dev/null
+++ b/test/integration/targets/vyos_system/vyos_system/tasks/cli.yaml
@@ -0,0 +1,22 @@
+---
+- 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 case (connection=network_cli)
+  include: "{{ test_case_to_run }} ansible_connection=network_cli"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
+
+- name: run test case (connection=local)
+  include: "{{ test_case_to_run }} ansible_connection=local"
+  with_first_found: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
diff --git a/test/integration/targets/vyos_system/vyos_system/tasks/main.yaml b/test/integration/targets/vyos_system/vyos_system/tasks/main.yaml
new file mode 100644
index 0000000..415c99d
--- /dev/null
+++ b/test/integration/targets/vyos_system/vyos_system/tasks/main.yaml
@@ -0,0 +1,2 @@
+---
+- { include: cli.yaml, tags: ['cli'] }
diff --git a/test/integration/targets/vyos_system/vyos_system/tests/cli/basic.yaml b/test/integration/targets/vyos_system/vyos_system/tests/cli/basic.yaml
new file mode 100644
index 0000000..c42edde
--- /dev/null
+++ b/test/integration/targets/vyos_system/vyos_system/tests/cli/basic.yaml
@@ -0,0 +1,61 @@
+---
+- debug: msg="START cli/basic.yaml on connection={{ ansible_connection }}"
+
+- name: setup
+  vyos_config:
+    lines:
+      - delete system name-server 192.0.2.1
+      - delete system name-server 192.0.2.2
+      - delete system name-server 192.0.2.3
+    match: none
+
+- name: configure name servers
+  vyos_system:
+    name_servers:
+      - 192.0.2.1
+      - 192.0.2.2
+      - 192.0.2.3
+  register: result
+
+- assert:
+    that:
+      - result.changed == true
+      - result.commands|length == 3
+      - result.commands[0]  is search("set system name-server '192.0.2.1'")
+      - result.commands[1]  is search("set system name-server '192.0.2.2'")
+      - result.commands[2]  is search("set system name-server '192.0.2.3'")
+
+- name: verify name_servers
+  vyos_system:
+    name_servers:
+      - 192.0.2.1
+      - 192.0.2.2
+      - 192.0.2.3
+  register: result
+
+- assert:
+    that:
+      - result.changed == false
+
+- name: remove one
+  vyos_system:
+    name_servers:
+      - 192.0.2.3
+    state: absent
+  register: result
+
+- assert:
+    that:
+      - result.changed == true
+      - result.commands|length == 1
+      - result.commands[0]  is search("delete system name-server '192.0.2.3'")
+
+- name: teardown
+  vyos_config:
+    lines:
+      - delete system name-server name-server 192.0.2.1
+      - delete system name-server name-server 192.0.2.2
+      - delete system name-server name-server 192.0.2.3
+    match: none
+
+- debug: msg="END cli/basic.yaml on connection={{ ansible_connection }}"
diff --git a/test/integration/targets/vyos_system/vyos_system/tests/cli/net_system.yaml b/test/integration/targets/vyos_system/vyos_system/tests/cli/net_system.yaml
new file mode 100644
index 0000000..b7813c0
--- /dev/null
+++ b/test/integration/targets/vyos_system/vyos_system/tests/cli/net_system.yaml
@@ -0,0 +1,30 @@
+---
+- debug: msg="START vyos cli/net_system.yaml on connection={{ ansible_connection }}"
+
+# Add minimal testcase to check args are passed correctly to
+# implementation module and module run is successful.
+
+- name: setup
+  vyos_config:
+    lines:
+      - delete system name-server 192.0.2.1
+    match: none
+
+- name: configure name servers using platform agnostic module
+  net_system:
+    name_servers:
+      - 192.0.2.1
+  register: result
+
+- assert:
+    that:
+      - result.changed == true
+      - result.commands[0]  is search("set system name-server '192.0.2.1'")
+
+- name: setup
+  vyos_config:
+    lines:
+      - delete system name-server 192.0.2.1
+    match: none
+
+- debug: msg="END vyos cli/net_system.yaml on connection={{ ansible_connection }}"
diff --git a/test/integration/targets/vyos_user/vyos_user/aliases b/test/integration/targets/vyos_user/vyos_user/aliases
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test/integration/targets/vyos_user/vyos_user/aliases
diff --git a/test/integration/targets/vyos_user/vyos_user/defaults/main.yaml b/test/integration/targets/vyos_user/vyos_user/defaults/main.yaml
new file mode 100644
index 0000000..9ef5ba5
--- /dev/null
+++ b/test/integration/targets/vyos_user/vyos_user/defaults/main.yaml
@@ -0,0 +1,3 @@
+---
+testcase: "*"
+test_items: []
diff --git a/test/integration/targets/vyos_user/vyos_user/tasks/cli.yaml b/test/integration/targets/vyos_user/vyos_user/tasks/cli.yaml
new file mode 100644
index 0000000..890d3ac
--- /dev/null
+++ b/test/integration/targets/vyos_user/vyos_user/tasks/cli.yaml
@@ -0,0 +1,22 @@
+---
+- 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 case (connection=network_cli)
+  include: "{{ test_case_to_run }} ansible_connection=network_cli"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
+
+- name: run test case (connection=local)
+  include: "{{ test_case_to_run }} ansible_connection=local"
+  with_first_found: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
diff --git a/test/integration/targets/vyos_user/vyos_user/tasks/main.yaml b/test/integration/targets/vyos_user/vyos_user/tasks/main.yaml
new file mode 100644
index 0000000..415c99d
--- /dev/null
+++ b/test/integration/targets/vyos_user/vyos_user/tasks/main.yaml
@@ -0,0 +1,2 @@
+---
+- { include: cli.yaml, tags: ['cli'] }
diff --git a/test/integration/targets/vyos_user/vyos_user/tests/cli/auth.yaml b/test/integration/targets/vyos_user/vyos_user/tests/cli/auth.yaml
new file mode 100644
index 0000000..ff14bd7
--- /dev/null
+++ b/test/integration/targets/vyos_user/vyos_user/tests/cli/auth.yaml
@@ -0,0 +1,34 @@
+---
+- block:
+  - name: Create user with password
+    vyos_user:
+      name: auth_user
+      role: admin
+      state: present
+      configured_password: pass123
+
+  - name: test login via ssh with new user
+    expect:
+      command: "ssh auth_user@{{ ansible_ssh_host }} -p {{ ansible_port | default(22) }} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no '/opt/vyatta/sbin/vyatta-cfg-cmd-wrapper show version'"
+      responses:
+        (?i)password: "pass123"
+
+  - name: test login via ssh with invalid password (should fail)
+    expect:
+      command: "ssh auth_user@{{ ansible_ssh_host }} -p {{ ansible_port | default(22) }} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no '/opt/vyatta/sbin/vyatta-cfg-cmd-wrapper show version'"
+      responses:
+        (?i)password: "badpass"
+    ignore_errors: yes
+    register: results
+
+  - name: check that attempt failed
+    assert:
+      that:
+        - results.failed
+
+  always:
+  - name: delete user
+    vyos_user:
+      name: auth_user
+      state: absent
+    register: result
diff --git a/test/integration/targets/vyos_user/vyos_user/tests/cli/basic.yaml b/test/integration/targets/vyos_user/vyos_user/tests/cli/basic.yaml
new file mode 100644
index 0000000..346ecda
--- /dev/null
+++ b/test/integration/targets/vyos_user/vyos_user/tests/cli/basic.yaml
@@ -0,0 +1,77 @@
+---
+- debug: msg="START cli/basic.yaml on connection={{ ansible_connection }}"
+
+- name: Setup
+  vyos_config:
+    lines:
+      - delete system login user ansibletest1
+      - delete system login user ansibletest2
+      - delete system login user ansibletest3
+
+- name: Create user
+  vyos_user:
+    name: ansibletest1
+    configured_password: test
+    state: present
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"set system login user" in result.commands[0]'
+      - '"authentication plaintext-password" in result.commands[0]'
+
+- name: Collection of users (SetUp)
+  vyos_user:
+    aggregate:
+      - name: ansibletest2
+      - name: ansibletest3
+    level: operator
+    state: present
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - 'result.commands == ["set system login user ansibletest2 level operator", "set system login user ansibletest3 level operator"]'
+
+- name: Add user again (Idempotent)
+  vyos_user:
+    name: ansibletest1
+    configured_password: test
+    state: present
+    update_password: on_create
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == false'
+      - 'result.commands | length == 0'
+
+- name: Add collection of users (Idempotent)
+  vyos_user:
+    aggregate:
+      - name: ansibletest2
+      - name: ansibletest3
+    level: operator
+    state: present
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == false'
+      - 'result.commands | length == 0'
+
+- name: tearDown
+  vyos_user:
+    users:
+      - name: ansibletest1
+      - name: ansibletest2
+      - name: ansibletest3
+    state: absent
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - 'result.commands == ["delete system login user ansibletest1", "delete system login user ansibletest2", "delete system login user ansibletest3"]'
diff --git a/test/integration/targets/vyos_vlan/vyos_vlan/aliases b/test/integration/targets/vyos_vlan/vyos_vlan/aliases
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test/integration/targets/vyos_vlan/vyos_vlan/aliases
diff --git a/test/integration/targets/vyos_vlan/vyos_vlan/defaults/main.yaml b/test/integration/targets/vyos_vlan/vyos_vlan/defaults/main.yaml
new file mode 100644
index 0000000..9ef5ba5
--- /dev/null
+++ b/test/integration/targets/vyos_vlan/vyos_vlan/defaults/main.yaml
@@ -0,0 +1,3 @@
+---
+testcase: "*"
+test_items: []
diff --git a/test/integration/targets/vyos_vlan/vyos_vlan/tasks/cli.yaml b/test/integration/targets/vyos_vlan/vyos_vlan/tasks/cli.yaml
new file mode 100644
index 0000000..890d3ac
--- /dev/null
+++ b/test/integration/targets/vyos_vlan/vyos_vlan/tasks/cli.yaml
@@ -0,0 +1,22 @@
+---
+- 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 case (connection=network_cli)
+  include: "{{ test_case_to_run }} ansible_connection=network_cli"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
+
+- name: run test case (connection=local)
+  include: "{{ test_case_to_run }} ansible_connection=local"
+  with_first_found: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
diff --git a/test/integration/targets/vyos_vlan/vyos_vlan/tasks/main.yaml b/test/integration/targets/vyos_vlan/vyos_vlan/tasks/main.yaml
new file mode 100644
index 0000000..415c99d
--- /dev/null
+++ b/test/integration/targets/vyos_vlan/vyos_vlan/tasks/main.yaml
@@ -0,0 +1,2 @@
+---
+- { include: cli.yaml, tags: ['cli'] }
diff --git a/test/integration/targets/vyos_vlan/vyos_vlan/tests/cli/basic.yaml b/test/integration/targets/vyos_vlan/vyos_vlan/tests/cli/basic.yaml
new file mode 100644
index 0000000..a47f6b9
--- /dev/null
+++ b/test/integration/targets/vyos_vlan/vyos_vlan/tests/cli/basic.yaml
@@ -0,0 +1,101 @@
+---
+- debug: msg="START cli/basic.yaml on connection={{ ansible_connection }}"
+
+- name: setup - remove vlan used in test
+  vyos_config:
+    lines:
+      - delete interfaces ethernet eth1 vif 100
+      - delete interfaces ethernet eth0 vif 5
+      - delete interfaces ethernet eth0 vif 100
+      - delete interfaces ethernet eth0 vif 101
+      - delete interfaces ethernet eth1 vif 201
+
+- name: set vlan with name
+  vyos_vlan: &name
+    vlan_id: 100
+    name: vlan-100
+    interfaces: eth1
+  register: result
+
+- assert:
+    that:
+      - "result.changed == true"
+      - "'set interfaces ethernet eth1 vif 100 description vlan-100' in result.commands"
+
+- name: set vlan with name(idempotence)
+  vyos_vlan: *name
+  register: result
+
+- assert:
+    that:
+      - "result.changed == false"
+
+- name: set vlan with address
+  vyos_vlan: &address
+    vlan_id: 5
+    address: 192.168.5.12/24
+    interfaces: eth0
+  register: result
+
+- assert:
+    that:
+      - "result.changed == true"
+      - "'set interfaces ethernet eth0 vif 5 address 192.168.5.12/24' in result.commands"
+
+- name: set vlan with address(idempotence)
+  vyos_vlan: *address
+  register: result
+
+- assert:
+    that:
+      - "result.changed == false"
+
+- name: delete
+  vyos_vlan: &delete
+    vlan_id: 100
+    interfaces: eth1
+    state: absent
+  register: result
+
+- assert:
+    that:
+      - "result.changed == true"
+      - "'delete interfaces ethernet eth1 vif 100' in result.commands"
+
+- name: delete(idempotence)
+  vyos_vlan: *delete
+  register: result
+
+- assert:
+    that:
+      - "result.changed == false"
+
+- name: Create VLANs using aggregate
+  vyos_vlan: &agg_vlan
+    aggregate:
+      - { vlan_id: 101, name: voice, interfaces: "eth0" }
+      - { vlan_id: 201, name: mgm, interfaces: "eth1" }
+    state: present
+  register: result
+
+- assert:
+    that:
+      - "result.changed == true"
+      - "'set interfaces ethernet eth0 vif 101 description voice' in result.commands"
+      - "'set interfaces ethernet eth1 vif 201 description mgm' in result.commands"
+
+- name: Create VLANs using aggregate (idempotent)
+  vyos_vlan: *agg_vlan
+  register: result
+
+- assert:
+    that:
+      - "result.changed == false"
+
+- name: teardown
+  vyos_config:
+    lines:
+      - delete interfaces ethernet eth1 vif 100
+      - delete interfaces ethernet eth0 vif 5
+      - delete interfaces ethernet eth0 vif 101
+      - delete interfaces ethernet eth1 vif 201
diff --git a/test/integration/targets/vyos_vlan/vyos_vlan/tests/cli/intent.yaml b/test/integration/targets/vyos_vlan/vyos_vlan/tests/cli/intent.yaml
new file mode 100644
index 0000000..98c8697
--- /dev/null
+++ b/test/integration/targets/vyos_vlan/vyos_vlan/tests/cli/intent.yaml
@@ -0,0 +1,59 @@
+---
+- debug: msg="START cli/intent.yaml on connection={{ ansible_connection }}"
+
+- name: setup - remove vlan used in test
+  vyos_config: &delete
+    lines:
+      - delete interfaces ethernet eth1 vif 100
+      - delete interfaces ethernet eth0 vif 100
+
+- name: set vlan with name
+  vyos_vlan:
+    vlan_id: 100
+    name: vlan-100
+    interfaces: eth1
+  register: result
+
+- assert:
+    that:
+      - "result.changed == true"
+      - "'set interfaces ethernet eth1 vif 100 description vlan-100' in result.commands"
+
+- name: check vlan interface intent
+  vyos_vlan:
+    vlan_id: 100
+    name: vlan-100
+    associated_interfaces: eth1
+  register: result
+
+- assert:
+    that:
+      - "result.failed == false"
+
+- name: vlan interface config + intent
+  vyos_vlan:
+    vlan_id: 100
+    interfaces: eth0
+    associated_interfaces:
+    - eth0
+    - eth1
+  register: result
+
+- assert:
+    that:
+      - "result.failed == false"
+
+- name: vlan intent fail
+  vyos_vlan:
+    vlan_id: 100
+    associated_interfaces:
+    - eth3
+    - eth4
+  register: result
+  ignore_errors: yes
+
+- assert:
+    that:
+      - "result.failed == True"
+
+- debug: msg="End cli/intent.yaml on connection={{ ansible_connection }}"
diff --git a/test/integration/targets/vyos_vlan/vyos_vlan/tests/cli/multiple.yaml b/test/integration/targets/vyos_vlan/vyos_vlan/tests/cli/multiple.yaml
new file mode 100644
index 0000000..25bc1af
--- /dev/null
+++ b/test/integration/targets/vyos_vlan/vyos_vlan/tests/cli/multiple.yaml
@@ -0,0 +1,60 @@
+---
+- debug: msg="START cli/multiple.yaml on connection={{ ansible_connection }}"
+
+- name: setup - remove vlan used in test
+  vyos_config:
+    lines:
+      - delete interfaces ethernet eth0 vif 5
+      - delete interfaces ethernet eth0 vif 100
+      - delete interfaces ethernet eth1 vif 100
+
+- name: Add multiple interfaces to vlan
+  vyos_vlan: &multiple
+    vlan_id: 100
+    interfaces:
+      - eth0
+      - eth1
+  register: result
+
+- assert:
+    that:
+      - "result.changed == true"
+      - "'set interfaces ethernet eth0 vif 100' in result.commands"
+      - "'set interfaces ethernet eth1 vif 100' in result.commands"
+
+- name: Add multiple interfaces to vlan(idempotence)
+  vyos_vlan: *multiple
+  register: result
+
+- assert:
+    that:
+      - "result.changed == false"
+
+- name: delete vlan with multiple interfaces
+  vyos_vlan: &delete_multiple
+    vlan_id: 100
+    interfaces:
+      - eth0
+      - eth1
+    state: absent
+  register: result
+
+- assert:
+    that:
+      - "result.changed == true"
+      - "'delete interfaces ethernet eth0 vif 100' in result.commands"
+      - "'delete interfaces ethernet eth1 vif 100' in result.commands"
+
+- name: delete vlan with multiple interfaces(idempotence)
+  vyos_vlan: *delete_multiple
+  register: result
+
+- assert:
+    that:
+      - "result.changed == false"
+
+- name: teardown
+  vyos_config:
+    lines:
+      - delete interfaces ethernet eth0 vif 100
+      - delete interfaces ethernet eth1 vif 100