internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-08 06:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor code for find_host_by_cluster_datacenter (#26859)

Browse Source 
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:
Abhijeet Kasurde
2017-08-28 22:06:46 +05:30
committed by Dag Wieers
parent 62e01aecfb
commit 3e20acbd79
5 changed files with 199 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/ansible/modules/cloud/vmware/vmware_host.py
View File

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