Remove programming error which prevents modules to work with devel. (#2381) (#2382)

(cherry picked from commit d9524bae93)

Co-authored-by: Felix Fontein <felix@fontein.de>

changelogs/fragments/ovirt-fixup.yml

@@ -0,0 +1,2 @@
+bugfixes:
+- "ovirt* modules - remove bad unnecessary import for current ansible-core development version (https://github.com/ansible-collections/community.general/pull/2381)."

plugins/modules/cloud/misc/ovirt.py

@@ -243,7 +243,6 @@ except ImportError:
     HAS_OVIRTSDK = False
 
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.common.removed import removed_module
 
 
 # ------------------------------------------------------------------- #

plugins/modules/cloud/ovirt/ovirt_affinity_label_facts.py

@@ -111,7 +111,6 @@ ovirt_affinity_labels:
 import fnmatch
 import traceback
 
-from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.community.general.plugins.module_utils._ovirt import (
     check_sdk,

plugins/modules/cloud/ovirt/ovirt_api_facts.py

@@ -52,7 +52,6 @@ ovirt_api:
 
 import traceback
 
-from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.community.general.plugins.module_utils._ovirt import (
     check_sdk,

plugins/modules/cloud/ovirt/ovirt_cluster_facts.py

@@ -73,7 +73,6 @@ ovirt_clusters:
 
 import traceback
 
-from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.community.general.plugins.module_utils._ovirt import (
     check_sdk,

plugins/modules/cloud/ovirt/ovirt_datacenter_facts.py

@@ -56,7 +56,6 @@ ovirt_datacenters:
 
 import traceback
 
-from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.community.general.plugins.module_utils._ovirt import (
     check_sdk,

plugins/modules/cloud/ovirt/ovirt_disk_facts.py

@@ -72,7 +72,6 @@ ovirt_disks:
 
 import traceback
 
-from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.community.general.plugins.module_utils._ovirt import (
     check_sdk,

plugins/modules/cloud/ovirt/ovirt_event_facts.py

@@ -103,7 +103,6 @@ ovirt_events:
 
 import traceback
 
-from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.community.general.plugins.module_utils._ovirt import (
     check_sdk,

plugins/modules/cloud/ovirt/ovirt_external_provider_facts.py

@@ -87,7 +87,6 @@ ovirt_external_providers:
 import fnmatch
 import traceback
 
-from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.community.general.plugins.module_utils._ovirt import (
     check_sdk,

plugins/modules/cloud/ovirt/ovirt_group_facts.py

@@ -71,7 +71,6 @@ ovirt_groups:
 
 import traceback
 
-from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.community.general.plugins.module_utils._ovirt import (
     check_sdk,

plugins/modules/cloud/ovirt/ovirt_host_facts.py

@@ -78,7 +78,6 @@ ovirt_hosts:
 
 import traceback
 
-from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.community.general.plugins.module_utils._ovirt import (
     check_sdk,

plugins/modules/cloud/ovirt/ovirt_host_storage_facts.py

@@ -92,7 +92,6 @@ try:
 except ImportError:
     pass
 
-from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.community.general.plugins.module_utils._ovirt import (
     check_sdk,

plugins/modules/cloud/ovirt/ovirt_network_facts.py

@@ -73,7 +73,6 @@ ovirt_networks:
 
 import traceback
 
-from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.community.general.plugins.module_utils._ovirt import (
     check_sdk,

plugins/modules/cloud/ovirt/ovirt_nic_facts.py

@@ -76,7 +76,6 @@ ovirt_nics:
 import fnmatch
 import traceback
 
-from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.community.general.plugins.module_utils._ovirt import (
     check_sdk,

plugins/modules/cloud/ovirt/ovirt_permission_facts.py

@@ -88,7 +88,6 @@ try:
 except ImportError:
     pass
 
-from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.community.general.plugins.module_utils._ovirt import (
     check_sdk,

plugins/modules/cloud/ovirt/ovirt_quota_facts.py

@@ -76,7 +76,6 @@ ovirt_quotas:
 import fnmatch
 import traceback
 
-from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.community.general.plugins.module_utils._ovirt import (
     check_sdk,

plugins/modules/cloud/ovirt/ovirt_snapshot_facts.py

@@ -65,7 +65,6 @@ ovirt_snapshots:
 import fnmatch
 import traceback
 
-from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.community.general.plugins.module_utils._ovirt import (
     check_sdk,

plugins/modules/cloud/ovirt/ovirt_storage_domain_facts.py

@@ -74,7 +74,6 @@ ovirt_storage_domains:
 
 import traceback
 
-from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.community.general.plugins.module_utils._ovirt import (
     check_sdk,

plugins/modules/cloud/ovirt/ovirt_storage_template_facts.py

@@ -79,7 +79,6 @@ ovirt_storage_templates:
 
 import traceback
 
-from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.community.general.plugins.module_utils._ovirt import (
     check_sdk,

plugins/modules/cloud/ovirt/ovirt_storage_vm_facts.py

@@ -79,7 +79,6 @@ ovirt_storage_vms:
 
 import traceback
 
-from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.community.general.plugins.module_utils._ovirt import (
     check_sdk,

plugins/modules/cloud/ovirt/ovirt_tag_facts.py

@@ -95,7 +95,6 @@ ovirt_tags:
 import fnmatch
 import traceback
 
-from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.community.general.plugins.module_utils._ovirt import (
     check_sdk,

plugins/modules/cloud/ovirt/ovirt_template_facts.py

@@ -72,7 +72,6 @@ ovirt_templates:
 
 import traceback
 
-from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.community.general.plugins.module_utils._ovirt import (
     check_sdk,

plugins/modules/cloud/ovirt/ovirt_user_facts.py

@@ -71,7 +71,6 @@ ovirt_users:
 
 import traceback
 
-from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.community.general.plugins.module_utils._ovirt import (
     check_sdk,

plugins/modules/cloud/ovirt/ovirt_vm_facts.py

@@ -102,7 +102,6 @@ ovirt_vms:
 
 import traceback
 
-from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.community.general.plugins.module_utils._ovirt import (
     check_sdk,

plugins/modules/cloud/ovirt/ovirt_vmpool_facts.py

@@ -71,7 +71,6 @@ ovirt_vm_pools:
 
 import traceback
 
-from ansible.module_utils.common.removed import removed_module
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.community.general.plugins.module_utils._ovirt import (
     check_sdk,