Migrated to cisco.ucs

39 files changed, 0 insertions, 3068 deletions

diff --git a/test/integration/targets/ucs_disk_group_policy/aliases b/test/integration/targets/ucs_disk_group_policy/aliases
deleted file mode 100644
index 0689fba3e4..0000000000
--- a/test/integration/targets/ucs_disk_group_policy/aliases
+++ /dev/null
@@ -1,7 +0,0 @@
-# Not enabled, but can be used with the UCS Platform Emulator or UCS hardware.
-# Example integration_config.yml:
-# ---
-# ucs_hostname: 172.16.143.136
-# ucs_username: admin
-# ucs_password: password
-unsupported
diff --git a/test/integration/targets/ucs_disk_group_policy/tasks/main.yml b/test/integration/targets/ucs_disk_group_policy/tasks/main.yml
deleted file mode 100644
index 717f609674..0000000000
--- a/test/integration/targets/ucs_disk_group_policy/tasks/main.yml
+++ /dev/null
@@ -1,193 +0,0 @@
-# Test code for the UCS modules
-# Copyright 2018, David Soper (@dsoper2)
-
-- name: Test that we have a UCS host, UCS username, and UCS password
-  fail:
-    msg: 'Please define the following variables: ucs_hostname, ucs_username and ucs_password.'
-  when: ucs_hostname is not defined or ucs_username is not defined or ucs_password is not defined
-  vars:
-    login_info: &login_info
-      hostname: "{{ ucs_hostname }}"
-      username: "{{ ucs_username }}"
-      password: "{{ ucs_password }}"
-
-# Setup (clean environment)
-- name: Disk Group Policy absent
-  ucs_disk_group_policy: &disk_group_policy_absent
-    <<: *login_info
-    name: DEE-DG
-    state: absent
-
-
-# Test present (check_mode)
-- name: Disk Group Policy present (check_mode)
-  ucs_disk_group_policy: &disk_group_policy_present
-    <<: *login_info
-    name: DEE-DG
-    raid_level: mirror
-    configuration_mode: manual
-    manual_disks:
-    - slot_num: '1'
-      role: normal
-    - slot_num: '2'
-      role: normal
-  check_mode: yes
-  register: cm_disk_group_policy_present
-
-
-# Present (normal mode)
-- name: Disk Group Policy present (normal mode)
-  ucs_disk_group_policy: *disk_group_policy_present
-  register: nm_disk_group_policy_present
-
-
-# Test present again (idempotent)
-- name: Disk Group Policy present again (check_mode)
-  ucs_disk_group_policy: *disk_group_policy_present
-  check_mode: yes
-  register: cm_disk_group_policy_present_again
-
-
-# Present again (normal mode)
-- name: Disk Group Policy present again (normal mode)
-  ucs_disk_group_policy: *disk_group_policy_present
-  register: nm_disk_group_policy_present_again
-
-
-# Verfiy present
-- name: Verify Disk Group Policy present results
-  assert:
-    that:
-    - cm_disk_group_policy_present.changed == nm_disk_group_policy_present.changed == true
-    - cm_disk_group_policy_present_again.changed == nm_disk_group_policy_present_again.changed == false
-
-
-# Test change (check_mode)
-- name: Disk Group Policy change (check_mode)
-  ucs_disk_group_policy: &disk_group_policy_change
-    <<: *login_info
-    name: DEE-DG
-    description: Testing Ansible
-    raid_level: stripe
-    configuration_mode: manual
-    manual_disks:
-    - slot_num: '1'
-      role: normal
-    - slot_num: '2'
-      role: normal
-      state: absent
-  check_mode: yes
-  register: cm_disk_group_policy_change
-
-
-# Change (normal mode)
-- name: Disk Group Policy change (normal mode)
-  ucs_disk_group_policy: *disk_group_policy_change
-  register: nm_disk_group_policy_change
-
-
-# Test change again (idempotent)
-- name: Disk Group Policy again (check_mode)
-  ucs_disk_group_policy: *disk_group_policy_change
-  check_mode: yes
-  register: cm_disk_group_policy_change_again
-
-
-# Change again (normal mode)
-- name: Disk Group Policy change again (normal mode)
-  ucs_disk_group_policy: *disk_group_policy_change
-  register: nm_disk_group_policy_change_again
-
-
-# Verfiy change
-- name: Verify Disk Group Policy change results
-  assert:
-    that:
-    - cm_disk_group_policy_change.changed == nm_disk_group_policy_change.changed == true
-    - cm_disk_group_policy_change_again.changed == nm_disk_group_policy_change_again.changed == false
-
-
-# Clean environment for next tests
-- name: Disk Group Policy absent for automatic testing
-  ucs_disk_group_policy: &disk_group_policy_absent_auto
-    <<: *login_info
-    name: DEE-DG
-    state: absent
-
-
-# Test automatic configuration mode (check_mode)
-- name: Disk Group Policy automatic (check_mode)
-  ucs_disk_group_policy: &disk_group_policy_auto
-    <<: *login_info
-    name: DEE-DG
-    raid_level: mirror
-    configuration_mode: automatic
-    drive_type: SSD
-    num_drives: 2
-    virtual_drive:
-      access_policy: platform-default
-      io_policy: direct
-      strip_size: 64KB
-  check_mode: yes
-  register: cm_disk_group_policy_auto
-
-
-# Automatic configuration (normal mode)
-- name: Disk Group Policy automatic (normal mode)
-  ucs_disk_group_policy: *disk_group_policy_auto
-  register: nm_disk_group_policy_auto
-
-
-# Test automatic configuration again (idempotent)
-- name: Disk Group Policy automatic again (check_mode)
-  ucs_disk_group_policy: *disk_group_policy_auto
-  check_mode: yes
-  register: cm_disk_group_policy_auto_again
-
-
-# Automatic configuration again (normal mode)
-- name: Disk Group Policy automatic again (normal mode)
-  ucs_disk_group_policy: *disk_group_policy_auto
-  register: nm_disk_group_policy_auto_again
-
-
-# Verfiy Automatic configuration 
-- name: Verify Disk Group Policy automatic results
-  assert:
-    that:
-    - cm_disk_group_policy_auto.changed == nm_disk_group_policy_auto.changed == true
-    - cm_disk_group_policy_auto_again.changed == nm_disk_group_policy_auto_again.changed == false
-
-
-# Teardown (clean environment)
-- name: Disk Group Policy absent (check_mode)
-  ucs_disk_group_policy: *disk_group_policy_absent
-  check_mode: yes
-  register: cm_disk_group_policy_absent
-
-
-# Absent (normal mode)
-- name: Disk Group Policy absent (normal mode)
-  ucs_disk_group_policy: *disk_group_policy_absent
-  register: nm_disk_group_policy_absent
-
-
-# Test absent again (idempotent)
-- name: Disk Group Policy absent again (check_mode)
-  ucs_disk_group_policy: *disk_group_policy_absent
-  check_mode: yes
-  register: cm_disk_group_policy_absent_again
-
-
-# Absent again (normal mode)
-- name: Disk Group Policy absent again (normal mode)
-  ucs_disk_group_policy: *disk_group_policy_absent
-  register: nm_disk_group_policy_absent_again
-
-
-# Verfiy absent
-- name: Verify Disk Group Policy absent results
-  assert:
-    that:
-    - cm_disk_group_policy_absent.changed == nm_disk_group_policy_absent.changed == true
-    - cm_disk_group_policy_absent_again.changed == nm_disk_group_policy_absent_again.changed == false
diff --git a/test/integration/targets/ucs_dns_server/aliases b/test/integration/targets/ucs_dns_server/aliases
deleted file mode 100644
index 39a783a083..0000000000
--- a/test/integration/targets/ucs_dns_server/aliases
+++ /dev/null
@@ -1,7 +0,0 @@
-# Not enabled, but can be used with the UCS Platform Emulator or UCS hardware.
-# Example integration_config.yml:
-# ---
-# ucs_hostname: 10.10.10.10
-# ucs_username: admin
-# ucs_password: password
-unsupported
\ No newline at end of file
diff --git a/test/integration/targets/ucs_dns_server/tasks/main.yml b/test/integration/targets/ucs_dns_server/tasks/main.yml
deleted file mode 100644
index 9050d82d47..0000000000
--- a/test/integration/targets/ucs_dns_server/tasks/main.yml
+++ /dev/null
@@ -1,110 +0,0 @@
-# Test code for the UCS modules
-# Copyright 2018, John McDonough (@movinalot)
-
-- name: Test that we have a UCS host, UCS username, and UCS password.
-  fail:
-    msg: 'Please define the following variables: ucs_hostname, ucs_username and ucs_password.'
-  when: ucs_hostname is not defined or ucs_username is not defined or ucs_password is not defined
-  vars:
-    login_info: &login_info
-      hostname: "{{ ucs_hostname }}"
-      username: "{{ ucs_username }}"
-      password: "{{ ucs_password }}"
-
-# Setup (clean environment)
-- name: DNS Server absent
-  ucs_dns_server: &dns_server_absent
-    <<: *login_info
-    dns_server: 10.10.10.10
-    state: absent
-
-# Test present (check_mode)
-- name: DNS Server present (check_mode)
-  ucs_dns_server: &dns_server_present
-    <<: *login_info
-    dns_server: 10.10.10.10
-  check_mode: yes
-  register: cm_dns_server_present
-
-# Present (normal mode)
-- name: DNS Server present (normal mode)
-  ucs_dns_server: *dns_server_present
-  register: nm_dns_server_present
-
-# Test present again (idempotent)
-- name: DNS Server present again (check_mode)
-  ucs_dns_server: *dns_server_present
-  check_mode: yes
-  register: cm_dns_server_present_again
-
-# Present again (normal mode)
-- name: DNS Server present again (normal mode)
-  ucs_dns_server: *dns_server_present
-  register: nm_dns_server_present_again
-
-# Verfiy present
-- name: Verify DNS Server present results
-  assert:
-    that:
-    - cm_dns_server_present.changed == nm_dns_server_present.changed == true
-    - cm_dns_server_present_again.changed == nm_dns_server_present_again.changed == false
-
-# Test change (check_mode)
-- name: DNS DNS Server change (check_mode)
-  ucs_dns_server: &dns_server_change
-    <<: *dns_server_present
-    dns_server: 10.10.10.10
-  check_mode: yes
-  register: cm_dns_dns_server_change
-
-# Change (normal mode)
-- name: DNS DNS Server change (normal mode)
-  ucs_dns_server: *dns_server_change
-  register: nm_dns_dns_server_change
-
-# Test change again (idempotent)
-- name: DNS DNS Server change again (check_mode)
-  ucs_dns_server: *dns_server_change
-  check_mode: yes
-  register: cm_dns_dns_server_change_again
-
-# Change again (normal mode)
-- name: DNS DNS Server change again (normal mode)
-  ucs_dns_server: *dns_server_change
-  register: nm_dns_dns_server_change_again
-
-# Verfiy change
-- name: Verify DNS DNS Server change results
-  assert:
-    that:
-    - cm_dns_dns_server_change.changed == nm_dns_dns_server_change.changed == true
-    - cm_dns_dns_server_change_again.changed == nm_dns_dns_server_change_again.changed == false
-
-# Teardown (clean environment)
-- name: DNS Server absent (check_mode)
-  ucs_dns_server: *dns_server_absent
-  check_mode: yes
-  register: cm_dns_server_absent
-
-# Absent (normal mode)
-- name: DNS Server absent (normal mode)
-  ucs_dns_server: *dns_server_absent
-  register: nm_dns_server_absent
-
-# Test absent again (idempotent)
-- name: DNS Server absent again (check_mode)
-  ucs_dns_server: *dns_server_absent
-  check_mode: yes
-  register: cm_dns_server_absent_again
-
-# Absent again (normal mode)
-- name: DNS Server absent again (normal mode)
-  ucs_dns_server: *dns_server_absent
-  register: nm_dns_server_absent_again
-
-# Verfiy absent
-- name: Verify DNS Server absent results
-  assert:
-    that:
-    - cm_dns_server_absent.changed == nm_dns_server_absent.changed == true
-    - cm_dns_server_absent_again.changed == nm_dns_server_absent_again.changed == false
diff --git a/test/integration/targets/ucs_ip_pool/aliases b/test/integration/targets/ucs_ip_pool/aliases
deleted file mode 100644
index 0689fba3e4..0000000000
--- a/test/integration/targets/ucs_ip_pool/aliases
+++ /dev/null
@@ -1,7 +0,0 @@
-# Not enabled, but can be used with the UCS Platform Emulator or UCS hardware.
-# Example integration_config.yml:
-# ---
-# ucs_hostname: 172.16.143.136
-# ucs_username: admin
-# ucs_password: password
-unsupported
diff --git a/test/integration/targets/ucs_ip_pool/tasks/main.yml b/test/integration/targets/ucs_ip_pool/tasks/main.yml
deleted file mode 100644
index 696b291d8e..0000000000
--- a/test/integration/targets/ucs_ip_pool/tasks/main.yml
+++ /dev/null
@@ -1,203 +0,0 @@
-# Test code for the UCS modules
-# Copyright 2017, David Soper (@dsoper2)
-
-- name: Test that we have a UCS host, UCS username, and UCS password
-  fail:
-    msg: 'Please define the following variables: ucs_hostname, ucs_username and ucs_password.'
-  when: ucs_hostname is not defined or ucs_username is not defined or ucs_password is not defined
-  vars:
-    login_info: &login_info
-      hostname: "{{ ucs_hostname }}"
-      username: "{{ ucs_username }}"
-      password: "{{ ucs_password }}"
-
-# Setup (clean environment)
-- name: IPv4 Pools absent
-  ucs_ip_pool: &ipv4_pool_absent
-    <<: *login_info
-    name: ip-A
-    state: absent
-- name: IPv6 Pools absent
-  ucs_ip_pool: &ipv6_pool_absent
-    <<: *login_info
-    name: ipv6-B
-    state: absent
-
-
-# Test present (check_mode)
-- name: IPv4 Pools present (check_mode)
-  ucs_ip_pool: &ipv4_pool_present
-    <<: *login_info
-    name: ip-A
-    order: sequential
-    first_addr: 192.168.0.10
-    last_addr: 192.168.0.19
-    subnet_mask: 255.255.255.0
-    default_gw: 192.168.0.1
-    primary_dns: 172.16.143.136
-  check_mode: yes
-  register: cm_ipv4_pool_present
-
-- name: IPv6 Pools present (check_mode)
-  ucs_ip_pool: &ipv6_pool_present
-    <<: *login_info
-    name: ipv6-B
-    ipv6_first_addr: fe80::1cae:7992:d7a1:ed07
-    ipv6_last_addr: fe80::1cae:7992:d7a1:edfe
-    ipv6_default_gw: fe80::1cae:7992:d7a1:ecff
-  check_mode: yes
-  register: cm_ipv6_pool_present
-
-
-# Present (normal mode)
-- name: IPv4 Pools present (normal mode)
-  ucs_ip_pool: *ipv4_pool_present
-  register: nm_ipv4_pool_present
-
-- name: IPv6 Pools present (normal mode)
-  ucs_ip_pool: *ipv6_pool_present
-  register: nm_ipv6_pool_present
-
-
-# Test present again (idempotent)
-- name: IPv4 Pools present again (check_mode)
-  ucs_ip_pool: *ipv4_pool_present
-  check_mode: yes
-  register: cm_ipv4_pool_present_again
-
-- name: IPv6 Pools present again (check_mode)
-  ucs_ip_pool: *ipv6_pool_present
-  check_mode: yes
-  register: cm_ipv6_pool_present_again
-
-
-# Present again (normal mode)
-- name: IPv4 Pools present again (normal mode)
-  ucs_ip_pool: *ipv4_pool_present
-  register: nm_ipv4_pool_present_again
-
-- name: IPv6 Pools present again (normal mode)
-  ucs_ip_pool: *ipv6_pool_present
-  register: nm_ipv6_pool_present_again
-
-
-# Verfiy present
-- name: Verify IPv4/IPv6 Pools present results
-  assert:
-    that:
-    - cm_ipv4_pool_present.changed == nm_ipv4_pool_present.changed == true
-    - cm_ipv6_pool_present.changed == nm_ipv6_pool_present.changed == true
-    - cm_ipv4_pool_present_again.changed == nm_ipv4_pool_present_again.changed == false
-    - cm_ipv6_pool_present_again.changed == nm_ipv6_pool_present_again.changed == false
-
-
-# Test change (check_mode)
-- name: IPv4 Pools description change (check_mode)
-  ucs_ip_pool: &ipv4_pool_change
-    <<: *ipv4_pool_present
-    descr: Testing Ansible
-  check_mode: yes
-  register: cm_ipv4_pool_descr_change
-
-- name: IPv6 Pools description change (check_mode)
-  ucs_ip_pool: &ipv6_pool_change
-    <<: *ipv6_pool_present
-    descr: Testing Ansible
-  check_mode: yes
-  register: cm_ipv6_pool_descr_change
-
-
-# Change (normal mode)
-- name: IPv4 Pools description change (normal mode)
-  ucs_ip_pool: *ipv4_pool_change
-  register: nm_ipv4_pool_descr_change
-
-- name: IPv6 Pools description change (normal mode)
-  ucs_ip_pool: *ipv6_pool_change
-  register: nm_ipv6_pool_descr_change
-
-
-# Test change again (idempotent)
-- name: IPv4 Pools description again (check_mode)
-  ucs_ip_pool: *ipv4_pool_change
-  check_mode: yes
-  register: cm_ipv4_pool_descr_change_again
-
-- name: IPv6 Pools description again (check_mode)
-  ucs_ip_pool: *ipv6_pool_change
-  check_mode: yes
-  register: cm_ipv6_pool_descr_change_again
-
-
-# Change again (normal mode)
-- name: IPv4 Pools description change again (normal mode)
-  ucs_ip_pool: *ipv4_pool_change
-  register: nm_ipv4_pool_descr_change_again
-
-- name: IPv6 Pools description change again (normal mode)
-  ucs_ip_pool: *ipv6_pool_change
-  register: nm_ipv6_pool_descr_change_again
-
-
-# Verfiy change
-- name: Verify IPv4/IPv6 Pools change results
-  assert:
-    that:
-    - cm_ipv4_pool_descr_change.changed == nm_ipv4_pool_descr_change.changed == true
-    - cm_ipv4_pool_descr_change_again.changed == nm_ipv4_pool_descr_change_again.changed == false
-    - cm_ipv6_pool_descr_change.changed == nm_ipv6_pool_descr_change.changed == true
-    - cm_ipv6_pool_descr_change_again.changed == nm_ipv6_pool_descr_change_again.changed == false
-
-
-# Teardown (clean environment)
-- name: IPv4 Pools absent (check_mode)
-  ucs_ip_pool: *ipv4_pool_absent
-  check_mode: yes
-  register: cm_ipv4_pool_absent
-
-- name: IPv6 Pools absent (check_mode)
-  ucs_ip_pool: *ipv6_pool_absent
-  check_mode: yes
-  register: cm_ipv6_pool_absent
-
-
-# Absent (normal mode)
-- name: IPv4 Pools absent (normal mode)
-  ucs_ip_pool: *ipv4_pool_absent
-  register: nm_ipv4_pool_absent
-
-- name: IPv6 Pools absent (normal mode)
-  ucs_ip_pool: *ipv6_pool_absent
-  register: nm_ipv6_pool_absent
-
-
-# Test absent again (idempotent)
-- name: IPv4 Pools absent again (check_mode)
-  ucs_ip_pool: *ipv4_pool_absent
-  check_mode: yes
-  register: cm_ipv4_pool_absent_again
-
-- name: IPv6 Pools absent again (check_mode)
-  ucs_ip_pool: *ipv6_pool_absent
-  check_mode: yes
-  register: cm_ipv6_pool_absent_again
-
-
-# Absent again (normal mode)
-- name: IPv4 Pools absent again (normal mode)
-  ucs_ip_pool: *ipv4_pool_absent
-  register: nm_ipv4_pool_absent_again
-
-- name: IPv6 Pools absent again (normal mode)
-  ucs_ip_pool: *ipv6_pool_absent
-  register: nm_ipv6_pool_absent_again
-
-
-# Verfiy absent
-- name: Verify IPv4/IPv6 Pools absent results
-  assert:
-    that:
-    - cm_ipv4_pool_absent.changed == nm_ipv4_pool_absent.changed == true
-    - cm_ipv4_pool_absent_again.changed == nm_ipv4_pool_absent_again.changed == false
-    - cm_ipv6_pool_absent.changed == nm_ipv6_pool_absent.changed == true
-    - cm_ipv6_pool_absent_again.changed == nm_ipv6_pool_absent_again.changed == false
diff --git a/test/integration/targets/ucs_lan_connectivity/aliases b/test/integration/targets/ucs_lan_connectivity/aliases
deleted file mode 100644
index 0689fba3e4..0000000000
--- a/test/integration/targets/ucs_lan_connectivity/aliases
+++ /dev/null
@@ -1,7 +0,0 @@
-# Not enabled, but can be used with the UCS Platform Emulator or UCS hardware.
-# Example integration_config.yml:
-# ---
-# ucs_hostname: 172.16.143.136
-# ucs_username: admin
-# ucs_password: password
-unsupported
diff --git a/test/integration/targets/ucs_lan_connectivity/tasks/main.yml b/test/integration/targets/ucs_lan_connectivity/tasks/main.yml
deleted file mode 100644
index c853d310f8..0000000000
--- a/test/integration/targets/ucs_lan_connectivity/tasks/main.yml
+++ /dev/null
@@ -1,202 +0,0 @@
-# Test code for the UCS modules
-# Copyright 2017, David Soper (@dsoper2)
-
-- name: Test that we have a UCS host, UCS username, and UCS password
-  fail:
-    msg: 'Please define the following variables: ucs_hostname, ucs_username and ucs_password.'
-  when: ucs_hostname is not defined or ucs_username is not defined or ucs_password is not defined
-  vars:
-    login_info: &login_info
-      hostname: "{{ ucs_hostname }}"
-      username: "{{ ucs_username }}"
-      password: "{{ ucs_password }}"
-
-# Setup (clean environment)
-- name: LAN Connectivity Policies absent
-  ucs_lan_connectivity: &lan_connectivity_absent
-    <<: *login_info
-    name: Cntr-FC-Boot
-    state: absent
-
-# Test present (check_mode)
-- name: LAN Connectivity Policies present (check_mode)
-  ucs_lan_connectivity: &lan_connectivity_present
-    <<: *login_info
-    name: Cntr-FC-Boot
-    vnic_list:
-    - name: eno1
-      vnic_template: Cntr-Template
-      adapter_policy: Linux
-    - name: eno2
-      vnic_template: Container-NFS-A
-      adapter_policy: Linux
-    - name: eno3
-      vnic_template: Container-NFS-B
-      adapter_policy: Linux
-    iscsi_vnic_list:
-    - name: iSCSIa
-      overlay_vnic: eno1
-      iscsi_adapter_policy: default
-      vlan_name: Container-MGMT-VLAN
-    - name: iSCSIb
-      overlay_vnic: eno3
-      iscsi_adapter_policy: default
-      vlan_name: Container-TNT-A-NFS
-  check_mode: yes
-  register: cm_lan_connectivity_present
-
-# Present (normal mode)
-- name: LAN Connectivity Policies present (normal mode)
-  ucs_lan_connectivity: *lan_connectivity_present
-  register: nm_lan_connectivity_present
-
-# Test present again (idempotent)
-- name: LAN Connectivity Policies present again (check_mode)
-  ucs_lan_connectivity: *lan_connectivity_present
-  check_mode: yes
-  register: cm_lan_connectivity_present_again
-
-# Present again (normal mode)
-- name: LAN Connectivity Policies present again (normal mode)
-  ucs_lan_connectivity: *lan_connectivity_present
-  register: nm_lan_connectivity_present_again
-
-# Verfiy present
-- name: Verify LAN Connectivity Policies present results
-  assert:
-    that:
-    - cm_lan_connectivity_present.changed == nm_lan_connectivity_present.changed == true
-    - cm_lan_connectivity_present_again.changed == nm_lan_connectivity_present_again.changed == false
-
-# Test change (check_mode)
-- name: LAN Connectivity Policies change (check_mode)
-  ucs_lan_connectivity: &lan_connectivity_change
-    <<: *login_info
-    name: Cntr-FC-Boot
-    vnic_list:
-    - name: eno1
-      vnic_template: Cntr-Template
-      adapter_policy: Linux
-    - name: eno2
-      vnic_template: Container-NFS-A
-      adapter_policy: Linux
-    - name: eno3
-      vnic_template: Container-NFS-B
-      adapter_policy: default
-    iscsi_vnic_list:
-    - name: iSCSIa
-      overlay_vnic: eno1
-      iscsi_adapter_policy: default
-      vlan_name: Container-MGMT-VLAN
-    - name: iSCSIb
-      overlay_vnic: eno3
-      iscsi_adapter_policy: default
-      vlan_name: Container-TNT-A-NFS
-  check_mode: yes
-  register: cm_lan_connectivity_descr_change
-
-# Change (normal mode)
-- name: LAN Connectivity Policies description change (normal mode)
-  ucs_lan_connectivity: *lan_connectivity_change
-  register: nm_lan_connectivity_descr_change
-
-# Test change again (idempotent)
-- name: LAN Connectivity Policies description again (check_mode)
-  ucs_lan_connectivity: *lan_connectivity_change
-  check_mode: yes
-  register: cm_lan_connectivity_descr_change_again
-
-# Change again (normal mode)
-- name: LAN Connectivity Policies description change again (normal mode)
-  ucs_lan_connectivity: *lan_connectivity_change
-  register: nm_lan_connectivity_descr_change_again
-
-# Verfiy change
-- name: Verify LAN Connectivity Policies change results
-  assert:
-    that:
-    - cm_lan_connectivity_descr_change.changed == nm_lan_connectivity_descr_change.changed == true
-    - cm_lan_connectivity_descr_change_again.changed == nm_lan_connectivity_descr_change_again.changed == false
-
-
-# Test vnic and iscsi vnic removal
-- name: LAN Connectivity Policies vnic removal (check_mode)
-  ucs_lan_connectivity: &lan_connectivity_vnic_change
-    <<: *login_info
-    name: Cntr-FC-Boot
-    vnic_list:
-    - name: eno1
-      vnic_template: Cntr-Template
-      adapter_policy: Linux
-    - name: eno2
-      vnic_template: Container-NFS-A
-      adapter_policy: Linux
-    - name: eno3
-      vnic_template: Container-NFS-B
-      adapter_policy: default
-      state: absent
-    iscsi_vnic_list:
-    - name: iSCSIa
-      overlay_vnic: eno1
-      iscsi_adapter_policy: default
-      vlan_name: Container-MGMT-VLAN
-      state: absent
-    - name: iSCSIb
-      overlay_vnic: eno3
-      iscsi_adapter_policy: default
-      vlan_name: Container-TNT-A-NFS
-      state: absent
-  check_mode: yes
-  register: cm_lan_connectivity_vnic_change
-
-# Change (normal mode)
-- name: LAN Connectivity Policies vnic removal (normal mode)
-  ucs_lan_connectivity: *lan_connectivity_vnic_change
-  register: nm_lan_connectivity_vnic_change
-
-# Test change again (idempotent)
-- name: LAN Connectivity Policies vnic removal again (check_mode)
-  ucs_lan_connectivity: *lan_connectivity_vnic_change
-  check_mode: yes
-  register: cm_lan_connectivity_vnic_change_again
-
-# Change again (normal mode)
-- name: LAN Connectivity Policies vnic removal again (normal mode)
-  ucs_lan_connectivity: *lan_connectivity_vnic_change
-  register: nm_lan_connectivity_vnic_change_again
-
-# Verfiy change
-- name: Verify LAN Connectivity Policies vnic removal results
-  assert:
-    that:
-    - cm_lan_connectivity_vnic_change.changed == nm_lan_connectivity_vnic_change.changed == true
-    - cm_lan_connectivity_vnic_change_again.changed == nm_lan_connectivity_vnic_change_again.changed == false
-
-# Teardown (clean environment)
-- name: LAN Connectivity Policies absent (check_mode)
-  ucs_lan_connectivity: *lan_connectivity_absent
-  check_mode: yes
-  register: cm_lan_connectivity_absent
-
-# Absent (normal mode)
-- name: LAN Connectivity Policies absent (normal mode)
-  ucs_lan_connectivity: *lan_connectivity_absent
-  register: nm_lan_connectivity_absent
-
-# Test absent again (idempotent)
-- name: LAN Connectivity Policies absent again (check_mode)
-  ucs_lan_connectivity: *lan_connectivity_absent
-  check_mode: yes
-  register: cm_lan_connectivity_absent_again
-
-# Absent again (normal mode)
-- name: LAN Connectivity Policies absent again (normal mode)
-  ucs_lan_connectivity: *lan_connectivity_absent
-  register: nm_lan_connectivity_absent_again
-
-# Verfiy absent
-- name: Verify LAN Connectivity Policies absent results
-  assert:
-    that:
-    - cm_lan_connectivity_absent.changed == nm_lan_connectivity_absent.changed == true
-    - cm_lan_connectivity_absent_again.changed == nm_lan_connectivity_absent_again.changed == false
diff --git a/test/integration/targets/ucs_mac_pool/aliases b/test/integration/targets/ucs_mac_pool/aliases
deleted file mode 100644
index 0689fba3e4..0000000000
--- a/test/integration/targets/ucs_mac_pool/aliases
+++ /dev/null
@@ -1,7 +0,0 @@
-# Not enabled, but can be used with the UCS Platform Emulator or UCS hardware.
-# Example integration_config.yml:
-# ---
-# ucs_hostname: 172.16.143.136
-# ucs_username: admin
-# ucs_password: password
-unsupported
diff --git a/test/integration/targets/ucs_mac_pool/tasks/main.yml b/test/integration/targets/ucs_mac_pool/tasks/main.yml
deleted file mode 100644
index ebb6bb8757..0000000000
--- a/test/integration/targets/ucs_mac_pool/tasks/main.yml
+++ /dev/null
@@ -1,129 +0,0 @@
-# Test code for the UCS modules
-# Copyright 2017, David Soper (@dsoper2)
-
-- name: Test that we have a UCS host, UCS username, and UCS password
-  fail:
-    msg: 'Please define the following variables: ucs_hostname, ucs_username and ucs_password.'
-  when: ucs_hostname is not defined or ucs_username is not defined or ucs_password is not defined
-  vars:
-    login_info: &login_info
-      hostname: "{{ ucs_hostname }}"
-      username: "{{ ucs_username }}"
-      password: "{{ ucs_password }}"
-
-
-# Setup (clean environment)
-- name: MAC pools absent
-  ucs_mac_pool: &mac_pools_absent
-    <<: *login_info
-    name: mac-A
-    state: absent
-
-
-# Test present (check_mode)
-- name: MAC pools present (check_mode)
-  ucs_mac_pool: &mac_pools_present
-    <<: *login_info
-    name: mac-A
-    first_addr: 00:25:B5:00:66:00
-    last_addr: 00:25:B5:00:67:F3
-    order: sequential
-  check_mode: yes
-  register: cm_mac_pools_present
-
-
-# Present (normal mode)
-- name: MAC pools present (normal mode)
-  ucs_mac_pool: *mac_pools_present
-  register: nm_mac_pools_present
-
-
-# Test present again (idempotent)
-- name: MAC pools present again (check_mode)
-  ucs_mac_pool: *mac_pools_present
-  check_mode: yes
-  register: cm_mac_pools_present_again
-
-
-# Present again (normal mode)
-- name: MAC pools present again (normal mode)
-  ucs_mac_pool: *mac_pools_present
-  register: nm_mac_pools_present_again
-
-
-# Verfiy present
-- name: Verify MAC present results
-  assert:
-    that:
-    - cm_mac_pools_present.changed == nm_mac_pools_present.changed == true
-    - cm_mac_pools_present_again.changed == nm_mac_pools_present_again.changed == false
-
-
-# Test change (check_mode)
-- name: MAC pools description change (check_mode)
-  ucs_mac_pool: &mac_pools_change
-    <<: *mac_pools_present
-    descr: Testing Ansible
-  check_mode: yes
-  register: cm_mac_pools_descr_change
-
-
-# Change (normal mode)
-- name: MAC pools description change (normal mode)
-  ucs_mac_pool: *mac_pools_change
-  register: nm_mac_pools_descr_change
-
-
-# Test change again (idempotent)
-- name: MAC pools description again (check_mode)
-  ucs_mac_pool: *mac_pools_change
-  check_mode: yes
-  register: cm_mac_pools_descr_change_again
-
-
-# Change again (normal mode)
-- name: MAC pools description change again (normal mode)
-  ucs_mac_pool: *mac_pools_change
-  register: nm_mac_pools_descr_change_again
-
-
-# Verfiy change
-- name: Verify MAC change results
-  assert:
-    that:
-    - cm_mac_pools_descr_change.changed == nm_mac_pools_descr_change.changed == true
-    - cm_mac_pools_descr_change_again.changed == nm_mac_pools_descr_change_again.changed == false
-
-
-# Teardown (clean environment)
-- name: MAC pools absent (check_mode)
-  ucs_mac_pool: *mac_pools_absent
-  check_mode: yes
-  register: cm_mac_pools_absent
-
-
-# Absent (normal mode)
-- name: MAC pools absent (normal mode)
-  ucs_mac_pool: *mac_pools_absent
-  register: nm_mac_pools_absent
-
-
-# Test absent again (idempotent)
-- name: MAC pools absent again (check_mode)
-  ucs_mac_pool: *mac_pools_absent
-  check_mode: yes
-  register: cm_mac_pools_absent_again
-
-
-# Absent again (normal mode)
-- name: MAC pools absent again (normal mode)
-  ucs_mac_pool: *mac_pools_absent
-  register: nm_mac_pools_absent_again
-
-
-# Verfiy absent
-- name: Verify MAC absent results
-  assert:
-    that:
-    - cm_mac_pools_absent.changed == nm_mac_pools_absent.changed == true
-    - cm_mac_pools_absent_again.changed == nm_mac_pools_absent_again.changed == false
diff --git a/test/integration/targets/ucs_managed_objects/aliases b/test/integration/targets/ucs_managed_objects/aliases
deleted file mode 100644
index 0689fba3e4..0000000000
--- a/test/integration/targets/ucs_managed_objects/aliases
+++ /dev/null
@@ -1,7 +0,0 @@
-# Not enabled, but can be used with the UCS Platform Emulator or UCS hardware.
-# Example integration_config.yml:
-# ---
-# ucs_hostname: 172.16.143.136
-# ucs_username: admin
-# ucs_password: password
-unsupported
diff --git a/test/integration/targets/ucs_managed_objects/tasks/main.yml b/test/integration/targets/ucs_managed_objects/tasks/main.yml
deleted file mode 100644
index a3b38b8ad4..0000000000
--- a/test/integration/targets/ucs_managed_objects/tasks/main.yml
+++ /dev/null
@@ -1,360 +0,0 @@
-# Test code for the UCS modules
-# Copyright 2018, David Soper (@dsoper2)
-
-- name: Test that we have a UCS host, UCS username, and UCS password
-  fail:
-    msg: 'Please define the following variables: ucs_hostname, ucs_username and ucs_password.'
-  when: ucs_hostname is not defined or ucs_username is not defined or ucs_password is not defined
-  vars:
-    login_info: &login_info
-      hostname: "{{ ucs_hostname }}"
-      username: "{{ ucs_username }}"
-      password: "{{ ucs_password }}"
-
-# Setup (clean environment)
-- name: Remove Network Control Policy
-  ucs_managed_objects: &managed_objects_absent
-    <<: *login_info
-    objects:
-    - module: ucsmsdk.mometa.nwctrl.NwctrlDefinition
-      class: NwctrlDefinition
-      properties:
-        parent_mo_or_dn: org-root
-        name: Enable-CDP-LLDP
-    state: absent
-
-
-# Test present (check_mode)
-- name: Configure Network Control Policy
-  ucs_managed_objects: &managed_objects_present
-    <<: *login_info
-    objects:
-    - module: ucsmsdk.mometa.nwctrl.NwctrlDefinition
-      class: NwctrlDefinition
-      properties:
-        parent_mo_or_dn: org-root
-        cdp: enabled
-        descr: ''
-        lldp_receive: enabled
-        lldp_transmit: enabled
-        name: Enable-CDP-LLDP
-  check_mode: yes
-  register: cm_managed_objects_present
-
-
-# Present (normal mode)
-- name: Managed Objects present (normal mode)
-  ucs_managed_objects: *managed_objects_present
-  register: nm_managed_objects_present
-
-
-# Test present again (idempotent)
-- name: Managed Objects present again (check_mode)
-  ucs_managed_objects: *managed_objects_present
-  check_mode: yes
-  register: cm_managed_objects_present_again
-
-
-# Present again (normal mode)
-- name: Managed Objects present again (normal mode)
-  ucs_managed_objects: *managed_objects_present
-  register: nm_managed_objects_present_again
-
-
-# Verfiy present
-- name: Verify Managed Objects present results
-  assert:
-    that:
-    - cm_managed_objects_present.changed == nm_managed_objects_present.changed == true
-    - cm_managed_objects_present_again.changed == nm_managed_objects_present_again.changed == false
-
-
-# Test change (check_mode)
-- name: Managed Objects change (check_mode)
-  ucs_managed_objects: &managed_objects_change
-    <<: *login_info
-    objects:
-    - module: ucsmsdk.mometa.nwctrl.NwctrlDefinition
-      class: NwctrlDefinition
-      properties:
-        parent_mo_or_dn: org-root
-        cdp: enabled
-        descr: Testing Ansible
-        lldp_receive: enabled
-        lldp_transmit: enabled
-        name: Enable-CDP-LLDP
-  check_mode: yes
-  register: cm_managed_objects_change
-
-
-# Change (normal mode)
-- name: Managed Objects change (normal mode)
-  ucs_managed_objects: *managed_objects_change
-  register: nm_managed_objects_change
-
-
-# Test change again (idempotent)
-- name: Managed Objects again (check_mode)
-  ucs_managed_objects: *managed_objects_change
-  check_mode: yes
-  register: cm_managed_objects_change_again
-
-
-# Change again (normal mode)
-- name: Managed Objects change again (normal mode)
-  ucs_managed_objects: *managed_objects_change
-  register: nm_managed_objects_change_again
-
-
-# Verfiy change
-- name: Verify Managed Objects change results
-  assert:
-    that:
-    - cm_managed_objects_change.changed == nm_managed_objects_change.changed == true
-    - cm_managed_objects_change_again.changed == nm_managed_objects_change_again.changed == false
-
-
-# Teardown (clean environment)
-- name: Managed Objects absent (check_mode)
-  ucs_managed_objects: *managed_objects_absent
-  check_mode: yes
-  register: cm_managed_objects_absent
-
-
-# Absent (normal mode)
-- name: Managed Objects absent (normal mode)
-  ucs_managed_objects: *managed_objects_absent
-  register: nm_managed_objects_absent
-
-
-# Test absent again (idempotent)
-- name: Managed Objects absent again (check_mode)
-  ucs_managed_objects: *managed_objects_absent
-  check_mode: yes
-  register: cm_managed_objects_absent_again
-
-
-# Absent again (normal mode)
-- name: Managed Objects absent again (normal mode)
-  ucs_managed_objects: *managed_objects_absent
-  register: nm_managed_objects_absent_again
-
-
-# Verfiy absent
-- name: Verify Managed Objects absent results
-  assert:
-    that:
-    - cm_managed_objects_absent.changed == nm_managed_objects_absent.changed == true
-    - cm_managed_objects_absent_again.changed == nm_managed_objects_absent_again.changed == false
-
-
-# Setup Boot Policy (clean environment)
-- name: Remove Boot Policy
-  ucs_managed_objects: &boot_managed_objects_absent
-    <<: *login_info
-    objects:
-    - {
-          "module": "ucsmsdk.mometa.lsboot.LsbootPolicy",
-          "class": "LsbootPolicy",
-          "properties": {
-              "parent_mo_or_dn": "org-root",
-              "name": "Python_SDS"
-          }
-      }
-    state: absent
-
-
-# Test present (check_mode)
-- name: Configure Boot Policy
-  ucs_managed_objects: &boot_managed_objects_present
-    <<: *login_info
-    objects:
-    - {
-          "module": "ucsmsdk.mometa.lsboot.LsbootPolicy",
-          "class": "LsbootPolicy",
-          "properties": {
-              "parent_mo_or_dn": "org-root",
-              "name": "Python_SDS",
-              "enforce_vnic_name": "yes",
-              "boot_mode": "legacy",
-              "reboot_on_update": "no"
-          },
-          "children": [
-              {
-                  "module": "ucsmsdk.mometa.lsboot.LsbootVirtualMedia",
-                  "class": "LsbootVirtualMedia",
-                  "properties": {
-                      "access": "read-only-local",
-                      "lun_id": "0",
-                      "order": "2"
-                  }
-              },
-              {
-                  "module": "ucsmsdk.mometa.lsboot.LsbootStorage",
-                  "class": "LsbootStorage",
-                  "properties": {
-                      "order": "1"
-                  },
-                  "children": [
-                      {
-                          "module": "ucsmsdk.mometa.lsboot.LsbootLocalStorage",
-                          "class": "LsbootLocalStorage",
-                          "properties": {},
-                          "children": [
-                              {
-                                  "module": "ucsmsdk.mometa.lsboot.LsbootDefaultLocalImage",
-                                  "class": "LsbootDefaultLocalImage",
-                                  "properties": {
-                                      "order": "1"
-                                  }
-                              }
-                          ]
-                      }
-                  ]
-              }
-          ]
-      }
-  check_mode: yes
-  register: cm_boot_managed_objects_present
-
-
-# Present (normal mode)
-- name: Boot Managed Objects present (normal mode)
-  ucs_managed_objects: *boot_managed_objects_present
-  register: nm_boot_managed_objects_present
-
-
-# Test present again (idempotent)
-- name: Boot Managed Objects present again (check_mode)
-  ucs_managed_objects: *boot_managed_objects_present
-  check_mode: yes
-  register: cm_boot_managed_objects_present_again
-
-
-# Present again (normal mode)
-- name: Boot Managed Objects present again (normal mode)
-  ucs_managed_objects: *boot_managed_objects_present
-  register: nm_boot_managed_objects_present_again
-
-
-# Verfiy present
-- name: Verify Boot Managed Objects present results
-  assert:
-    that:
-    - cm_boot_managed_objects_present.changed == nm_boot_managed_objects_present.changed == true
-    - cm_boot_managed_objects_present_again.changed == nm_boot_managed_objects_present_again.changed == false
-
-
-# Test change (check_mode)
-- name: Boot Managed Objects change (check_mode)
-  ucs_managed_objects: &boot_managed_objects_change
-    <<: *login_info
-    objects:
-    - {
-          "module": "ucsmsdk.mometa.lsboot.LsbootPolicy",
-          "class": "LsbootPolicy",
-          "properties": {
-              "parent_mo_or_dn": "org-root",
-              "name": "Python_SDS",
-              "enforce_vnic_name": "yes",
-              "boot_mode": "legacy",
-              "reboot_on_update": "yes"
-          },
-          "children": [
-              {
-                  "module": "ucsmsdk.mometa.lsboot.LsbootVirtualMedia",
-                  "class": "LsbootVirtualMedia",
-                  "properties": {
-                      "access": "read-only-local",
-                      "lun_id": "0",
-                      "order": "2"
-                  }
-              },
-              {
-                  "module": "ucsmsdk.mometa.lsboot.LsbootStorage",
-                  "class": "LsbootStorage",
-                  "properties": {
-                      "order": "1"
-                  },
-                  "children": [
-                      {
-                          "module": "ucsmsdk.mometa.lsboot.LsbootLocalStorage",
-                          "class": "LsbootLocalStorage",
-                          "properties": {},
-                          "children": [
-                              {
-                                  "module": "ucsmsdk.mometa.lsboot.LsbootDefaultLocalImage",
-                                  "class": "LsbootDefaultLocalImage",
-                                  "properties": {
-                                      "order": "1"
-                                  }
-                              }
-                          ]
-                      }
-                  ]
-              }
-          ]
-      }
-  check_mode: yes
-  register: cm_boot_managed_objects_change
-
-
-# Change (normal mode)
-- name: Boot Managed Objects change (normal mode)
-  ucs_managed_objects: *boot_managed_objects_change
-  register: nm_boot_managed_objects_change
-
-
-# Test change again (idempotent)
-- name: Boot Managed Objects again (check_mode)
-  ucs_managed_objects: *boot_managed_objects_change
-  check_mode: yes
-  register: cm_boot_managed_objects_change_again
-
-
-# Change again (normal mode)
-- name: Boot Managed Objects change again (normal mode)
-  ucs_managed_objects: *boot_managed_objects_change
-  register: nm_boot_managed_objects_change_again
-
-
-# Verfiy change
-- name: Verify Boot Managed Objects change results
-  assert:
-    that:
-    - cm_boot_managed_objects_change.changed == nm_boot_managed_objects_change.changed == true
-    - cm_boot_managed_objects_change_again.changed == nm_boot_managed_objects_change_again.changed == false
-
-
-# Teardown (clean environment)
-- name: Boot Managed Objects absent (check_mode)
-  ucs_managed_objects: *boot_managed_objects_absent
-  check_mode: yes
-  register: cm_boot_managed_objects_absent
-
-
-# Absent (normal mode)
-- name: Boot Managed Objects absent (normal mode)
-  ucs_managed_objects: *boot_managed_objects_absent
-  register: nm_boot_managed_objects_absent
-
-
-# Test absent again (idempotent)
-- name: Boot Managed Objects absent again (check_mode)
-  ucs_managed_objects: *boot_managed_objects_absent
-  check_mode: yes
-  register: cm_boot_managed_objects_absent_again
-
-
-# Absent again (normal mode)
-- name: Boot Managed Objects absent again (normal mode)
-  ucs_managed_objects: *boot_managed_objects_absent
-  register: nm_boot_managed_objects_absent_again
-
-
-# Verfiy absent
-- name: Verify Boot Managed Objects absent results
-  assert:
-    that:
-    - cm_boot_managed_objects_absent.changed == nm_boot_managed_objects_absent.changed == true
-    - cm_boot_managed_objects_absent_again.changed == nm_boot_managed_objects_absent_again.changed == false
diff --git a/test/integration/targets/ucs_ntp_server/aliases b/test/integration/targets/ucs_ntp_server/aliases
deleted file mode 100644
index 16a714d47a..0000000000
--- a/test/integration/targets/ucs_ntp_server/aliases
+++ /dev/null
@@ -1,7 +0,0 @@
-# Not enabled, but can be used with the UCS Platform Emulator or UCS hardware.
-# Example integration_config.yml:
-# ---
-# ucs_hostname: 172.22.251.170
-# ucs_username: admin
-# ucs_password: password
-unsupported
\ No newline at end of file
diff --git a/test/integration/targets/ucs_ntp_server/tasks/main.yml b/test/integration/targets/ucs_ntp_server/tasks/main.yml
deleted file mode 100644
index 8e75fc82eb..0000000000
--- a/test/integration/targets/ucs_ntp_server/tasks/main.yml
+++ /dev/null
@@ -1,110 +0,0 @@
-# Test code for the UCS modules
-# Copyright 2018, John McDonough (@movinalot)
-
-- name: Test that we have a UCS host, UCS username, and UCS password
-  fail:
-    msg: 'Please define the following variables: ucs_hostname, ucs_username and ucs_password.'
-  when: ucs_hostname is not defined or ucs_username is not defined or ucs_password is not defined
-  vars:
-    login_info: &login_info
-      hostname: "{{ ucs_hostname }}"
-      username: "{{ ucs_username }}"
-      password: "{{ ucs_password }}"
-
-# Setup (clean environment)
-- name: NTP Server absent
-  ucs_ntp_server: &ntp_server_absent
-    <<: *login_info
-    ntp_server: pool.ntp.org
-    state: absent
-
-# Test present (check_mode)
-- name: NTP Server present (check_mode)
-  ucs_ntp_server: &ntp_server_present
-    <<: *login_info
-    ntp_server: pool.ntp.org
-  check_mode: yes
-  register: cm_ntp_server_present
-
-# Present (normal mode)
-- name: NTP Server present (normal mode)
-  ucs_ntp_server: *ntp_server_present
-  register: nm_ntp_server_present
-
-# Test present again (idempotent)
-- name: NTP Server present again (check_mode)
-  ucs_ntp_server: *ntp_server_present
-  check_mode: yes
-  register: cm_ntp_server_present_again
-
-# Present again (normal mode)
-- name: NTP Server present again (normal mode)
-  ucs_ntp_server: *ntp_server_present
-  register: nm_ntp_server_present_again
-
-# Verfiy present
-- name: Verify NTP Server present results
-  assert:
-    that:
-    - cm_ntp_server_present.changed == nm_ntp_server_present.changed == true
-    - cm_ntp_server_present_again.changed == nm_ntp_server_present_again.changed == false
-
-# Test change (check_mode)
-- name: NTP NTP Server change (check_mode)
-  ucs_ntp_server: &ntp_server_change
-    <<: *ntp_server_present
-    ntp_server: 10.10.10.10
-  check_mode: yes
-  register: cm_ntp_ntp_server_change
-
-# Change (normal mode)
-- name: NTP NTP Server change (normal mode)
-  ucs_ntp_server: *ntp_server_change
-  register: nm_ntp_ntp_server_change
-
-# Test change again (idempotent)
-- name: NTP NTP Server change again (check_mode)
-  ucs_ntp_server: *ntp_server_change
-  check_mode: yes
-  register: cm_ntp_ntp_server_change_again
-
-# Change again (normal mode)
-- name: NTP NTP Server change again (normal mode)
-  ucs_ntp_server: *ntp_server_change
-  register: nm_ntp_ntp_server_change_again
-
-# Verfiy change
-- name: Verify NTP NTP Server change results
-  assert:
-    that:
-    - cm_ntp_ntp_server_change.changed == nm_ntp_ntp_server_change.changed == true
-    - cm_ntp_ntp_server_change_again.changed == nm_ntp_ntp_server_change_again.changed == false
-
-# Teardown (clean environment)
-- name: NTP Server absent (check_mode)
-  ucs_ntp_server: *ntp_server_absent
-  check_mode: yes
-  register: cm_ntp_server_absent
-
-# Absent (normal mode)
-- name: NTP Server absent (normal mode)
-  ucs_ntp_server: *ntp_server_absent
-  register: nm_ntp_server_absent
-
-# Test absent again (idempotent)
-- name: NTP Server absent again (check_mode)
-  ucs_ntp_server: *ntp_server_absent
-  check_mode: yes
-  register: cm_ntp_server_absent_again
-
-# Absent again (normal mode)
-- name: NTP Server absent again (normal mode)
-  ucs_ntp_server: *ntp_server_absent
-  register: nm_ntp_server_absent_again
-
-# Verfiy absent
-- name: Verify NTP Server absent results
-  assert:
-    that:
-    - cm_ntp_server_absent.changed == nm_ntp_server_absent.changed == true
-    - cm_ntp_server_absent_again.changed == nm_ntp_server_absent_again.changed == false
diff --git a/test/integration/targets/ucs_org/aliases b/test/integration/targets/ucs_org/aliases
deleted file mode 100644
index 0689fba3e4..0000000000
--- a/test/integration/targets/ucs_org/aliases
+++ /dev/null
@@ -1,7 +0,0 @@
-# Not enabled, but can be used with the UCS Platform Emulator or UCS hardware.
-# Example integration_config.yml:
-# ---
-# ucs_hostname: 172.16.143.136
-# ucs_username: admin
-# ucs_password: password
-unsupported
diff --git a/test/integration/targets/ucs_org/tasks/main.yml b/test/integration/targets/ucs_org/tasks/main.yml
deleted file mode 100644
index 13c0294d29..0000000000
--- a/test/integration/targets/ucs_org/tasks/main.yml
+++ /dev/null
@@ -1,123 +0,0 @@
-# Test code for the UCS Org module
-# Copyright 2018, John McDonough (@movinalot)
-
-- name: Test that we have a UCS host, UCS username, and UCS password
-  fail:
-    msg: 'Please define the following variables: ucs_hostname, ucs_username and ucs_password.'
-  when: ucs_hostname is not defined or ucs_username is not defined or ucs_password is not defined
-  vars:
-    login_info: &login_info
-      <<: *login_info
-
-# Setup (clean environment)
-- name: org absent
-  ucs_org: &org_absent
-    <<: *login_info
-    org_name: testorg
-    state: absent
-
-
-# Test present (check_mode)
-- name: org present (check_mode)
-  ucs_org: &org_present
-    <<: *login_info
-    org_name: testorg
-  check_mode: yes
-  register: cm_org_present
-
-
-# Present (normal mode)
-- name: org present (normal mode)
-  ucs_org: *org_present
-  register: nm_org_present
-
-
-# Test present again (idempotent)
-- name: org present again (check_mode)
-  ucs_org: *org_present
-  check_mode: yes
-  register: cm_org_present_again
-
-
-# Present again (normal mode)
-- name: org present again (normal mode)
-  ucs_org: *org_present
-  register: nm_org_present_again
-
-
-# Verfiy present
-- name: Verify org present results
-  assert:
-    that:
-    - cm_org_present.changed == nm_org_present.changed == true
-    - cm_org_present_again.changed == nm_org_present_again.changed == false
-
-
-# Test change (check_mode)
-- name: org description change (check_mode)
-  ucs_org: &org_change
-    <<: *org_present
-    description: 'testorg'
-  check_mode: yes
-  register: cm_org_description_change
-
-
-# Change (normal mode)
-- name: org description change (normal mode)
-  ucs_org: *org_change
-  register: nm_org_description_change
-
-
-# Test change again (idempotent)
-- name: org description change again (check_mode)
-  ucs_org: *org_change
-  check_mode: yes
-  register: cm_org_description_change_again
-
-
-# Change again (normal mode)
-- name: org description change again (normal mode)
-  ucs_org: *org_change
-  register: nm_org_description_change_again
-
-
-# Verfiy change
-- name: Verify org change results
-  assert:
-    that:
-    - cm_org_description_change.changed == nm_org_description_change.changed == true
-    - cm_org_description_change_again.changed == nm_org_description_change_again.changed == false
-
-
-# Teardown (clean environment)
-- name: org absent (check_mode)
-  ucs_org: *org_absent
-  check_mode: yes
-  register: cm_org_absent
-
-
-# Absent (normal mode)
-- name: org absent (normal mode)
-  ucs_org: *org_absent
-  register: nm_org_absent
-
-
-# Test absent again (idempotent)
-- name: org absent again (check_mode)
-  ucs_org: *org_absent
-  check_mode: yes
-  register: cm_org_absent_again
-
-
-# Absent again (normal mode)
-- name: org absent again (normal mode)
-  ucs_org: *org_absent
-  register: nm_org_absent_again
-
-
-# Verfiy absent
-- name: Verify org absent results
-  assert:
-    that:
-    - cm_org_absent.changed == nm_org_absent.changed == true
-    - cm_org_absent_again.changed == nm_org_absent_again.changed == false
diff --git a/test/integration/targets/ucs_query/aliases b/test/integration/targets/ucs_query/aliases
deleted file mode 100644
index 0689fba3e4..0000000000
--- a/test/integration/targets/ucs_query/aliases
+++ /dev/null
@@ -1,7 +0,0 @@
-# Not enabled, but can be used with the UCS Platform Emulator or UCS hardware.
-# Example integration_config.yml:
-# ---
-# ucs_hostname: 172.16.143.136
-# ucs_username: admin
-# ucs_password: password
-unsupported
diff --git a/test/integration/targets/ucs_query/tasks/main.yml b/test/integration/targets/ucs_query/tasks/main.yml
deleted file mode 100644
index 87e453a633..0000000000
--- a/test/integration/targets/ucs_query/tasks/main.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-# Test code for the UCS Query module
-# Copyright 2019, John McDonough (@movinalot)
-
-- name: Test that we have a UCS host, UCS username, and UCS password
-  fail:
-    msg: 'Please define the following variables: ucs_hostname, ucs_username and ucs_password.'
-  when: ucs_hostname is not defined or ucs_username is not defined or ucs_password is not defined
-  vars:
-    login_info: &login_info
-      <<: *login_info
-
-# Query for Class ID
-- name: Query Class ID
-  ucs_query:
-    <<: *login_info
-    class_ids: computeBlade
-    delegate_to: localhost
-  register: single_class
-
-# Query for Class IDs
-- name: Query Class IDs
-  ucs_query:
-    <<: *login_info
-    class_ids: computeBlade, fabricVlan
-    delegate_to: localhost
-  register: multiple_classes
-
-# Query for Dn
-- name: Query Dn
-  ucs_query:
-    <<: *login_info
-    distinguished_names: org-root
-    delegate_to: localhost
-  register: single_dn
-
-# Query for Dn
-- name: Query Dns
-  ucs_query:
-    <<: *login_info
-    distinguished_names: org-root, sys/rack-unit-1, sys/chassis-1/blade-2
-    delegate_to: localhost
-  register: multiple_dns
diff --git a/test/integration/targets/ucs_san_connectivity/aliases b/test/integration/targets/ucs_san_connectivity/aliases
deleted file mode 100644
index 0689fba3e4..0000000000
--- a/test/integration/targets/ucs_san_connectivity/aliases
+++ /dev/null
@@ -1,7 +0,0 @@
-# Not enabled, but can be used with the UCS Platform Emulator or UCS hardware.
-# Example integration_config.yml:
-# ---
-# ucs_hostname: 172.16.143.136
-# ucs_username: admin
-# ucs_password: password
-unsupported
diff --git a/test/integration/targets/ucs_san_connectivity/tasks/main.yml b/test/integration/targets/ucs_san_connectivity/tasks/main.yml
deleted file mode 100644
index c237dd1c09..0000000000
--- a/test/integration/targets/ucs_san_connectivity/tasks/main.yml
+++ /dev/null
@@ -1,132 +0,0 @@
-# Test code for the UCS modules
-# Copyright 2017, David Soper (@dsoper2)
-
-- name: Test that we have a UCS host, UCS username, and UCS password
-  fail:
-    msg: 'Please define the following variables: ucs_hostname, ucs_username and ucs_password.'
-  when: ucs_hostname is not defined or ucs_username is not defined or ucs_password is not defined
-
-
-# Setup (clean environment)
-- name: SAN Connectivity Policies absent
-  ucs_san_connectivity: &san_connectivity_absent
-    hostname: "{{ ucs_hostname }}"
-    username: "{{ ucs_username }}"
-    password: "{{ ucs_password }}"
-    name: Cntr-FC-Boot
-    state: absent
-
-# Test present (check_mode)
-- name: SAN Connectivity Policies present (check_mode)
-  ucs_san_connectivity: &san_connectivity_present
-    hostname: "{{ ucs_hostname }}"
-    username: "{{ ucs_username }}"
-    password: "{{ ucs_password }}"
-    name: Cntr-FC-Boot
-    wwnn_pool: WWNN-Pool
-    vhba_list:
-    - name: Fabric-A
-      vhba_template: vHBA-Template-A
-      adapter_policy: Linux
-    - name: Fabric-B
-      vhba_template: vHBA-Template-B
-      adapter_policy: Linux
-  check_mode: yes
-  register: cm_san_connectivity_present
-
-
-# Present (normal mode)
-- name: SAN Connectivity Policies present (normal mode)
-  ucs_san_connectivity: *san_connectivity_present
-  register: nm_san_connectivity_present
-
-
-# Test present again (idempotent)
-- name: SAN Connectivity Policies present again (check_mode)
-  ucs_san_connectivity: *san_connectivity_present
-  check_mode: yes
-  register: cm_san_connectivity_present_again
-
-
-# Present again (normal mode)
-- name: SAN Connectivity Policies present again (normal mode)
-  ucs_san_connectivity: *san_connectivity_present
-  register: nm_san_connectivity_present_again
-
-
-# Verfiy present
-- name: Verify SAN Connectivity Policies present results
-  assert:
-    that:
-    - cm_san_connectivity_present.changed == nm_san_connectivity_present.changed == true
-    - cm_san_connectivity_present_again.changed == nm_san_connectivity_present_again.changed == false
-
-
-# Test change (check_mode)
-- name: SAN Connectivity Policies description change (check_mode)
-  ucs_san_connectivity: &san_connectivity_change
-    <<: *san_connectivity_present
-    descr: Testing Ansible
-  check_mode: yes
-  register: cm_san_connectivity_descr_change
-
-
-# Change (normal mode)
-- name: SAN Connectivity Policies description change (normal mode)
-  ucs_san_connectivity: *san_connectivity_change
-  register: nm_san_connectivity_descr_change
-
-
-# Test change again (idempotent)
-- name: SAN Connectivity Policies description again (check_mode)
-  ucs_san_connectivity: *san_connectivity_change
-  check_mode: yes
-  register: cm_san_connectivity_descr_change_again
-
-
-# Change again (normal mode)
-- name: SAN Connectivity Policies description change again (normal mode)
-  ucs_san_connectivity: *san_connectivity_change
-  register: nm_san_connectivity_descr_change_again
-
-
-# Verfiy change
-- name: Verify SAN Connectivity Policies change results
-  assert:
-    that:
-    - cm_san_connectivity_descr_change.changed == nm_san_connectivity_descr_change.changed == true
-    - cm_san_connectivity_descr_change_again.changed == nm_san_connectivity_descr_change_again.changed == false
-
-
-# Teardown (clean environment)
-- name: SAN Connectivity Policies absent (check_mode)
-  ucs_san_connectivity: *san_connectivity_absent
-  check_mode: yes
-  register: cm_san_connectivity_absent
-
-
-# Absent (normal mode)
-- name: SAN Connectivity Policies absent (normal mode)
-  ucs_san_connectivity: *san_connectivity_absent
-  register: nm_san_connectivity_absent
-
-
-# Test absent again (idempotent)
-- name: SAN Connectivity Policies absent again (check_mode)
-  ucs_san_connectivity: *san_connectivity_absent
-  check_mode: yes
-  register: cm_san_connectivity_absent_again
-
-
-# Absent again (normal mode)
-- name: SAN Connectivity Policies absent again (normal mode)
-  ucs_san_connectivity: *san_connectivity_absent
-  register: nm_san_connectivity_absent_again
-
-
-# Verfiy absent
-- name: Verify SAN Connectivity Policies absent results
-  assert:
-    that:
-    - cm_san_connectivity_absent.changed == nm_san_connectivity_absent.changed == true
-    - cm_san_connectivity_absent_again.changed == nm_san_connectivity_absent_again.changed == false
diff --git a/test/integration/targets/ucs_service_profile_template/aliases b/test/integration/targets/ucs_service_profile_template/aliases
deleted file mode 100644
index 0689fba3e4..0000000000
--- a/test/integration/targets/ucs_service_profile_template/aliases
+++ /dev/null
@@ -1,7 +0,0 @@
-# Not enabled, but can be used with the UCS Platform Emulator or UCS hardware.
-# Example integration_config.yml:
-# ---
-# ucs_hostname: 172.16.143.136
-# ucs_username: admin
-# ucs_password: password
-unsupported
diff --git a/test/integration/targets/ucs_service_profile_template/tasks/main.yml b/test/integration/targets/ucs_service_profile_template/tasks/main.yml
deleted file mode 100644
index cdc6bcb1e4..0000000000
--- a/test/integration/targets/ucs_service_profile_template/tasks/main.yml
+++ /dev/null
@@ -1,147 +0,0 @@
-# Test code for the UCS modules
-# Copyright 2018, David Soper (@dsoper2)
-
-- name: Test that we have a UCS host, UCS username, and UCS password
-  fail:
-    msg: 'Please define the following variables: ucs_hostname, ucs_username and ucs_password.'
-  when: ucs_hostname is not defined or ucs_username is not defined or ucs_password is not defined
-  vars:
-    login_info: &login_info
-      hostname: "{{ ucs_hostname }}"
-      username: "{{ ucs_username }}"
-      password: "{{ ucs_password }}"
-
-# Setup (clean environment)
-- name: Service Profile Template absent
-  ucs_service_profile_template: &service_profile_template_absent
-    <<: *login_info
-    name: DEE-Ctrl
-    state: absent
-
-
-# Test present (check_mode)
-- name: Service Profile Template present (check_mode)
-  ucs_service_profile_template: &service_profile_template_present
-    <<: *login_info
-    name: DEE-Ctrl
-    template_type: updating-template
-    uuid_pool: UUID-Pool
-    storage_profile: DEE-StgProf
-    lan_connectivity_policy: Cntr-FC-Boot
-    iqn_pool: iSCSI-Boot-A
-    san_connectivity_policy: Cntr-FC-Boot
-    boot_policy: DEE-vMedia
-    maintenance_policy: default
-    server_pool: Container-Pool
-    host_firmware_package: 3.1.2b
-    bios_policy: Docker
-  check_mode: yes
-  register: cm_service_profile_template_present
-
-
-# Present (normal mode)
-- name: Service Profile Template present (normal mode)
-  ucs_service_profile_template: *service_profile_template_present
-  register: nm_service_profile_template_present
-
-
-# Test present again (idempotent)
-- name: Service Profile Template present again (check_mode)
-  ucs_service_profile_template: *service_profile_template_present
-  check_mode: yes
-  register: cm_service_profile_template_present_again
-
-
-# Present again (normal mode)
-- name: Service Profile Template present again (normal mode)
-  ucs_service_profile_template: *service_profile_template_present
-  register: nm_service_profile_template_present_again
-
-
-# Verfiy present
-- name: Verify Service Profile Template present results
-  assert:
-    that:
-    - cm_service_profile_template_present.changed == nm_service_profile_template_present.changed == true
-    - cm_service_profile_template_present_again.changed == nm_service_profile_template_present_again.changed == false
-
-
-# Test change (check_mode)
-- name: Service Profile Template change (check_mode)
-  ucs_service_profile_template: &service_profile_template_change
-    <<: *login_info
-    name: DEE-Ctrl
-    template_type: updating-template
-    uuid_pool: UUID-Pool
-    storage_profile: DEE-StgProf
-    lan_connectivity_policy: Cntr-FC-Boot
-    iqn_pool: iSCSI-Boot-B
-    san_connectivity_policy: Cntr-FC-Boot
-    boot_policy: DEE-vMedia
-    maintenance_policy: default
-    server_pool: Container-Pool
-    host_firmware_package: 3.1.2b
-    bios_policy: Docker
-  check_mode: yes
-  register: cm_service_profile_template_change
-
-
-# Change (normal mode)
-- name: Service Profile Template change (normal mode)
-  ucs_service_profile_template: *service_profile_template_change
-  register: nm_service_profile_template_change
-
-
-# Test change again (idempotent)
-- name: Service Profile Template again (check_mode)
-  ucs_service_profile_template: *service_profile_template_change
-  check_mode: yes
-  register: cm_service_profile_template_change_again
-
-
-# Change again (normal mode)
-- name: Service Profile Template change again (normal mode)
-  ucs_service_profile_template: *service_profile_template_change
-  register: nm_service_profile_template_change_again
-
-
-# Verfiy change
-- name: Verify Service Profile Template change results
-  assert:
-    that:
-    - cm_service_profile_template_change.changed == nm_service_profile_template_change.changed == true
-    - cm_service_profile_template_change_again.changed == nm_service_profile_template_change_again.changed == false
-
-
-# Teardown (clean environment)
-- name: Service Profile Template absent (check_mode)
-  ucs_service_profile_template: *service_profile_template_absent
-  check_mode: yes
-  register: cm_service_profile_template_absent
-
-
-# Absent (normal mode)
-- name: Service Profile Template absent (normal mode)
-  ucs_service_profile_template: *service_profile_template_absent
-  register: nm_service_profile_template_absent
-
-
-# Test absent again (idempotent)
-- name: Service Profile Template absent again (check_mode)
-  ucs_service_profile_template: *service_profile_template_absent
-  check_mode: yes
-  register: cm_service_profile_template_absent_again
-
-
-# Absent again (normal mode)
-- name: Service Profile Template absent again (normal mode)
-  ucs_service_profile_template: *service_profile_template_absent
-  register: nm_service_profile_template_absent_again
-
-
-# Verfiy absent
-- name: Verify Service Profile Template absent results
-  assert:
-    that:
-    - cm_service_profile_template_absent.changed == nm_service_profile_template_absent.changed == true
-    - cm_service_profile_template_absent_again.changed == nm_service_profile_template_absent_again.changed == false
diff --git a/test/integration/targets/ucs_storage_profile/aliases b/test/integration/targets/ucs_storage_profile/aliases
deleted file mode 100644
index 0689fba3e4..0000000000
--- a/test/integration/targets/ucs_storage_profile/aliases
+++ /dev/null
@@ -1,7 +0,0 @@
-# Not enabled, but can be used with the UCS Platform Emulator or UCS hardware.
-# Example integration_config.yml:
-# ---
-# ucs_hostname: 172.16.143.136
-# ucs_username: admin
-# ucs_password: password
-unsupported
diff --git a/test/integration/targets/ucs_storage_profile/tasks/main.yml b/test/integration/targets/ucs_storage_profile/tasks/main.yml
deleted file mode 100644
index 7f576b8582..0000000000
--- a/test/integration/targets/ucs_storage_profile/tasks/main.yml
+++ /dev/null
@@ -1,138 +0,0 @@
-# Test code for the UCS modules
-# Copyright 2018, David Soper (@dsoper2)
-
-- name: Test that we have a UCS host, UCS username, and UCS password
-  fail:
-    msg: 'Please define the following variables: ucs_hostname, ucs_username and ucs_password.'
-  when: ucs_hostname is not defined or ucs_username is not defined or ucs_password is not defined
-  vars:
-    login_info: &login_info
-      hostname: "{{ ucs_hostname }}"
-      username: "{{ ucs_username }}"
-      password: "{{ ucs_password }}"
-
-# Setup (clean environment)
-- name: Storage Profile absent
-  ucs_storage_profile: &storage_profile_absent
-    <<: *login_info
-    name: DEE-StgProf
-    state: absent
-
-
-# Test present (check_mode)
-- name: Storage Profile present (check_mode)
-  ucs_storage_profile: &storage_profile_present
-    <<: *login_info
-    name: DEE-StgProf
-    local_luns:
-    - name: Boot-LUN
-      size: '60'
-      disk_policy_name: DEE-DG
-    - name: Data-LUN
-      size: '200'
-      disk_policy_name: DEE-DG
-  check_mode: yes
-  register: cm_storage_profile_present
-
-
-# Present (normal mode)
-- name: Storage Profile present (normal mode)
-  ucs_storage_profile: *storage_profile_present
-  register: nm_storage_profile_present
-
-
-# Test present again (idempotent)
-- name: Storage Profile present again (check_mode)
-  ucs_storage_profile: *storage_profile_present
-  check_mode: yes
-  register: cm_storage_profile_present_again
-
-
-# Present again (normal mode)
-- name: Storage Profile present again (normal mode)
-  ucs_storage_profile: *storage_profile_present
-  register: nm_storage_profile_present_again
-
-
-# Verfiy present
-- name: Verify Storage Profile present results
-  assert:
-    that:
-    - cm_storage_profile_present.changed == nm_storage_profile_present.changed == true
-    - cm_storage_profile_present_again.changed == nm_storage_profile_present_again.changed == false
-
-
-# Test change (check_mode)
-- name: Storage Profile change (check_mode)
-  ucs_storage_profile: &storage_profile_change
-    <<: *login_info
-    name: DEE-StgProf
-    local_luns:
-    - name: Boot-LUN
-      size: '60'
-      disk_policy_name: DEE-DG
-    - name: Data-LUN
-      state: absent
-  check_mode: yes
-  register: cm_storage_profile_change
-
-
-# Change (normal mode)
-- name: Storage Profile change (normal mode)
-  ucs_storage_profile: *storage_profile_change
-  register: nm_storage_profile_change
-
-
-# Test change again (idempotent)
-- name: Storage Profile again (check_mode)
-  ucs_storage_profile: *storage_profile_change
-  check_mode: yes
-  register: cm_storage_profile_change_again
-
-
-# Change again (normal mode)
-- name: Storage Profile change again (normal mode)
-  ucs_storage_profile: *storage_profile_change
-  register: nm_storage_profile_change_again
-
-
-# Verfiy change
-- name: Verify Storage Profile change results
-  assert:
-    that:
-    - cm_storage_profile_change.changed == nm_storage_profile_change.changed == true
-    - cm_storage_profile_change_again.changed == nm_storage_profile_change_again.changed == false
-
-
-# Teardown (clean environment)
-- name: Storage Profile absent (check_mode)
-  ucs_storage_profile: *storage_profile_absent
-  check_mode: yes
-  register: cm_storage_profile_absent
-
-
-# Absent (normal mode)
-- name: Storage Profile absent (normal mode)
-  ucs_storage_profile: *storage_profile_absent
-  register: nm_storage_profile_absent
-
-
-# Test absent again (idempotent)
-- name: Storage Profile absent again (check_mode)
-  ucs_storage_profile: *storage_profile_absent
-  check_mode: yes
-  register: cm_storage_profile_absent_again
-
-
-# Absent again (normal mode)
-- name: Storage Profile absent again (normal mode)
-  ucs_storage_profile: *storage_profile_absent
-  register: nm_storage_profile_absent_again
-
-
-# Verfiy absent
-- name: Verify Storage Profile absent results
-  assert:
-    that:
-    - cm_storage_profile_absent.changed == nm_storage_profile_absent.changed == true
-    - cm_storage_profile_absent_again.changed == nm_storage_profile_absent_again.changed == false
diff --git a/test/integration/targets/ucs_timezone/aliases b/test/integration/targets/ucs_timezone/aliases
deleted file mode 100644
index 16a714d47a..0000000000
--- a/test/integration/targets/ucs_timezone/aliases
+++ /dev/null
@@ -1,7 +0,0 @@
-# Not enabled, but can be used with the UCS Platform Emulator or UCS hardware.
-# Example integration_config.yml:
-# ---
-# ucs_hostname: 172.22.251.170
-# ucs_username: admin
-# ucs_password: password
-unsupported
\ No newline at end of file
diff --git a/test/integration/targets/ucs_timezone/tasks/main.yml b/test/integration/targets/ucs_timezone/tasks/main.yml
deleted file mode 100644
index c51aa202a5..0000000000
--- a/test/integration/targets/ucs_timezone/tasks/main.yml
+++ /dev/null
@@ -1,126 +0,0 @@
-# Test code for the UCS modules
-# Copyright 2018, John McDonough (@movinalot)
-
-- name: Test that we have a UCS host, UCS username, and UCS password
-  fail:
-    msg: 'Please define the following variables: ucs_hostname, ucs_username and ucs_password.'
-  when: ucs_hostname is not defined or ucs_username is not defined or ucs_password is not defined
-  vars:
-    login_info: &login_info
-      hostname: "{{ ucs_hostname }}"
-      username: "{{ ucs_username }}"
-      password: "{{ ucs_password }}"
-
-
-# Setup (clean environment)
-- name: Timezone absent
-  ucs_timezone: &timezone_absent
-    <<: *login_info
-    state: absent
-
-
-# Test present (check_mode)
-- name: Timezone present (check_mode)
-  ucs_timezone: &timezone_present
-    <<: *login_info
-    timezone: America/Los_Angeles
-    description: Timezone for America/Los_Angeles
-  check_mode: yes
-  register: cm_timezone_present
-
-
-# Present (normal mode)
-- name: Timezone present (normal mode)
-  ucs_timezone: *timezone_present
-  register: nm_timezone_present
-
-
-# Test present again (idempotent)
-- name: Timezone present again (check_mode)
-  ucs_timezone: *timezone_present
-  check_mode: yes
-  register: cm_timezone_present_again
-
-
-# Present again (normal mode)
-- name: Timezone present again (normal mode)
-  ucs_timezone: *timezone_present
-  register: nm_timezone_present_again
-
-
-# Verfiy present
-- name: Verify Timezone present results
-  assert:
-    that:
-    - cm_timezone_present.changed == nm_timezone_present.changed == true
-    - cm_timezone_present_again.changed == nm_timezone_present_again.changed == false
-
-
-# Test change (check_mode)
-- name: Timezone description change (check_mode)
-  ucs_timezone: &timezone_change
-    <<: *timezone_present
-    descr: Testing Ansible
-  check_mode: yes
-  register: cm_timezone_descr_change
-
-
-# Change (normal mode)
-- name: Timezone description change (normal mode)
-  ucs_timezone: *timezone_change
-  register: nm_timezone_descr_change
-
-
-# Test change again (idempotent)
-- name: Timezone description again (check_mode)
-  ucs_timezone: *timezone_change
-  check_mode: yes
-  register: cm_timezone_descr_change_again
-
-
-# Change again (normal mode)
-- name: Timezone description change again (normal mode)
-  ucs_timezone: *timezone_change
-  register: nm_timezone_descr_change_again
-
-
-# Verfiy change
-- name: Verify Timezone change results
-  assert:
-    that:
-    - cm_timezone_descr_change.changed == nm_timezone_descr_change.changed == true
-    - cm_timezone_descr_change_again.changed == nm_timezone_descr_change_again.changed == false
-
-
-# Teardown (clean environment)
-- name: Timezone absent (check_mode)
-  ucs_timezone: *timezone_absent
-  check_mode: yes
-  register: cm_timezone_absent
-
-
-# Absent (normal mode)
-- name: Timezone absent (normal mode)
-  ucs_timezone: *timezone_absent
-  register: nm_timezone_absent
-
-
-# Test absent again (idempotent)
-- name: Timezone absent again (check_mode)
-  ucs_timezone: *timezone_absent
-  check_mode: yes
-  register: cm_timezone_absent_again
-
-
-# Absent again (normal mode)
-- name: Timezone absent again (normal mode)
-  ucs_timezone: *timezone_absent
-  register: nm_timezone_absent_again
-
-
-# Verfiy absent
-- name: Verify Timezone absent results
-  assert:
-    that:
-    - cm_timezone_absent.changed == nm_timezone_absent.changed == true
-    - cm_timezone_absent_again.changed == nm_timezone_absent_again.changed == false
\ No newline at end of file
diff --git a/test/integration/targets/ucs_uuid_pool/aliases b/test/integration/targets/ucs_uuid_pool/aliases
deleted file mode 100644
index 0689fba3e4..0000000000
--- a/test/integration/targets/ucs_uuid_pool/aliases
+++ /dev/null
@@ -1,7 +0,0 @@
-# Not enabled, but can be used with the UCS Platform Emulator or UCS hardware.
-# Example integration_config.yml:
-# ---
-# ucs_hostname: 172.16.143.136
-# ucs_username: admin
-# ucs_password: password
-unsupported
diff --git a/test/integration/targets/ucs_uuid_pool/tasks/main.yml b/test/integration/targets/ucs_uuid_pool/tasks/main.yml
deleted file mode 100644
index 2ce54c82b7..0000000000
--- a/test/integration/targets/ucs_uuid_pool/tasks/main.yml
+++ /dev/null
@@ -1,128 +0,0 @@
-# Test code for the UCS modules
-# Copyright 2018, David Soper (@dsoper2)
-
-- name: Test that we have a UCS host, UCS username, and UCS password
-  fail:
-    msg: 'Please define the following variables: ucs_hostname, ucs_username and ucs_password.'
-  when: ucs_hostname is not defined or ucs_username is not defined or ucs_password is not defined
-  vars:
-    login_info: &login_info
-      hostname: "{{ ucs_hostname }}"
-      username: "{{ ucs_username }}"
-      password: "{{ ucs_password }}"
-
-# Setup (clean environment)
-- name: Server UUID Pools absent
-  ucs_uuid_pool: &uuid_pool_absent
-    <<: *login_info
-    name: UUID-Pool
-    state: absent
-
-
-# Test present (check_mode)
-- name: Server UUID Pools present (check_mode)
-  ucs_uuid_pool: &uuid_pool_present
-    <<: *login_info
-    name: UUID-Pool
-    order: sequential
-    first_uuid: 0000-000000000001
-    last_uuid: 0000-000000000078
-  check_mode: yes
-  register: cm_uuid_pool_present
-
-
-# Present (normal mode)
-- name: Server UUID Pools present (normal mode)
-  ucs_uuid_pool: *uuid_pool_present
-  register: nm_uuid_pool_present
-
-
-# Test present again (idempotent)
-- name: Server UUID Pools present again (check_mode)
-  ucs_uuid_pool: *uuid_pool_present
-  check_mode: yes
-  register: cm_uuid_pool_present_again
-
-
-# Present again (normal mode)
-- name: Server UUID Pools present again (normal mode)
-  ucs_uuid_pool: *uuid_pool_present
-  register: nm_uuid_pool_present_again
-
-
-# Verfiy present
-- name: Verify Server UUID Pools present results
-  assert:
-    that:
-    - cm_uuid_pool_present.changed == nm_uuid_pool_present.changed == true
-    - cm_uuid_pool_present_again.changed == nm_uuid_pool_present_again.changed == false
-
-
-# Test change (check_mode)
-- name: Server UUID Pools description change (check_mode)
-  ucs_uuid_pool: &uuid_pool_change
-    <<: *uuid_pool_present
-    descr: Testing Ansible
-  check_mode: yes
-  register: cm_uuid_pool_descr_change
-
-
-# Change (normal mode)
-- name: Server UUID Pools description change (normal mode)
-  ucs_uuid_pool: *uuid_pool_change
-  register: nm_uuid_pool_descr_change
-
-
-# Test change again (idempotent)
-- name: Server UUID Pools description again (check_mode)
-  ucs_uuid_pool: *uuid_pool_change
-  check_mode: yes
-  register: cm_uuid_pool_descr_change_again
-
-
-# Change again (normal mode)
-- name: Server UUID Pools description change again (normal mode)
-  ucs_uuid_pool: *uuid_pool_change
-  register: nm_uuid_pool_descr_change_again
-
-
-# Verfiy change
-- name: Verify Server UUID Pools change results
-  assert:
-    that:
-    - cm_uuid_pool_descr_change.changed == nm_uuid_pool_descr_change.changed == true
-    - cm_uuid_pool_descr_change_again.changed == nm_uuid_pool_descr_change_again.changed == false
-
-
-# Teardown (clean environment)
-- name: Server UUID Pools absent (check_mode)
-  ucs_uuid_pool: *uuid_pool_absent
-  check_mode: yes
-  register: cm_uuid_pool_absent
-
-
-# Absent (normal mode)
-- name: Server UUID Pools absent (normal mode)
-  ucs_uuid_pool: *uuid_pool_absent
-  register: nm_uuid_pool_absent
-
-
-# Test absent again (idempotent)
-- name: Server UUID Pools absent again (check_mode)
-  ucs_uuid_pool: *uuid_pool_absent
-  check_mode: yes
-  register: cm_uuid_pool_absent_again
-
-
-# Absent again (normal mode)
-- name: Server UUID Pools absent again (normal mode)
-  ucs_uuid_pool: *uuid_pool_absent
-  register: nm_uuid_pool_absent_again
-
-
-# Verfiy absent
-- name: Verify Server UUID Pools absent results
-  assert:
-    that:
-    - cm_uuid_pool_absent.changed == nm_uuid_pool_absent.changed == true
-    - cm_uuid_pool_absent_again.changed == nm_uuid_pool_absent_again.changed == false
diff --git a/test/integration/targets/ucs_vhba_template/aliases b/test/integration/targets/ucs_vhba_template/aliases
deleted file mode 100644
index 0689fba3e4..0000000000
--- a/test/integration/targets/ucs_vhba_template/aliases
+++ /dev/null
@@ -1,7 +0,0 @@
-# Not enabled, but can be used with the UCS Platform Emulator or UCS hardware.
-# Example integration_config.yml:
-# ---
-# ucs_hostname: 172.16.143.136
-# ucs_username: admin
-# ucs_password: password
-unsupported
diff --git a/test/integration/targets/ucs_vhba_template/tasks/main.yml b/test/integration/targets/ucs_vhba_template/tasks/main.yml
deleted file mode 100644
index abf46ba68f..0000000000
--- a/test/integration/targets/ucs_vhba_template/tasks/main.yml
+++ /dev/null
@@ -1,128 +0,0 @@
-# Test code for the UCS modules
-# Copyright 2017, David Soper (@dsoper2)
-
-- name: Test that we have a UCS host, UCS username, and UCS password
-  fail:
-    msg: 'Please define the following variables: ucs_hostname, ucs_username and ucs_password.'
-  when: ucs_hostname is not defined or ucs_username is not defined or ucs_password is not defined
-
-
-# Setup (clean environment)
-- name: vHBA templates absent
-  ucs_vhba_template: &vhba_templates_absent
-    hostname: "{{ ucs_hostname }}"
-    username: "{{ ucs_username }}"
-    password: "{{ ucs_password }}"
-    name: vHBA-A
-    state: absent
-
-
-# Test present (check_mode)
-- name: vHBA templates present (check_mode)
-  ucs_vhba_template: &vhba_templates_present
-    hostname: "{{ ucs_hostname }}"
-    username: "{{ ucs_username }}"
-    password: "{{ ucs_password }}"
-    name: vHBA-A
-    fabric: A
-    vsan: VSAN-A
-    wwpn_pool: WWPN-Pool-A
-  check_mode: yes
-  register: cm_vhba_templates_present
-
-
-# Present (normal mode)
-- name: vHBA templates present (normal mode)
-  ucs_vhba_template: *vhba_templates_present
-  register: nm_vhba_templates_present
-
-
-# Test present again (idempotent)
-- name: vHBA templates present again (check_mode)
-  ucs_vhba_template: *vhba_templates_present
-  check_mode: yes
-  register: cm_vhba_templates_present_again
-
-
-# Present again (normal mode)
-- name: vHBA templates present again (normal mode)
-  ucs_vhba_template: *vhba_templates_present
-  register: nm_vhba_templates_present_again
-
-
-# Verfiy present
-- name: Verify vHBA templates present results
-  assert:
-    that:
-    - cm_vhba_templates_present.changed == nm_vhba_templates_present.changed == true
-    - cm_vhba_templates_present_again.changed == nm_vhba_templates_present_again.changed == false
-
-
-# Test change (check_mode)
-- name: vHBA templates description change (check_mode)
-  ucs_vhba_template: &vhba_templates_change
-    <<: *vhba_templates_present
-    descr: Testing Ansible
-  check_mode: yes
-  register: cm_vhba_templates_descr_change
-
-
-# Change (normal mode)
-- name: vHBA templates description change (normal mode)
-  ucs_vhba_template: *vhba_templates_change
-  register: nm_vhba_templates_descr_change
-
-
-# Test change again (idempotent)
-- name: vHBA templates description again (check_mode)
-  ucs_vhba_template: *vhba_templates_change
-  check_mode: yes
-  register: cm_vhba_templates_descr_change_again
-
-
-# Change again (normal mode)
-- name: vHBA templates description change again (normal mode)
-  ucs_vhba_template: *vhba_templates_change
-  register: nm_vhba_templates_descr_change_again
-
-
-# Verfiy change
-- name: Verify vHBA templates change results
-  assert:
-    that:
-    - cm_vhba_templates_descr_change.changed == nm_vhba_templates_descr_change.changed == true
-    - cm_vhba_templates_descr_change_again.changed == nm_vhba_templates_descr_change_again.changed == false
-
-
-# Teardown (clean environment)
-- name: vHBA templates absent (check_mode)
-  ucs_vhba_template: *vhba_templates_absent
-  check_mode: yes
-  register: cm_vhba_templates_absent
-
-
-# Absent (normal mode)
-- name: vHBA templates absent (normal mode)
-  ucs_vhba_template: *vhba_templates_absent
-  register: nm_vhba_templates_absent
-
-
-# Test absent again (idempotent)
-- name: vHBA templates absent again (check_mode)
-  ucs_vhba_template: *vhba_templates_absent
-  check_mode: yes
-  register: cm_vhba_templates_absent_again
-
-
-# Absent again (normal mode)
-- name: vHBA templates absent again (normal mode)
-  ucs_vhba_template: *vhba_templates_absent
-  register: nm_vhba_templates_absent_again
-
-
-# Verfiy absent
-- name: Verify vHBA templates absent results
-  assert:
-    that:
-    - cm_vhba_templates_absent.changed == nm_vhba_templates_absent.changed == true
-    - cm_vhba_templates_absent_again.changed == nm_vhba_templates_absent_again.changed == false
diff --git a/test/integration/targets/ucs_vlans/aliases b/test/integration/targets/ucs_vlans/aliases
deleted file mode 100644
index 0689fba3e4..0000000000
--- a/test/integration/targets/ucs_vlans/aliases
+++ /dev/null
@@ -1,7 +0,0 @@
-# Not enabled, but can be used with the UCS Platform Emulator or UCS hardware.
-# Example integration_config.yml:
-# ---
-# ucs_hostname: 172.16.143.136
-# ucs_username: admin
-# ucs_password: password
-unsupported
diff --git a/test/integration/targets/ucs_vlans/tasks/main.yml b/test/integration/targets/ucs_vlans/tasks/main.yml
deleted file mode 100644
index 0b6b5cb842..0000000000
--- a/test/integration/targets/ucs_vlans/tasks/main.yml
+++ /dev/null
@@ -1,112 +0,0 @@
-# Test code for the UCS modules
-# Copyright 2017, David Soper (@dsoper2)
-
-- name: Test that we have a UCS host, UCS username, and UCS password
-  fail:
-    msg: 'Please define the following variables: ucs_hostname, ucs_username and ucs_password.'
-  when: ucs_hostname is not defined or ucs_username is not defined or ucs_password is not defined
-  vars:
-    login_info: &login_info
-      hostname: "{{ ucs_hostname }}"
-      username: "{{ ucs_username }}"
-      password: "{{ ucs_password }}"
-
-# Setup (clean environment)
-- name: VLANs absent
-  ucs_vlans: &vlans_absent
-    <<: *login_info
-    name: vlan2
-    state: absent
-
-# Test present (check_mode)
-- name: VLANs present (check_mode)
-  ucs_vlans: &vlans_present
-    <<: *login_info
-    name: vlan2
-    id: '2'
-    native: 'yes'
-  check_mode: yes
-  register: cm_vlans_present
-
-# Present (normal mode)
-- name: VLANs present (normal mode)
-  ucs_vlans: *vlans_present
-  register: nm_vlans_present
-
-# Test present again (idempotent)
-- name: VLANs present again (check_mode)
-  ucs_vlans: *vlans_present
-  check_mode: yes
-  register: cm_vlans_present_again
-
-# Present again (normal mode)
-- name: VLANs present again (normal mode)
-  ucs_vlans: *vlans_present
-  register: nm_vlans_present_again
-
-# Verfiy present
-- name: Verify VLANs present results
-  assert:
-    that:
-    - cm_vlans_present.changed == nm_vlans_present.changed == true
-    - cm_vlans_present_again.changed == nm_vlans_present_again.changed == false
-
-# Test change (check_mode)
-- name: VLANs VLAN change (check_mode)
-  ucs_vlans: &vlans_change
-    <<: *vlans_present
-    id: '20'
-  check_mode: yes
-  register: cm_vlans_vlan_change
-
-# Change (normal mode)
-- name: VLANs VLAN change (normal mode)
-  ucs_vlans: *vlans_change
-  register: nm_vlans_vlan_change
-
-# Test change again (idempotent)
-- name: VLANs VLAN change again (check_mode)
-  ucs_vlans: *vlans_change
-  check_mode: yes
-  register: cm_vlans_vlan_change_again
-
-# Change again (normal mode)
-- name: VLANs VLAN change again (normal mode)
-  ucs_vlans: *vlans_change
-  register: nm_vlans_vlan_change_again
-
-# Verfiy change
-- name: Verify VLANs change results
-  assert:
-    that:
-    - cm_vlans_vlan_change.changed == nm_vlans_vlan_change.changed == true
-    - cm_vlans_vlan_change_again.changed == nm_vlans_vlan_change_again.changed == false
-
-# Teardown (clean environment)
-- name: VLANs absent (check_mode)
-  ucs_vlans: *vlans_absent
-  check_mode: yes
-  register: cm_vlans_absent
-
-# Absent (normal mode)
-- name: VLANs absent (normal mode)
-  ucs_vlans: *vlans_absent
-  register: nm_vlans_absent
-
-# Test absent again (idempotent)
-- name: VLANs absent again (check_mode)
-  ucs_vlans: *vlans_absent
-  check_mode: yes
-  register: cm_vlans_absent_again
-
-# Absent again (normal mode)
-- name: VLANs absent again (normal mode)
-  ucs_vlans: *vlans_absent
-  register: nm_vlans_absent_again
-
-# Verfiy absent
-- name: Verify VLANs absent results
-  assert:
-    that:
-    - cm_vlans_absent.changed == nm_vlans_absent.changed == true
-    - cm_vlans_absent_again.changed == nm_vlans_absent_again.changed == false
diff --git a/test/integration/targets/ucs_vnic_template/aliases b/test/integration/targets/ucs_vnic_template/aliases
deleted file mode 100644
index 0689fba3e4..0000000000
--- a/test/integration/targets/ucs_vnic_template/aliases
+++ /dev/null
@@ -1,7 +0,0 @@
-# Not enabled, but can be used with the UCS Platform Emulator or UCS hardware.
-# Example integration_config.yml:
-# ---
-# ucs_hostname: 172.16.143.136
-# ucs_username: admin
-# ucs_password: password
-unsupported
diff --git a/test/integration/targets/ucs_vnic_template/tasks/main.yml b/test/integration/targets/ucs_vnic_template/tasks/main.yml
deleted file mode 100644
index 320f076dbd..0000000000
--- a/test/integration/targets/ucs_vnic_template/tasks/main.yml
+++ /dev/null
@@ -1,246 +0,0 @@
-# Test code for the UCS modules
-# Copyright 2017, David Soper (@dsoper2)
-
-- name: Test that we have a UCS host, UCS username, and UCS password
-  fail:
-    msg: 'Please define the following variables: ucs_hostname, ucs_username and ucs_password.'
-  when: ucs_hostname is not defined or ucs_username is not defined or ucs_password is not defined
-  vars:
-    login_info: &login_info
-      hostname: "{{ ucs_hostname }}"
-      username: "{{ ucs_username }}"
-      password: "{{ ucs_password }}"
-
-
-# Setup (clean environment)
-- name: vNIC template absent
-  ucs_vnic_template: &vnic_templates_absent
-    <<: *login_info
-    name: vNIC-A-B
-    state: absent
-
-- name: vNIC primary template absent
-  ucs_vnic_template: &vnic_primary_templates_absent
-    <<: *login_info
-    name: vNIC-A
-    state: absent
-
-- name: vNIC secondary template absent
-  ucs_vnic_template: &vnic_secondary_templates_absent
-    <<: *login_info
-    name: vNIC-B
-    state: absent
-
-
-# Test present (check_mode)
-- name: vNIC template present (check_mode)
-  ucs_vnic_template: &vnic_templates_present
-    <<: *login_info
-    name: vNIC-A-B
-    fabric: A-B
-    vlans_list:
-    - name: default
-      native: 'yes'
-    - name: 10
-  check_mode: yes
-  register: cm_vnic_templates_present
-
-- name: vNIC primary template present (check_mode)
-  ucs_vnic_template: &vnic_primary_templates_present
-    <<: *login_info
-    name: vNIC-A
-    fabric: A
-    redundancy_type: primary
-    peer_redundancy_templ: vNIC-B
-    template_type: updating-template
-    mtu: '9000'
-    mac_pool: MAC-Pool-A
-    network_control_policy: Enable-CDP-LLDP
-    vlans_list:
-    - name: default
-      native: 'yes'
-    - name: finance
-  check_mode: yes
-  register: cm_vnic_primary_templates_present
-
-- name: vNIC secondary template present (check_mode)
-  ucs_vnic_template: &vnic_secondary_templates_present
-    <<: *login_info
-    name: vNIC-B
-    fabric: B
-    redundancy_type: secondary
-    peer_redundancy_templ: vNIC-A
-    mac_pool: MAC-Pool-B
-  check_mode: yes
-  register: cm_vnic_secondary_templates_present
-
-
-# Present (normal mode)
-- name: vNIC template present (normal mode)
-  ucs_vnic_template: *vnic_templates_present
-  register: nm_vnic_templates_present
-
-- name: vNIC primary template present (normal mode)
-  ucs_vnic_template: *vnic_primary_templates_present
-  register: nm_vnic_primary_templates_present
-
-- name: vNIC secondary template present (normal mode)
-  ucs_vnic_template: *vnic_secondary_templates_present
-  register: nm_vnic_secondary_templates_present
-
-
-# Test present again (idempotent)
-- name: vNIC template present again (check_mode)
-  ucs_vnic_template: *vnic_templates_present
-  check_mode: yes
-  register: cm_vnic_templates_present_again
-
-- name: vNIC primary template present again (check_mode)
-  ucs_vnic_template: *vnic_primary_templates_present
-  check_mode: yes
-  register: cm_vnic_primary_templates_present_again
-
-- name: vNIC secondary template present again (check_mode)
-  ucs_vnic_template: *vnic_secondary_templates_present
-  check_mode: yes
-  register: cm_vnic_secondary_templates_present_again
-
-
-# Present again (normal mode)
-- name: vNIC template present again (normal mode)
-  ucs_vnic_template: *vnic_templates_present
-  register: nm_vnic_templates_present_again
-
-- name: vNIC primary template present again (normal mode)
-  ucs_vnic_template: *vnic_primary_templates_present
-  register: nm_vnic_primary_templates_present_again
-
-- name: vNIC secondary template present again (normal mode)
-  ucs_vnic_template: *vnic_secondary_templates_present
-  register: nm_vnic_secondary_templates_present_again
-
-
-# Verfiy present
-- name: Verify vNIC template present results
-  assert:
-    that:
-    - cm_vnic_templates_present.changed == nm_vnic_templates_present.changed == true
-    - cm_vnic_templates_present_again.changed == nm_vnic_templates_present_again.changed == false
-    - cm_vnic_primary_templates_present.changed == nm_vnic_primary_templates_present.changed == true
-    - cm_vnic_primary_templates_present_again.changed == nm_vnic_primary_templates_present_again.changed == false
-    - cm_vnic_secondary_templates_present.changed == nm_vnic_secondary_templates_present.changed == true
-    - cm_vnic_secondary_templates_present_again.changed == nm_vnic_secondary_templates_present_again.changed == false
-
-
-# Test change (check_mode)
-- name: vNIC template change (check_mode)
-  ucs_vnic_template: &vnic_templates_change
-    <<: *vnic_templates_present
-    vlans_list:
-    - name: default
-      native: 'yes'
-    - name: 10
-      state: absent
-  check_mode: yes
-  register: cm_vnic_templates_change
-
-
-# Change (normal mode)
-- name: vNIC template change (normal mode)
-  ucs_vnic_template: *vnic_templates_change
-  register: nm_vnic_templates_change
-
-
-# Test change again (idempotent)
-- name: vNIC template change again (check_mode)
-  ucs_vnic_template: *vnic_templates_change
-  check_mode: yes
-  register: cm_vnic_templates_change_again
-
-
-# Change again (normal mode)
-- name: vNIC template change again (normal mode)
-  ucs_vnic_template: *vnic_templates_change
-  register: nm_vnic_templates_change_again
-
-
-# Verfiy change
-- name: Verify vNIC template change results
-  assert:
-    that:
-    - cm_vnic_templates_change.changed == nm_vnic_templates_change.changed == true
-    - cm_vnic_templates_change_again.changed == nm_vnic_templates_change_again.changed == false
-
-
-# Teardown (clean environment)
-- name: vNIC template absent (check_mode)
-  ucs_vnic_template: *vnic_templates_absent
-  check_mode: yes
-  register: cm_vnic_templates_absent
-
-- name: vNIC primary template absent (check_mode)
-  ucs_vnic_template: *vnic_primary_templates_absent
-  check_mode: yes
-  register: cm_vnic_primary_templates_absent
-
-- name: vNIC secondary template absent (check_mode)
-  ucs_vnic_template: *vnic_secondary_templates_absent
-  check_mode: yes
-  register: cm_vnic_secondary_templates_absent
-
-
-# Absent (normal mode)
-- name: vNIC template absent (normal mode)
-  ucs_vnic_template: *vnic_templates_absent
-  register: nm_vnic_templates_absent
-
-- name: vNIC primary template absent (normal mode)
-  ucs_vnic_template: *vnic_primary_templates_absent
-  register: nm_vnic_primary_templates_absent
-
-- name: vNIC secondary template absent (normal mode)
-  ucs_vnic_template: *vnic_secondary_templates_absent
-  register: nm_vnic_secondary_templates_absent
-
-
-# Test absent again (idempotent)
-- name: vNIC template absent again (check_mode)
-  ucs_vnic_template: *vnic_templates_absent
-  check_mode: yes
-  register: cm_vnic_templates_absent_again
-
-- name: vNIC primary template absent again (check_mode)
-  ucs_vnic_template: *vnic_primary_templates_absent
-  check_mode: yes
-  register: cm_vnic_primary_templates_absent_again
-
-- name: vNIC secondary template absent again (check_mode)
-  ucs_vnic_template: *vnic_secondary_templates_absent
-  check_mode: yes
-  register: cm_vnic_secondary_templates_absent_again
-
-
-# Absent again (normal mode)
-- name: vNIC template absent again (normal mode)
-  ucs_vnic_template: *vnic_templates_absent
-  register: nm_vnic_templates_absent_again
-
-- name: vNIC primary template absent again (normal mode)
-  ucs_vnic_template: *vnic_primary_templates_absent
-  register: nm_vnic_primary_templates_absent_again
-
-- name: vNIC secondary template absent again (normal mode)
-  ucs_vnic_template: *vnic_secondary_templates_absent
-  register: nm_vnic_secondary_templates_absent_again
-
-
-# Verfiy absent
-- name: Verify vNIC template absent results
-  assert:
-    that:
-    - cm_vnic_templates_absent.changed == nm_vnic_templates_absent.changed == true
-    - cm_vnic_templates_absent_again.changed == nm_vnic_templates_absent_again.changed == false
-    - cm_vnic_primary_templates_absent.changed == nm_vnic_primary_templates_absent.changed == true
-    - cm_vnic_primary_templates_absent_again.changed == nm_vnic_primary_templates_absent_again.changed == false
-    - cm_vnic_secondary_templates_absent.changed == nm_vnic_secondary_templates_absent.changed == true
-    - cm_vnic_secondary_templates_absent_again.changed == nm_vnic_secondary_templates_absent_again.changed == false
diff --git a/test/integration/targets/ucs_vsans/aliases b/test/integration/targets/ucs_vsans/aliases
deleted file mode 100644
index 0689fba3e4..0000000000
--- a/test/integration/targets/ucs_vsans/aliases
+++ /dev/null
@@ -1,7 +0,0 @@
-# Not enabled, but can be used with the UCS Platform Emulator or UCS hardware.
-# Example integration_config.yml:
-# ---
-# ucs_hostname: 172.16.143.136
-# ucs_username: admin
-# ucs_password: password
-unsupported
diff --git a/test/integration/targets/ucs_vsans/tasks/main.yml b/test/integration/targets/ucs_vsans/tasks/main.yml
deleted file mode 100644
index a1469ca92c..0000000000
--- a/test/integration/targets/ucs_vsans/tasks/main.yml
+++ /dev/null
@@ -1,127 +0,0 @@
-# Test code for the UCS modules
-# Copyright 2017, David Soper (@dsoper2)
-
-- name: Test that we have a UCS host, UCS username, and UCS password
-  fail:
-    msg: 'Please define the following variables: ucs_hostname, ucs_username and ucs_password.'
-  when: ucs_hostname is not defined or ucs_username is not defined or ucs_password is not defined
-
-
-# Setup (clean environment)
-- name: VSANs absent
-  ucs_vsans: &vsans_absent
-    hostname: "{{ ucs_hostname }}"
-    username: "{{ ucs_username }}"
-    password: "{{ ucs_password }}"
-    name: vsan110
-    state: absent
-
-
-# Test present (check_mode)
-- name: VSANs present (check_mode)
-  ucs_vsans: &vsans_present
-    hostname: "{{ ucs_hostname }}"
-    username: "{{ ucs_username }}"
-    password: "{{ ucs_password }}"
-    name: vsan110
-    vsan_id: '110'
-    vlan_id: '110'
-  check_mode: yes
-  register: cm_vsans_present
-
-
-# Present (normal mode)
-- name: VSANs present (normal mode)
-  ucs_vsans: *vsans_present
-  register: nm_vsans_present
-
-
-# Test present again (idempotent)
-- name: VSANs present again (check_mode)
-  ucs_vsans: *vsans_present
-  check_mode: yes
-  register: cm_vsans_present_again
-
-
-# Present again (normal mode)
-- name: VSANs present again (normal mode)
-  ucs_vsans: *vsans_present
-  register: nm_vsans_present_again
-
-
-# Verfiy present
-- name: Verify VSANs present results
-  assert:
-    that:
-    - cm_vsans_present.changed == nm_vsans_present.changed == true
-    - cm_vsans_present_again.changed == nm_vsans_present_again.changed == false
-
-
-# Test change (check_mode)
-- name: VSANs VLAN change (check_mode)
-  ucs_vsans: &vsans_change
-    <<: *vsans_present
-    vlan_id: '10'
-  check_mode: yes
-  register: cm_vsans_vlan_change
-
-
-# Change (normal mode)
-- name: VSANs VLAN change (normal mode)
-  ucs_vsans: *vsans_change
-  register: nm_vsans_vlan_change
-
-
-# Test change again (idempotent)
-- name: VSANs VLAN change again (check_mode)
-  ucs_vsans: *vsans_change
-  check_mode: yes
-  register: cm_vsans_vlan_change_again
-
-
-# Change again (normal mode)
-- name: VSANs VLAN change again (normal mode)
-  ucs_vsans: *vsans_change
-  register: nm_vsans_vlan_change_again
-
-
-# Verfiy change
-- name: Verify VSANs change results
-  assert:
-    that:
-    - cm_vsans_vlan_change.changed == nm_vsans_vlan_change.changed == true
-    - cm_vsans_vlan_change_again.changed == nm_vsans_vlan_change_again.changed == false
-
-
-# Teardown (clean environment)
-- name: VSANs absent (check_mode)
-  ucs_vsans: *vsans_absent
-  check_mode: yes
-  register: cm_vsans_absent
-
-
-# Absent (normal mode)
-- name: VSANs absent (normal mode)
-  ucs_vsans: *vsans_absent
-  register: nm_vsans_absent
-
-
-# Test absent again (idempotent)
-- name: VSANs absent again (check_mode)
-  ucs_vsans: *vsans_absent
-  check_mode: yes
-  register: cm_vsans_absent_again
-
-
-# Absent again (normal mode)
-- name: VSANs absent again (normal mode)
-  ucs_vsans: *vsans_absent
-  register: nm_vsans_absent_again
-
-
-# Verfiy absent
-- name: Verify VSANs absent results
-  assert:
-    that:
-    - cm_vsans_absent.changed == nm_vsans_absent.changed == true
-    - cm_vsans_absent_again.changed == nm_vsans_absent_again.changed == false
diff --git a/test/integration/targets/ucs_wwn_pool/aliases b/test/integration/targets/ucs_wwn_pool/aliases
deleted file mode 100644
index 0689fba3e4..0000000000
--- a/test/integration/targets/ucs_wwn_pool/aliases
+++ /dev/null
@@ -1,7 +0,0 @@
-# Not enabled, but can be used with the UCS Platform Emulator or UCS hardware.
-# Example integration_config.yml:
-# ---
-# ucs_hostname: 172.16.143.136
-# ucs_username: admin
-# ucs_password: password
-unsupported
diff --git a/test/integration/targets/ucs_wwn_pool/tasks/main.yml b/test/integration/targets/ucs_wwn_pool/tasks/main.yml
deleted file mode 100644
index f380a3efe4..0000000000
--- a/test/integration/targets/ucs_wwn_pool/tasks/main.yml
+++ /dev/null
@@ -1,129 +0,0 @@
-# Test code for the UCS modules
-# Copyright 2017, David Soper (@dsoper2)
-
-- name: Test that we have a UCS host, UCS username, and UCS password
-  fail:
-    msg: 'Please define the following variables: ucs_hostname, ucs_username and ucs_password.'
-  when: ucs_hostname is not defined or ucs_username is not defined or ucs_password is not defined
-
-
-# Setup (clean environment)
-- name: WWNN/WWPN Pools absent
-  ucs_wwn_pool: &wwn_pool_absent
-    hostname: "{{ ucs_hostname }}"
-    username: "{{ ucs_username }}"
-    password: "{{ ucs_password }}"
-    name: WWPN-Pool-A
-    state: absent
-
-
-# Test present (check_mode)
-- name: WWNN/WWPN Pools present (check_mode)
-  ucs_wwn_pool: &wwn_pool_present
-    hostname: "{{ ucs_hostname }}"
-    username: "{{ ucs_username }}"
-    password: "{{ ucs_password }}"
-    name: WWPN-Pool-A
-    purpose: port
-    order: sequential
-    first_addr: 20:00:00:25:B5:48:0A:00
-    last_addr: 20:00:00:25:B5:48:0A:0F
-  check_mode: yes
-  register: cm_wwn_pool_present
-
-
-# Present (normal mode)
-- name: WWNN/WWPN Pools present (normal mode)
-  ucs_wwn_pool: *wwn_pool_present
-  register: nm_wwn_pool_present
-
-
-# Test present again (idempotent)
-- name: WWNN/WWPN Pools present again (check_mode)
-  ucs_wwn_pool: *wwn_pool_present
-  check_mode: yes
-  register: cm_wwn_pool_present_again
-
-
-# Present again (normal mode)
-- name: WWNN/WWPN Pools present again (normal mode)
-  ucs_wwn_pool: *wwn_pool_present
-  register: nm_wwn_pool_present_again
-
-
-# Verfiy present
-- name: Verify WWNN/WWPN Pools present results
-  assert:
-    that:
-    - cm_wwn_pool_present.changed == nm_wwn_pool_present.changed == true
-    - cm_wwn_pool_present_again.changed == nm_wwn_pool_present_again.changed == false
-
-
-# Test change (check_mode)
-- name: WWNN/WWPN Pools description change (check_mode)
-  ucs_wwn_pool: &wwn_pool_change
-    <<: *wwn_pool_present
-    descr: Testing Ansible
-  check_mode: yes
-  register: cm_wwn_pool_descr_change
-
-
-# Change (normal mode)
-- name: WWNN/WWPN Pools description change (normal mode)
-  ucs_wwn_pool: *wwn_pool_change
-  register: nm_wwn_pool_descr_change
-
-
-# Test change again (idempotent)
-- name: WWNN/WWPN Pools description again (check_mode)
-  ucs_wwn_pool: *wwn_pool_change
-  check_mode: yes
-  register: cm_wwn_pool_descr_change_again
-
-
-# Change again (normal mode)
-- name: WWNN/WWPN Pools description change again (normal mode)
-  ucs_wwn_pool: *wwn_pool_change
-  register: nm_wwn_pool_descr_change_again
-
-
-# Verfiy change
-- name: Verify WWNN/WWPN Pools change results
-  assert:
-    that:
-    - cm_wwn_pool_descr_change.changed == nm_wwn_pool_descr_change.changed == true
-    - cm_wwn_pool_descr_change_again.changed == nm_wwn_pool_descr_change_again.changed == false
-
-
-# Teardown (clean environment)
-- name: WWNN/WWPN Pools absent (check_mode)
-  ucs_wwn_pool: *wwn_pool_absent
-  check_mode: yes
-  register: cm_wwn_pool_absent
-
-
-# Absent (normal mode)
-- name: WWNN/WWPN Pools absent (normal mode)
-  ucs_wwn_pool: *wwn_pool_absent
-  register: nm_wwn_pool_absent
-
-
-# Test absent again (idempotent)
-- name: WWNN/WWPN Pools absent again (check_mode)
-  ucs_wwn_pool: *wwn_pool_absent
-  check_mode: yes
-  register: cm_wwn_pool_absent_again
-
-
-# Absent again (normal mode)
-- name: WWNN/WWPN Pools absent again (normal mode)
-  ucs_wwn_pool: *wwn_pool_absent
-  register: nm_wwn_pool_absent_again
-
-
-# Verfiy absent
-- name: Verify WWNN/WWPN Pools absent results
-  assert:
-    that:
-    - cm_wwn_pool_absent.changed == nm_wwn_pool_absent.changed == true
-    - cm_wwn_pool_absent_again.changed == nm_wwn_pool_absent_again.changed == false
diff --git a/test/sanity/ignore.txt b/test/sanity/ignore.txt
index 2ff18a9d6a..6064efe478 100644
--- a/test/sanity/ignore.txt
+++ b/test/sanity/ignore.txt
@@ -121,8 +121,6 @@ lib/ansible/module_utils/powershell/Ansible.ModuleUtils.LinkUtil.psm1 pslint:PSU
 lib/ansible/module_utils/pycompat24.py future-import-boilerplate
 lib/ansible/module_utils/pycompat24.py metaclass-boilerplate
 lib/ansible/module_utils/pycompat24.py no-get-exception
