a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

VMware: Check for category id before assigning (#51684) 

Check if user specified category exists in environment,
before assigning it to the tag creation operation.

Fixes: #51381

Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
pull/4420/head
Abhijeet Kasurde 2019-02-05 11:50:15 +05:30 committed by GitHub
parent c572d17c2e
commit d8d4dc3f52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lib/ansible/modules/cloud/vmware/vmware_tag.py
View File

@ -109,7 +109,7 @@ results:
from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.vmware_rest_client import VmwareRestClient from ansible.module_utils.vmware_rest_client import VmwareRestClient
try: try:
from com.vmware.cis.tagging_client import Tag from com.vmware.cis.tagging_client import Tag, Category
except ImportError: except ImportError:
pass pass
@ -121,10 +121,11 @@ class VmwareTag(VmwareRestClient):
self.global_tags = dict() self.global_tags = dict()
self.tag_name = self.params.get('tag_name') self.tag_name = self.params.get('tag_name')
self.get_all_tags() self.get_all_tags()
self.category_service = Category(self.connect)
def ensure_state(self): def ensure_state(self):
""" """
Function to manage internal states of tags Manage internal states of tags
""" """
desired_state = self.params.get('state') desired_state = self.params.get('state')
@ -142,7 +143,7 @@ class VmwareTag(VmwareRestClient):
def state_create_tag(self): def state_create_tag(self):
""" """
Function to create tag Create tag
""" """
tag_spec = self.tag_service.CreateSpec() tag_spec = self.tag_service.CreateSpec()
@ -151,6 +152,17 @@ class VmwareTag(VmwareRestClient):
category_id = self.params.get('category_id', None) category_id = self.params.get('category_id', None)
if category_id is None: if category_id is None:
self.module.fail_json(msg="'category_id' is required parameter while creating tag.") self.module.fail_json(msg="'category_id' is required parameter while creating tag.")
category_found = False
for category in self.category_service.list():
category_obj = self.category_service.get(category)
if category_id == category_obj.id:
category_found = True
break
if not category_found:
self.module.fail_json(msg="Unable to find category specified using 'category_id' - %s" % category_id)
tag_spec.category_id = category_id tag_spec.category_id = category_id
tag_id = self.tag_service.create(tag_spec) tag_id = self.tag_service.create(tag_spec)
if tag_id: if tag_id:
@ -162,14 +174,14 @@ class VmwareTag(VmwareRestClient):
def state_unchanged(self): def state_unchanged(self):
""" """
Function to return unchanged state Return unchanged state
""" """
self.module.exit_json(changed=False) self.module.exit_json(changed=False)
def state_update_tag(self): def state_update_tag(self):
""" """
Function to update tag Update tag
""" """
changed = False changed = False
@ -187,7 +199,7 @@ class VmwareTag(VmwareRestClient):
def state_delete_tag(self): def state_delete_tag(self):
""" """
Function to delete tag Delete tag
""" """
tag_id = self.global_tags[self.tag_name]['tag_id'] tag_id = self.global_tags[self.tag_name]['tag_id']
@ -198,18 +210,16 @@ class VmwareTag(VmwareRestClient):
def check_tag_status(self): def check_tag_status(self):
""" """
Function to check if tag exists or not Check if tag exists or not
Returns: 'present' if tag found, else 'absent' Returns: 'present' if tag found, else 'absent'
""" """
if self.tag_name in self.global_tags: ret = 'present' if self.tag_name in self.global_tags else 'absent'
return 'present' return ret
else:
return 'absent'
def get_all_tags(self): def get_all_tags(self):
""" """
Function to retrieve all tag information Retrieve all tag information
""" """
for tag in self.tag_service.list(): for tag in self.tag_service.list():