From 1625429f745a795fb103a1e91f7b0b87acf869be Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Wed, 8 Apr 2020 12:32:36 +0200
Subject: [PATCH] Adjust name of ovirt dependency (#132)

* Adjust name of ovirt dependency.

* Fix module imports.

* Add ovirt.ovirt dependency with version 1.0.0 (released today).
---
 galaxy.yml                                                   | 4 ++--
 plugins/modules/cloud/ovirt/ovirt_affinity_label_facts.py    | 4 ++--
 plugins/modules/cloud/ovirt/ovirt_api_facts.py               | 4 ++--
 plugins/modules/cloud/ovirt/ovirt_cluster_facts.py           | 4 ++--
 plugins/modules/cloud/ovirt/ovirt_datacenter_facts.py        | 4 ++--
 plugins/modules/cloud/ovirt/ovirt_disk_facts.py              | 4 ++--
 plugins/modules/cloud/ovirt/ovirt_event_facts.py             | 4 ++--
 plugins/modules/cloud/ovirt/ovirt_external_provider_facts.py | 4 ++--
 plugins/modules/cloud/ovirt/ovirt_group_facts.py             | 4 ++--
 plugins/modules/cloud/ovirt/ovirt_host_facts.py              | 4 ++--
 plugins/modules/cloud/ovirt/ovirt_host_storage_facts.py      | 4 ++--
 plugins/modules/cloud/ovirt/ovirt_network_facts.py           | 4 ++--
 plugins/modules/cloud/ovirt/ovirt_nic_facts.py               | 4 ++--
 plugins/modules/cloud/ovirt/ovirt_permission_facts.py        | 4 ++--
 plugins/modules/cloud/ovirt/ovirt_quota_facts.py             | 4 ++--
 plugins/modules/cloud/ovirt/ovirt_scheduling_policy_facts.py | 4 ++--
 plugins/modules/cloud/ovirt/ovirt_snapshot_facts.py          | 4 ++--
 plugins/modules/cloud/ovirt/ovirt_storage_domain_facts.py    | 4 ++--
 plugins/modules/cloud/ovirt/ovirt_storage_template_facts.py  | 4 ++--
 plugins/modules/cloud/ovirt/ovirt_storage_vm_facts.py        | 4 ++--
 plugins/modules/cloud/ovirt/ovirt_tag_facts.py               | 4 ++--
 plugins/modules/cloud/ovirt/ovirt_template_facts.py          | 4 ++--
 plugins/modules/cloud/ovirt/ovirt_user_facts.py              | 4 ++--
 plugins/modules/cloud/ovirt/ovirt_vm_facts.py                | 4 ++--
 plugins/modules/cloud/ovirt/ovirt_vmpool_facts.py            | 4 ++--
 tests/requirements.yml                                       | 2 +-
 tests/utils/shippable/shippable.sh                           | 2 +-
 27 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/galaxy.yml b/galaxy.yml
index 9831f1cb41..2e4a54aaa4 100644
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -9,13 +9,13 @@ license: GPL-3.0-or-later
 license_file: COPYING
 tags: null
 # NOTE: No more dependencies can be added to this list
-#dependencies:
+dependencies:
 #  ansible.netcommon: '>=0.1.0'
 #  ansible.posix: '>=0.1.0'
 #  cisco.intersight: '>=0.1.0'
 #  community.kubernetes: '>=0.1.0'
 #  google.cloud: '>=0.1.0'
-#  ovirt.ovirt_collection: '>=0.1.0'
+  ovirt.ovirt: '>=1.0.0'
 repository: https://github.com/ansible-collections/community.general
 documentation: https://github.com/ansible-collection-migration/community.general/tree/master/docs
 homepage: https://github.com/ansible-collections/community.general
diff --git a/plugins/modules/cloud/ovirt/ovirt_affinity_label_facts.py b/plugins/modules/cloud/ovirt/ovirt_affinity_label_facts.py
index 1afd6d722b..dac9ac0dce 100644
--- a/plugins/modules/cloud/ovirt/ovirt_affinity_label_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_affinity_label_facts.py
@@ -55,7 +55,7 @@ options:
       description:
         - "Name of the host, which affinity labels should be listed."
 extends_documentation_fragment:
-- ovirt.ovirt_collection.ovirt_info
+- ovirt.ovirt.ovirt_info
 
 '''
 
@@ -109,7 +109,7 @@ import traceback
 
 from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import (
+from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import (
     check_sdk,
     create_connection,
     get_dict_of_struct,
diff --git a/plugins/modules/cloud/ovirt/ovirt_api_facts.py b/plugins/modules/cloud/ovirt/ovirt_api_facts.py
index 4d005f8fe8..494c2ac5a9 100644
--- a/plugins/modules/cloud/ovirt/ovirt_api_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_api_facts.py
@@ -32,7 +32,7 @@ notes:
        which contains a information about oVirt/RHV API. You need to register the result with
        the I(register) keyword to use it."
 extends_documentation_fragment:
-- ovirt.ovirt_collection.ovirt_info
+- ovirt.ovirt.ovirt_info
 
 '''
 
@@ -61,7 +61,7 @@ import traceback
 
 from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import (
+from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import (
     check_sdk,
     create_connection,
     get_dict_of_struct,
diff --git a/plugins/modules/cloud/ovirt/ovirt_cluster_facts.py b/plugins/modules/cloud/ovirt/ovirt_cluster_facts.py
index db1018e098..0fa0ca37a2 100644
--- a/plugins/modules/cloud/ovirt/ovirt_cluster_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_cluster_facts.py
@@ -51,7 +51,7 @@ options:
         - "For example to search cluster X from datacenter Y use following pattern:
            name=X and datacenter=Y"
 extends_documentation_fragment:
-- ovirt.ovirt_collection.ovirt_info
+- ovirt.ovirt.ovirt_info
 
 '''
 
@@ -80,7 +80,7 @@ import traceback
 
 from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import (
+from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import (
     check_sdk,
     create_connection,
     get_dict_of_struct,
diff --git a/plugins/modules/cloud/ovirt/ovirt_datacenter_facts.py b/plugins/modules/cloud/ovirt/ovirt_datacenter_facts.py
index ce43b5f0e8..677aa21950 100644
--- a/plugins/modules/cloud/ovirt/ovirt_datacenter_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_datacenter_facts.py
@@ -35,7 +35,7 @@ options:
         - "Search term which is accepted by oVirt/RHV search backend."
         - "For example to search datacenter I(X) use following pattern: I(name=X)"
 extends_documentation_fragment:
-- ovirt.ovirt_collection.ovirt_info
+- ovirt.ovirt.ovirt_info
 
 '''
 
@@ -63,7 +63,7 @@ import traceback
 
 from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import (
+from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import (
     check_sdk,
     create_connection,
     get_dict_of_struct,
diff --git a/plugins/modules/cloud/ovirt/ovirt_disk_facts.py b/plugins/modules/cloud/ovirt/ovirt_disk_facts.py
index 541260690e..c8d119254d 100644
--- a/plugins/modules/cloud/ovirt/ovirt_disk_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_disk_facts.py
@@ -51,7 +51,7 @@ options:
         - "For example to search Disk X from storage Y use following pattern:
            name=X and storage.name=Y"
 extends_documentation_fragment:
-- ovirt.ovirt_collection.ovirt_info
+- ovirt.ovirt.ovirt_info
 
 '''
 
@@ -79,7 +79,7 @@ import traceback
 
 from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import (
+from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import (
     check_sdk,
     create_connection,
     get_dict_of_struct,
diff --git a/plugins/modules/cloud/ovirt/ovirt_event_facts.py b/plugins/modules/cloud/ovirt/ovirt_event_facts.py
index feebf779a1..f328d3bf71 100644
--- a/plugins/modules/cloud/ovirt/ovirt_event_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_event_facts.py
@@ -74,7 +74,7 @@ options:
         default: true
         type: bool
 extends_documentation_fragment:
-- ovirt.ovirt_collection.ovirt_info
+- ovirt.ovirt.ovirt_info
 
 '''
 
@@ -112,7 +112,7 @@ import traceback
 
 from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import (
+from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import (
     check_sdk,
     create_connection,
     get_dict_of_struct,
diff --git a/plugins/modules/cloud/ovirt/ovirt_external_provider_facts.py b/plugins/modules/cloud/ovirt/ovirt_external_provider_facts.py
index 7c7a665d40..bcbc1c8a96 100644
--- a/plugins/modules/cloud/ovirt/ovirt_external_provider_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_external_provider_facts.py
@@ -54,7 +54,7 @@ options:
         description:
             - "Name of the external provider, can be used as glob expression."
 extends_documentation_fragment:
-- ovirt.ovirt_collection.ovirt_info
+- ovirt.ovirt.ovirt_info
 
 '''
 
@@ -92,7 +92,7 @@ import traceback
 
 from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import (
+from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import (
     check_sdk,
     create_connection,
     get_dict_of_struct,
diff --git a/plugins/modules/cloud/ovirt/ovirt_group_facts.py b/plugins/modules/cloud/ovirt/ovirt_group_facts.py
index 4eb8d7272e..b4160b93ad 100644
--- a/plugins/modules/cloud/ovirt/ovirt_group_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_group_facts.py
@@ -50,7 +50,7 @@ options:
         - "Search term which is accepted by oVirt/RHV search backend."
         - "For example to search group X use following pattern: name=X"
 extends_documentation_fragment:
-- ovirt.ovirt_collection.ovirt_info
+- ovirt.ovirt.ovirt_info
 
 '''
 
@@ -78,7 +78,7 @@ import traceback
 
 from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import (
+from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import (
     check_sdk,
     create_connection,
     get_dict_of_struct,
diff --git a/plugins/modules/cloud/ovirt/ovirt_host_facts.py b/plugins/modules/cloud/ovirt/ovirt_host_facts.py
index 06755d80e4..606f26a07b 100644
--- a/plugins/modules/cloud/ovirt/ovirt_host_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_host_facts.py
@@ -47,7 +47,7 @@ options:
       type: str
 
 extends_documentation_fragment:
-- ovirt.ovirt_collection.ovirt_info
+- ovirt.ovirt.ovirt_info
 
 '''
 
@@ -83,7 +83,7 @@ import traceback
 
 from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import (
+from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import (
     check_sdk,
     create_connection,
     get_dict_of_struct,
diff --git a/plugins/modules/cloud/ovirt/ovirt_host_storage_facts.py b/plugins/modules/cloud/ovirt/ovirt_host_storage_facts.py
index 022af94e16..5fdc0d19e7 100644
--- a/plugins/modules/cloud/ovirt/ovirt_host_storage_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_host_storage_facts.py
@@ -62,7 +62,7 @@ options:
                 description:
                   - "LUN id."
 extends_documentation_fragment:
-- ovirt.ovirt_collection.ovirt_info
+- ovirt.ovirt.ovirt_info
 
 '''
 
@@ -98,7 +98,7 @@ except ImportError:
 
 from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import (
+from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import (
     check_sdk,
     create_connection,
     get_dict_of_struct,
diff --git a/plugins/modules/cloud/ovirt/ovirt_network_facts.py b/plugins/modules/cloud/ovirt/ovirt_network_facts.py
index e2731de2e8..f0a9134ebe 100644
--- a/plugins/modules/cloud/ovirt/ovirt_network_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_network_facts.py
@@ -50,7 +50,7 @@ options:
         - "Search term which is accepted by oVirt/RHV search backend."
         - "For example to search network starting with string vlan1 use: name=vlan1*"
 extends_documentation_fragment:
-- ovirt.ovirt_collection.ovirt_info
+- ovirt.ovirt.ovirt_info
 
 '''
 
@@ -80,7 +80,7 @@ import traceback
 
 from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import (
+from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import (
     check_sdk,
     create_connection,
     get_dict_of_struct,
diff --git a/plugins/modules/cloud/ovirt/ovirt_nic_facts.py b/plugins/modules/cloud/ovirt/ovirt_nic_facts.py
index 872ad64b93..d445ddbe70 100644
--- a/plugins/modules/cloud/ovirt/ovirt_nic_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_nic_facts.py
@@ -53,7 +53,7 @@ options:
         description:
             - "Name of the NIC, can be used as glob expression."
 extends_documentation_fragment:
-- ovirt.ovirt_collection.ovirt_info
+- ovirt.ovirt.ovirt_info
 
 '''
 
@@ -83,7 +83,7 @@ import traceback
 
 from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import (
+from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import (
     check_sdk,
     create_connection,
     get_dict_of_struct,
diff --git a/plugins/modules/cloud/ovirt/ovirt_permission_facts.py b/plugins/modules/cloud/ovirt/ovirt_permission_facts.py
index 507cb5c988..4e29d61449 100644
--- a/plugins/modules/cloud/ovirt/ovirt_permission_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_permission_facts.py
@@ -61,7 +61,7 @@ options:
             - "Namespace of the authorization provider, where user/group resides."
         required: false
 extends_documentation_fragment:
-- ovirt.ovirt_collection.ovirt_info
+- ovirt.ovirt.ovirt_info
 
 '''
 
@@ -95,7 +95,7 @@ except ImportError:
 
 from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import (
+from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import (
     check_sdk,
     create_connection,
     get_link_name,
diff --git a/plugins/modules/cloud/ovirt/ovirt_quota_facts.py b/plugins/modules/cloud/ovirt/ovirt_quota_facts.py
index c6ed3fa127..9d2a349dff 100644
--- a/plugins/modules/cloud/ovirt/ovirt_quota_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_quota_facts.py
@@ -53,7 +53,7 @@ options:
         description:
             - "Name of the quota, can be used as glob expression."
 extends_documentation_fragment:
-- ovirt.ovirt_collection.ovirt_info
+- ovirt.ovirt.ovirt_info
 
 '''
 
@@ -83,7 +83,7 @@ import traceback
 
 from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import (
+from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import (
     check_sdk,
     create_connection,
     get_dict_of_struct,
diff --git a/plugins/modules/cloud/ovirt/ovirt_scheduling_policy_facts.py b/plugins/modules/cloud/ovirt/ovirt_scheduling_policy_facts.py
index ddecba5508..988b38aecd 100644
--- a/plugins/modules/cloud/ovirt/ovirt_scheduling_policy_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_scheduling_policy_facts.py
@@ -53,7 +53,7 @@ options:
         description:
             - "Name of the scheduling policy, can be used as glob expression."
 extends_documentation_fragment:
-- ovirt.ovirt_collection.ovirt_info
+- ovirt.ovirt.ovirt_info
 
 '''
 
@@ -84,7 +84,7 @@ import traceback
 
 from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import (
+from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import (
     check_sdk,
     create_connection,
     get_dict_of_struct,
diff --git a/plugins/modules/cloud/ovirt/ovirt_snapshot_facts.py b/plugins/modules/cloud/ovirt/ovirt_snapshot_facts.py
index 1a27d05358..8bf4e69cc9 100644
--- a/plugins/modules/cloud/ovirt/ovirt_snapshot_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_snapshot_facts.py
@@ -41,7 +41,7 @@ options:
         description:
             - "Id of the snapshot we want to retrieve information about."
 extends_documentation_fragment:
-- ovirt.ovirt_collection.ovirt_info
+- ovirt.ovirt.ovirt_info
 
 '''
 
@@ -72,7 +72,7 @@ import traceback
 
 from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import (
+from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import (
     check_sdk,
     create_connection,
     get_dict_of_struct,
diff --git a/plugins/modules/cloud/ovirt/ovirt_storage_domain_facts.py b/plugins/modules/cloud/ovirt/ovirt_storage_domain_facts.py
index f90225acf5..dd42ffe4fd 100644
--- a/plugins/modules/cloud/ovirt/ovirt_storage_domain_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_storage_domain_facts.py
@@ -51,7 +51,7 @@ options:
         - "For example to search storage domain X from datacenter Y use following pattern:
            name=X and datacenter=Y"
 extends_documentation_fragment:
-- ovirt.ovirt_collection.ovirt_info
+- ovirt.ovirt.ovirt_info
 
 '''
 
@@ -80,7 +80,7 @@ import traceback
 
 from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import (
+from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import (
     check_sdk,
     create_connection,
     get_dict_of_struct,
diff --git a/plugins/modules/cloud/ovirt/ovirt_storage_template_facts.py b/plugins/modules/cloud/ovirt/ovirt_storage_template_facts.py
index a7d7d07195..9bcc856cc2 100644
--- a/plugins/modules/cloud/ovirt/ovirt_storage_template_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_storage_template_facts.py
@@ -58,7 +58,7 @@ options:
         description:
             - "The storage domain name where the templates should be listed."
 extends_documentation_fragment:
-- ovirt.ovirt_collection.ovirt_info
+- ovirt.ovirt.ovirt_info
 
 '''
 
@@ -87,7 +87,7 @@ import traceback
 
 from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import (
+from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import (
     check_sdk,
     create_connection,
     get_dict_of_struct,
diff --git a/plugins/modules/cloud/ovirt/ovirt_storage_vm_facts.py b/plugins/modules/cloud/ovirt/ovirt_storage_vm_facts.py
index 617b382300..399a6727f2 100644
--- a/plugins/modules/cloud/ovirt/ovirt_storage_vm_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_storage_vm_facts.py
@@ -58,7 +58,7 @@ options:
         description:
             - "The storage domain name where the virtual machines should be listed."
 extends_documentation_fragment:
-- ovirt.ovirt_collection.ovirt_info
+- ovirt.ovirt.ovirt_info
 
 '''
 
@@ -87,7 +87,7 @@ import traceback
 
 from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import (
+from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import (
     check_sdk,
     create_connection,
     get_dict_of_struct,
diff --git a/plugins/modules/cloud/ovirt/ovirt_tag_facts.py b/plugins/modules/cloud/ovirt/ovirt_tag_facts.py
index 7cf8f40a65..05f97f69a9 100644
--- a/plugins/modules/cloud/ovirt/ovirt_tag_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_tag_facts.py
@@ -55,7 +55,7 @@ options:
       description:
         - "Name of the host, which tags should be listed."
 extends_documentation_fragment:
-- ovirt.ovirt_collection.ovirt_info
+- ovirt.ovirt.ovirt_info
 
 '''
 
@@ -98,7 +98,7 @@ import traceback
 
 from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import (
+from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import (
     check_sdk,
     create_connection,
     get_dict_of_struct,
diff --git a/plugins/modules/cloud/ovirt/ovirt_template_facts.py b/plugins/modules/cloud/ovirt/ovirt_template_facts.py
index 6975b798dc..31a9d2d1d8 100644
--- a/plugins/modules/cloud/ovirt/ovirt_template_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_template_facts.py
@@ -51,7 +51,7 @@ options:
         - "For example to search template X from datacenter Y use following pattern:
            name=X and datacenter=Y"
 extends_documentation_fragment:
-- ovirt.ovirt_collection.ovirt_info
+- ovirt.ovirt.ovirt_info
 
 '''
 
@@ -80,7 +80,7 @@ import traceback
 
 from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import (
+from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import (
     check_sdk,
     create_connection,
     get_dict_of_struct,
diff --git a/plugins/modules/cloud/ovirt/ovirt_user_facts.py b/plugins/modules/cloud/ovirt/ovirt_user_facts.py
index 5e3259fbb9..03f4ce6634 100644
--- a/plugins/modules/cloud/ovirt/ovirt_user_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_user_facts.py
@@ -50,7 +50,7 @@ options:
         - "Search term which is accepted by oVirt/RHV search backend."
         - "For example to search user X use following pattern: name=X"
 extends_documentation_fragment:
-- ovirt.ovirt_collection.ovirt_info
+- ovirt.ovirt.ovirt_info
 
 '''
 
@@ -78,7 +78,7 @@ import traceback
 
 from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import (
+from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import (
     check_sdk,
     create_connection,
     get_dict_of_struct,
diff --git a/plugins/modules/cloud/ovirt/ovirt_vm_facts.py b/plugins/modules/cloud/ovirt/ovirt_vm_facts.py
index 471924f7a5..9dd7c26fb0 100644
--- a/plugins/modules/cloud/ovirt/ovirt_vm_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_vm_facts.py
@@ -70,7 +70,7 @@ options:
            effect when the virtual machine is restarted. By default the value is set by engine."
       type: bool
 extends_documentation_fragment:
-- ovirt.ovirt_collection.ovirt_info
+- ovirt.ovirt.ovirt_info
 
 '''
 
@@ -107,7 +107,7 @@ import traceback
 
 from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import (
+from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import (
     check_sdk,
     create_connection,
     get_dict_of_struct,
diff --git a/plugins/modules/cloud/ovirt/ovirt_vmpool_facts.py b/plugins/modules/cloud/ovirt/ovirt_vmpool_facts.py
index 466c86b803..e59b4073fd 100644
--- a/plugins/modules/cloud/ovirt/ovirt_vmpool_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_vmpool_facts.py
@@ -50,7 +50,7 @@ options:
         - "Search term which is accepted by oVirt/RHV search backend."
         - "For example to search vmpool X: name=X"
 extends_documentation_fragment:
-- ovirt.ovirt_collection.ovirt_info
+- ovirt.ovirt.ovirt_info
 
 '''
 
@@ -78,7 +78,7 @@ import traceback
 
 from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import (
+from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import (
     check_sdk,
     create_connection,
     get_dict_of_struct,
diff --git a/tests/requirements.yml b/tests/requirements.yml
index c7181c78a1..79e0f11761 100644
--- a/tests/requirements.yml
+++ b/tests/requirements.yml
@@ -9,4 +9,4 @@ unit_tests_dependencies:
 - cisco.intersight
 - community.kubernetes
 - google.cloud
-- ovirt.ovirt_collection
+- ovirt.ovirt
diff --git a/tests/utils/shippable/shippable.sh b/tests/utils/shippable/shippable.sh
index 11355b290b..c942c69f9d 100755
--- a/tests/utils/shippable/shippable.sh
+++ b/tests/utils/shippable/shippable.sh
@@ -61,7 +61,7 @@ retry ansible-galaxy -vvv collection install cisco.intersight
 retry ansible-galaxy -vvv collection install community.crypto
 retry ansible-galaxy -vvv collection install community.kubernetes
 retry ansible-galaxy -vvv collection install google.cloud
-retry ansible-galaxy -vvv collection install ovirt.ovirt_collection
+retry ansible-galaxy -vvv collection install ovirt.ovirt
 
 # END: HACK