mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-07-25 06:10:22 -07:00
Refactor code for find_host_by_cluster_datacenter (#26859)
Fix adds refactor of code for find_host_by_cluster_datacenter API in vmware_host and vmware_resource_pool. Also, adds strict check for cluster and datacenter object find. Testcase for vmware_resource_pool. Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
This commit is contained in:
parent
62e01aecfb
commit
3e20acbd79
5 changed files with 199 additions and 36 deletions
|
@ -84,10 +84,9 @@ from ansible.module_utils.basic import AnsibleModule
|
|||
from ansible.module_utils.vmware import (
|
||||
TaskError,
|
||||
connect_to_api,
|
||||
find_cluster_by_name,
|
||||
find_datacenter_by_name,
|
||||
vmware_argument_spec,
|
||||
wait_for_task,
|
||||
find_host_by_cluster_datacenter,
|
||||
)
|
||||
|
||||
|
||||
|
@ -128,19 +127,6 @@ class VMwareHost(object):
|
|||
except Exception as e:
|
||||
self.module.fail_json(msg=str(e))
|
||||
|
||||
def find_host_by_cluster_datacenter(self):
|
||||
self.dc = find_datacenter_by_name(self.content, self.datacenter_name)
|
||||
self.cluster = find_cluster_by_name(self.content, self.cluster_name, self.dc)
|
||||
|
||||
if self.cluster is None:
|
||||
self.module.fail_json(msg="Unable to find cluster %(cluster_name)s" % self.module.params)
|
||||
|
||||
for host in self.cluster.host:
|
||||
if host.name == self.esxi_hostname:
|
||||
return host, self.cluster
|
||||
|
||||
return None, self.cluster
|
||||
|
||||
def add_host_to_vcenter(self):
|
||||
host_connect_spec = vim.host.ConnectSpec()
|
||||
host_connect_spec.hostName = self.esxi_hostname
|
||||
|
@ -200,7 +186,8 @@ class VMwareHost(object):
|
|||
self.module.exit_json(changed=changed, result=str(result))
|
||||
|
||||
def check_host_state(self):
|
||||
self.host, self.cluster = self.find_host_by_cluster_datacenter()
|
||||
self.host, self.cluster = find_host_by_cluster_datacenter(self.module, self.content, self.datacenter_name,
|
||||
self.cluster_name, self.esxi_hostname)
|
||||
|
||||
if self.host is None:
|
||||
return 'absent'
|
||||
|
|
|
@ -137,9 +137,9 @@ try:
|
|||
except ImportError:
|
||||
HAS_PYVMOMI = False
|
||||
|
||||
from ansible.module_utils.vmware import get_all_objs, connect_to_api, vmware_argument_spec, find_datacenter_by_name, \
|
||||
find_cluster_by_name, wait_for_task, find_host_by_cluster_datacenter
|
||||
from ansible.module_utils.basic import AnsibleModule
|
||||
from ansible.module_utils.vmware import (get_all_objs, connect_to_api, vmware_argument_spec,
|
||||
find_datacenter_by_name, find_cluster_by_name_datacenter, wait_for_task)
|
||||
|
||||
|
||||
class VMwareResourcePool(object):
|
||||
|
@ -169,17 +169,6 @@ class VMwareResourcePool(object):
|
|||
self.resource_pool_obj = None
|
||||
self.content = connect_to_api(module)
|
||||
|
||||
def find_host_by_cluster_datacenter(self):
|
||||
self.dc_obj = find_datacenter_by_name(self.content, self.datacenter)
|
||||
self.cluster_obj = find_cluster_by_name_datacenter(
|
||||
self.dc_obj, self.cluster)
|
||||
|
||||
for host in self.cluster_obj.host:
|
||||
if host.name == self.hostname:
|
||||
return host, self.cluster
|
||||
|
||||
return None, self.cluster
|
||||
|
||||
def select_resource_pool(self, host):
|
||||
pool_obj = None
|
||||
|
||||
|
@ -275,8 +264,12 @@ class VMwareResourcePool(object):
|
|||
rp_spec.memoryAllocation = mem_alloc
|
||||
|
||||
self.dc_obj = find_datacenter_by_name(self.content, self.datacenter)
|
||||
self.cluster_obj = find_cluster_by_name_datacenter(
|
||||
self.dc_obj, self.cluster)
|
||||
if self.dc_obj is None:
|
||||
self.module.fail_json(msg="Unable to find datacenter with name %s" % self.datacenter)
|
||||
|
||||
self.cluster_obj = find_cluster_by_name(self.content, self.cluster, datacenter=self.dc_obj)
|
||||
if self.cluster_obj is None:
|
||||
self.module.fail_json(msg="Unable to find cluster with name %s" % self.cluster)
|
||||
rootResourcePool = self.cluster_obj.resourcePool
|
||||
rootResourcePool.CreateResourcePool(self.resource_pool, rp_spec)
|
||||
|
||||
|
@ -284,7 +277,8 @@ class VMwareResourcePool(object):
|
|||
|
||||
def check_rp_state(self):
|
||||
|
||||
self.host_obj, self.cluster_obj = self.find_host_by_cluster_datacenter()
|
||||
self.host_obj, self.cluster_obj = find_host_by_cluster_datacenter(self.module, self.content, self.datacenter,
|
||||
self.cluster, self.hostname)
|
||||
self.resource_pool_obj = self.select_resource_pool(self.host_obj)
|
||||
|
||||
if self.resource_pool_obj is None:
|
||||
|
@ -298,10 +292,6 @@ def main():
|
|||
argument_spec.update(dict(datacenter=dict(required=True, type='str'),
|
||||
cluster=dict(required=True, type='str'),
|
||||
resource_pool=dict(required=True, type='str'),
|
||||
hostname=dict(required=True, type='str'),
|
||||
username=dict(required=True, type='str'),
|
||||
password=dict(
|
||||
required=True, type='str', no_log=True),
|
||||
mem_shares=dict(type='str', default="normal", choices=[
|
||||
'high', 'custom', 'normal', 'low']),
|
||||
mem_limit=dict(type='int', default="-1"),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue