From e364d717cb952217df92585b82bdd2b04af7f649 Mon Sep 17 00:00:00 2001 From: Abhijeet Kasurde Date: Thu, 9 Aug 2018 10:34:55 +0530 Subject: [PATCH] VMware: remove unused imports (#43804) Idea taken from https://github.com/ansible/ansible/pull/43402 Signed-off-by: Abhijeet Kasurde --- contrib/inventory/vmware_inventory.py | 7 +++---- lib/ansible/modules/cloud/vmware/vcenter_folder.py | 2 +- lib/ansible/modules/cloud/vmware/vcenter_license.py | 2 +- lib/ansible/modules/cloud/vmware/vmware_cfg_backup.py | 2 +- .../modules/cloud/vmware/vmware_datastore_cluster.py | 5 ----- lib/ansible/modules/cloud/vmware/vmware_drs_rule_facts.py | 2 +- lib/ansible/modules/cloud/vmware/vmware_guest.py | 2 -- lib/ansible/modules/cloud/vmware/vmware_guest_facts.py | 6 ------ lib/ansible/modules/cloud/vmware/vmware_guest_move.py | 8 +------- lib/ansible/modules/cloud/vmware/vmware_guest_snapshot.py | 1 - .../modules/cloud/vmware/vmware_guest_tools_wait.py | 7 ------- .../modules/cloud/vmware/vmware_host_acceptance.py | 2 +- lib/ansible/modules/cloud/vmware/vmware_host_facts.py | 2 +- .../modules/cloud/vmware/vmware_host_firewall_manager.py | 2 +- lib/ansible/modules/cloud/vmware/vmware_host_lockdown.py | 2 +- lib/ansible/modules/cloud/vmware/vmware_host_ntp.py | 2 +- .../modules/cloud/vmware/vmware_host_powerstate.py | 5 ----- .../modules/cloud/vmware/vmware_local_user_facts.py | 5 ----- .../modules/cloud/vmware/vmware_resource_pool_facts.py | 2 +- .../modules/cloud/vmware/vmware_target_canonical_facts.py | 5 ----- lib/ansible/modules/cloud/vmware/vmware_vm_facts.py | 2 +- 21 files changed, 15 insertions(+), 58 deletions(-) diff --git a/contrib/inventory/vmware_inventory.py b/contrib/inventory/vmware_inventory.py index 844abab4d90..310194e1647 100755 --- a/contrib/inventory/vmware_inventory.py +++ b/contrib/inventory/vmware_inventory.py @@ -9,7 +9,7 @@ # TODO: # * more jq examples -# * optional folder heriarchy +# * optional folder hierarchy """ $ jq '._meta.hostvars[].config' data.json | head @@ -38,9 +38,8 @@ import sys import uuid from time import time -import six from jinja2 import Environment -from six import integer_types, string_types +from six import integer_types, PY3 from six.moves import configparser try: @@ -235,7 +234,7 @@ class VMWareInventory(object): 'groupby_custom_field': False} } - if six.PY3: + if PY3: config = configparser.ConfigParser() else: config = configparser.SafeConfigParser() diff --git a/lib/ansible/modules/cloud/vmware/vcenter_folder.py b/lib/ansible/modules/cloud/vmware/vcenter_folder.py index 9f1fb757b6a..717539b05b1 100644 --- a/lib/ansible/modules/cloud/vmware/vcenter_folder.py +++ b/lib/ansible/modules/cloud/vmware/vcenter_folder.py @@ -128,7 +128,7 @@ result: ''' try: - from pyVmomi import vim, vmodl + from pyVmomi import vim except ImportError as e: pass diff --git a/lib/ansible/modules/cloud/vmware/vcenter_license.py b/lib/ansible/modules/cloud/vmware/vcenter_license.py index 3142f57aa71..71d4b586a88 100644 --- a/lib/ansible/modules/cloud/vmware/vcenter_license.py +++ b/lib/ansible/modules/cloud/vmware/vcenter_license.py @@ -77,7 +77,7 @@ licenses: ''' try: - from pyVmomi import vim, vmodl + from pyVmomi import vim HAS_PYVMOMI = True except ImportError: HAS_PYVMOMI = False diff --git a/lib/ansible/modules/cloud/vmware/vmware_cfg_backup.py b/lib/ansible/modules/cloud/vmware/vmware_cfg_backup.py index b838bb7b5ee..9f515eca7fc 100644 --- a/lib/ansible/modules/cloud/vmware/vmware_cfg_backup.py +++ b/lib/ansible/modules/cloud/vmware/vmware_cfg_backup.py @@ -81,7 +81,7 @@ dest_file: import os try: - from pyVmomi import vim, vmodl + from pyVmomi import vim except ImportError: pass diff --git a/lib/ansible/modules/cloud/vmware/vmware_datastore_cluster.py b/lib/ansible/modules/cloud/vmware/vmware_datastore_cluster.py index 2004c0be676..4e635ef5113 100644 --- a/lib/ansible/modules/cloud/vmware/vmware_datastore_cluster.py +++ b/lib/ansible/modules/cloud/vmware/vmware_datastore_cluster.py @@ -78,11 +78,6 @@ result: sample: "Datastore cluster 'DSC2' created successfully." """ -try: - from pyVmomi import vim, vmodl -except ImportError: - pass - from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.vmware import PyVmomi, vmware_argument_spec, wait_for_task from ansible.module_utils._text import to_native diff --git a/lib/ansible/modules/cloud/vmware/vmware_drs_rule_facts.py b/lib/ansible/modules/cloud/vmware/vmware_drs_rule_facts.py index 93ff211cf56..eefdbd0280b 100644 --- a/lib/ansible/modules/cloud/vmware/vmware_drs_rule_facts.py +++ b/lib/ansible/modules/cloud/vmware/vmware_drs_rule_facts.py @@ -107,7 +107,7 @@ drs_rule_facts: ''' try: - from pyVmomi import vim, vmodl + from pyVmomi import vim except ImportError: pass diff --git a/lib/ansible/modules/cloud/vmware/vmware_guest.py b/lib/ansible/modules/cloud/vmware/vmware_guest.py index 55df58c467c..0fb44d3545b 100644 --- a/lib/ansible/modules/cloud/vmware/vmware_guest.py +++ b/lib/ansible/modules/cloud/vmware/vmware_guest.py @@ -523,9 +523,7 @@ import time HAS_PYVMOMI = False try: - import pyVmomi from pyVmomi import vim, vmodl - HAS_PYVMOMI = True except ImportError: pass diff --git a/lib/ansible/modules/cloud/vmware/vmware_guest_facts.py b/lib/ansible/modules/cloud/vmware/vmware_guest_facts.py index 12407be1829..044ca3e8b52 100644 --- a/lib/ansible/modules/cloud/vmware/vmware_guest_facts.py +++ b/lib/ansible/modules/cloud/vmware/vmware_guest_facts.py @@ -87,12 +87,6 @@ instance: sample: None """ -try: - import pyVmomi - from pyVmomi import vim -except ImportError: - pass - from ansible.module_utils.basic import AnsibleModule from ansible.module_utils._text import to_text from ansible.module_utils.vmware import PyVmomi, vmware_argument_spec diff --git a/lib/ansible/modules/cloud/vmware/vmware_guest_move.py b/lib/ansible/modules/cloud/vmware/vmware_guest_move.py index 22077c486ab..ae960f1fbea 100644 --- a/lib/ansible/modules/cloud/vmware/vmware_guest_move.py +++ b/lib/ansible/modules/cloud/vmware/vmware_guest_move.py @@ -152,15 +152,9 @@ instance: } """ -try: - import pyVmomi - from pyVmomi import vim -except ImportError: - pass - from ansible.module_utils.basic import AnsibleModule from ansible.module_utils._text import to_native -from ansible.module_utils.vmware import PyVmomi, vmware_argument_spec, connect_to_api, wait_for_task +from ansible.module_utils.vmware import PyVmomi, vmware_argument_spec, wait_for_task class PyVmomiHelper(PyVmomi): diff --git a/lib/ansible/modules/cloud/vmware/vmware_guest_snapshot.py b/lib/ansible/modules/cloud/vmware/vmware_guest_snapshot.py index 98f840ebff8..55222b9aa53 100644 --- a/lib/ansible/modules/cloud/vmware/vmware_guest_snapshot.py +++ b/lib/ansible/modules/cloud/vmware/vmware_guest_snapshot.py @@ -221,7 +221,6 @@ instance: import time try: - import pyVmomi from pyVmomi import vim except ImportError: pass diff --git a/lib/ansible/modules/cloud/vmware/vmware_guest_tools_wait.py b/lib/ansible/modules/cloud/vmware/vmware_guest_tools_wait.py index 67c7d5d3def..4d2f88640e5 100644 --- a/lib/ansible/modules/cloud/vmware/vmware_guest_tools_wait.py +++ b/lib/ansible/modules/cloud/vmware/vmware_guest_tools_wait.py @@ -110,13 +110,6 @@ from ansible.module_utils._text import to_native from ansible.module_utils.vmware import PyVmomi, gather_vm_facts, vmware_argument_spec -try: - import pyVmomi - from pyVmomi import vim -except ImportError: - pass - - class PyVmomiHelper(PyVmomi): def __init__(self, module): super(PyVmomiHelper, self).__init__(module) diff --git a/lib/ansible/modules/cloud/vmware/vmware_host_acceptance.py b/lib/ansible/modules/cloud/vmware/vmware_host_acceptance.py index 6b9a5bd7975..dc6984a7922 100644 --- a/lib/ansible/modules/cloud/vmware/vmware_host_acceptance.py +++ b/lib/ansible/modules/cloud/vmware/vmware_host_acceptance.py @@ -103,7 +103,7 @@ facts: ''' try: - from pyVmomi import vim, vmodl + from pyVmomi import vim except ImportError: pass from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/cloud/vmware/vmware_host_facts.py b/lib/ansible/modules/cloud/vmware/vmware_host_facts.py index 670643e9d67..03a1f402ef8 100644 --- a/lib/ansible/modules/cloud/vmware/vmware_host_facts.py +++ b/lib/ansible/modules/cloud/vmware/vmware_host_facts.py @@ -107,7 +107,7 @@ from ansible.module_utils.basic import AnsibleModule, bytes_to_human from ansible.module_utils.vmware import PyVmomi, vmware_argument_spec, find_obj try: - from pyVmomi import vim, vmodl + from pyVmomi import vim except ImportError: pass diff --git a/lib/ansible/modules/cloud/vmware/vmware_host_firewall_manager.py b/lib/ansible/modules/cloud/vmware/vmware_host_firewall_manager.py index 19aa1c38b4a..0b156308d1e 100644 --- a/lib/ansible/modules/cloud/vmware/vmware_host_firewall_manager.py +++ b/lib/ansible/modules/cloud/vmware/vmware_host_firewall_manager.py @@ -110,7 +110,7 @@ rule_set_state: ''' try: - from pyVmomi import vim, vmodl + from pyVmomi import vim except ImportError: pass diff --git a/lib/ansible/modules/cloud/vmware/vmware_host_lockdown.py b/lib/ansible/modules/cloud/vmware/vmware_host_lockdown.py index 684b88d27fc..955e4e61932 100644 --- a/lib/ansible/modules/cloud/vmware/vmware_host_lockdown.py +++ b/lib/ansible/modules/cloud/vmware/vmware_host_lockdown.py @@ -122,7 +122,7 @@ results: ''' try: - from pyvmomi import vim, vmodl + from pyvmomi import vim except ImportError: pass diff --git a/lib/ansible/modules/cloud/vmware/vmware_host_ntp.py b/lib/ansible/modules/cloud/vmware/vmware_host_ntp.py index 5a6f63e994a..d58135a7ae5 100644 --- a/lib/ansible/modules/cloud/vmware/vmware_host_ntp.py +++ b/lib/ansible/modules/cloud/vmware/vmware_host_ntp.py @@ -94,7 +94,7 @@ RETURN = r'''# ''' try: - from pyVmomi import vim, vmodl + from pyVmomi import vim except ImportError: pass diff --git a/lib/ansible/modules/cloud/vmware/vmware_host_powerstate.py b/lib/ansible/modules/cloud/vmware/vmware_host_powerstate.py index 514e74e88d7..8c7518037e5 100644 --- a/lib/ansible/modules/cloud/vmware/vmware_host_powerstate.py +++ b/lib/ansible/modules/cloud/vmware/vmware_host_powerstate.py @@ -111,11 +111,6 @@ result: } ''' -try: - from pyVmomi import vim, vmodl -except ImportError: - pass - from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.vmware import PyVmomi, vmware_argument_spec, wait_for_task, TaskError from ansible.module_utils._text import to_native diff --git a/lib/ansible/modules/cloud/vmware/vmware_local_user_facts.py b/lib/ansible/modules/cloud/vmware/vmware_local_user_facts.py index a33cb4d2dab..cddfda854de 100644 --- a/lib/ansible/modules/cloud/vmware/vmware_local_user_facts.py +++ b/lib/ansible/modules/cloud/vmware/vmware_local_user_facts.py @@ -66,11 +66,6 @@ local_user_facts: ] ''' -try: - from pyVmomi import vim, vmodl -except ImportError: - pass - from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.vmware import PyVmomi, vmware_argument_spec diff --git a/lib/ansible/modules/cloud/vmware/vmware_resource_pool_facts.py b/lib/ansible/modules/cloud/vmware/vmware_resource_pool_facts.py index af30d24aaa4..f33483883f5 100644 --- a/lib/ansible/modules/cloud/vmware/vmware_resource_pool_facts.py +++ b/lib/ansible/modules/cloud/vmware/vmware_resource_pool_facts.py @@ -78,7 +78,7 @@ resource_pool_facts: ''' try: - from pyVmomi import vim, vmodl + from pyVmomi import vim except ImportError: pass diff --git a/lib/ansible/modules/cloud/vmware/vmware_target_canonical_facts.py b/lib/ansible/modules/cloud/vmware/vmware_target_canonical_facts.py index 0176cb38b5d..a40fe56a6d2 100644 --- a/lib/ansible/modules/cloud/vmware/vmware_target_canonical_facts.py +++ b/lib/ansible/modules/cloud/vmware/vmware_target_canonical_facts.py @@ -109,11 +109,6 @@ scsi_tgt_facts: } """ -try: - from pyVmomi import vim, vmodl -except ImportError: - pass - from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.vmware import PyVmomi, vmware_argument_spec diff --git a/lib/ansible/modules/cloud/vmware/vmware_vm_facts.py b/lib/ansible/modules/cloud/vmware/vmware_vm_facts.py index d731db8ca2c..2cbcd8af630 100644 --- a/lib/ansible/modules/cloud/vmware/vmware_vm_facts.py +++ b/lib/ansible/modules/cloud/vmware/vmware_vm_facts.py @@ -87,7 +87,7 @@ virtual_machines: ''' try: - from pyVmomi import vim, vmodl + from pyVmomi import vim except ImportError: pass