-lib/ansible/module_utils/remote_management/ucs.py future-import-boilerplate
-lib/ansible/module_utils/remote_management/ucs.py metaclass-boilerplate
 lib/ansible/module_utils/service.py future-import-boilerplate
 lib/ansible/module_utils/service.py metaclass-boilerplate
 lib/ansible/module_utils/six/__init__.py empty-init # breaks namespacing, bundled, do not override
@@ -2118,52 +2116,6 @@ lib/ansible/modules/remote_management/cpm/cpm_serial_port_info.py validate-modul
 lib/ansible/modules/remote_management/cpm/cpm_serial_port_info.py validate-modules:parameter-type-not-in-doc
 lib/ansible/modules/remote_management/cpm/cpm_user.py validate-modules:doc-missing-type
 lib/ansible/modules/remote_management/cpm/cpm_user.py validate-modules:parameter-type-not-in-doc
-lib/ansible/modules/remote_management/ucs/ucs_disk_group_policy.py validate-modules:doc-choices-do-not-match-spec
-lib/ansible/modules/remote_management/ucs/ucs_disk_group_policy.py validate-modules:doc-default-does-not-match-spec
-lib/ansible/modules/remote_management/ucs/ucs_disk_group_policy.py validate-modules:doc-elements-mismatch
-lib/ansible/modules/remote_management/ucs/ucs_disk_group_policy.py validate-modules:doc-required-mismatch
-lib/ansible/modules/remote_management/ucs/ucs_disk_group_policy.py validate-modules:nonexistent-parameter-documented
-lib/ansible/modules/remote_management/ucs/ucs_disk_group_policy.py validate-modules:parameter-type-not-in-doc
-lib/ansible/modules/remote_management/ucs/ucs_ip_pool.py validate-modules:parameter-type-not-in-doc
-lib/ansible/modules/remote_management/ucs/ucs_lan_connectivity.py validate-modules:doc-elements-mismatch
-lib/ansible/modules/remote_management/ucs/ucs_lan_connectivity.py validate-modules:parameter-type-not-in-doc
-lib/ansible/modules/remote_management/ucs/ucs_mac_pool.py validate-modules:parameter-type-not-in-doc
-lib/ansible/modules/remote_management/ucs/ucs_managed_objects.py validate-modules:doc-elements-mismatch
-lib/ansible/modules/remote_management/ucs/ucs_managed_objects.py validate-modules:parameter-list-no-elements
-lib/ansible/modules/remote_management/ucs/ucs_managed_objects.py validate-modules:parameter-type-not-in-doc
-lib/ansible/modules/remote_management/ucs/ucs_managed_objects.py validate-modules:undocumented-parameter
-lib/ansible/modules/remote_management/ucs/ucs_ntp_server.py validate-modules:parameter-type-not-in-doc
-lib/ansible/modules/remote_management/ucs/ucs_san_connectivity.py validate-modules:doc-required-mismatch
-lib/ansible/modules/remote_management/ucs/ucs_san_connectivity.py validate-modules:nonexistent-parameter-documented
-lib/ansible/modules/remote_management/ucs/ucs_san_connectivity.py validate-modules:parameter-list-no-elements
-lib/ansible/modules/remote_management/ucs/ucs_san_connectivity.py validate-modules:parameter-type-not-in-doc
-lib/ansible/modules/remote_management/ucs/ucs_san_connectivity.py validate-modules:undocumented-parameter
-lib/ansible/modules/remote_management/ucs/ucs_service_profile_template.py validate-modules:parameter-type-not-in-doc
-lib/ansible/modules/remote_management/ucs/ucs_storage_profile.py validate-modules:doc-choices-do-not-match-spec
-lib/ansible/modules/remote_management/ucs/ucs_storage_profile.py validate-modules:doc-elements-mismatch
-lib/ansible/modules/remote_management/ucs/ucs_storage_profile.py validate-modules:doc-type-does-not-match-spec
-lib/ansible/modules/remote_management/ucs/ucs_storage_profile.py validate-modules:parameter-type-not-in-doc
-lib/ansible/modules/remote_management/ucs/ucs_timezone.py validate-modules:parameter-type-not-in-doc
-lib/ansible/modules/remote_management/ucs/ucs_uuid_pool.py validate-modules:parameter-type-not-in-doc
-lib/ansible/modules/remote_management/ucs/ucs_vhba_template.py validate-modules:doc-required-mismatch
-lib/ansible/modules/remote_management/ucs/ucs_vhba_template.py validate-modules:nonexistent-parameter-documented
-lib/ansible/modules/remote_management/ucs/ucs_vhba_template.py validate-modules:parameter-list-no-elements
-lib/ansible/modules/remote_management/ucs/ucs_vhba_template.py validate-modules:parameter-type-not-in-doc
-lib/ansible/modules/remote_management/ucs/ucs_vhba_template.py validate-modules:undocumented-parameter
-lib/ansible/modules/remote_management/ucs/ucs_vlans.py validate-modules:doc-required-mismatch
-lib/ansible/modules/remote_management/ucs/ucs_vlans.py validate-modules:parameter-type-not-in-doc
-lib/ansible/modules/remote_management/ucs/ucs_vnic_template.py validate-modules:doc-choices-do-not-match-spec
-lib/ansible/modules/remote_management/ucs/ucs_vnic_template.py validate-modules:parameter-list-no-elements
-lib/ansible/modules/remote_management/ucs/ucs_vnic_template.py validate-modules:parameter-type-not-in-doc
-lib/ansible/modules/remote_management/ucs/ucs_vsans.py validate-modules:doc-required-mismatch
-lib/ansible/modules/remote_management/ucs/ucs_vsans.py validate-modules:parameter-list-no-elements
-lib/ansible/modules/remote_management/ucs/ucs_vsans.py validate-modules:parameter-type-not-in-doc
-lib/ansible/modules/remote_management/ucs/ucs_vsans.py validate-modules:undocumented-parameter
-lib/ansible/modules/remote_management/ucs/ucs_wwn_pool.py validate-modules:doc-required-mismatch
-lib/ansible/modules/remote_management/ucs/ucs_wwn_pool.py validate-modules:nonexistent-parameter-documented
-lib/ansible/modules/remote_management/ucs/ucs_wwn_pool.py validate-modules:parameter-list-no-elements
-lib/ansible/modules/remote_management/ucs/ucs_wwn_pool.py validate-modules:parameter-type-not-in-doc
-lib/ansible/modules/remote_management/ucs/ucs_wwn_pool.py validate-modules:undocumented-parameter
 lib/ansible/modules/source_control/git.py pylint:blacklisted-name
 lib/ansible/modules/source_control/git.py use-argspec-type-path
 lib/ansible/modules/source_control/git.py validate-modules:doc-missing-type
@@ -2349,8 +2301,6 @@ lib/ansible/plugins/doc_fragments/skydive.py future-import-boilerplate
 lib/ansible/plugins/doc_fragments/skydive.py metaclass-boilerplate
 lib/ansible/plugins/doc_fragments/tower.py future-import-boilerplate
 lib/ansible/plugins/doc_fragments/tower.py metaclass-boilerplate
-lib/ansible/plugins/doc_fragments/ucs.py future-import-boilerplate
-lib/ansible/plugins/doc_fragments/ucs.py metaclass-boilerplate
 lib/ansible/plugins/doc_fragments/url.py future-import-boilerplate
 lib/ansible/plugins/doc_fragments/url.py metaclass-boilerplate
 lib/ansible/plugins/doc_fragments/validate.py future-import-boilerplate