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

@@ -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

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

tests/requirements.yml

@@ -9,4 +9,4 @@ unit_tests_dependencies:
 - cisco.intersight
 - community.kubernetes
 - google.cloud
-- ovirt.ovirt_collection
+- ovirt.ovirt

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