ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-02-04 07:51:50 +00:00
Code Activity

Merge c762ff6c17 into a266ba1d6e

Browse source
This commit is contained in:
patchback[bot] 2026-02-04 06:50:21 +00:00 • committed by GitHub
commit 9997713ff9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 19 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/modules/one_image.py
View file

@ -467,10 +467,10 @@ class ImageModule(OpenNebulaModule):
return None
def get_image_by_name(self, image_name):
return self.get_image(lambda image: (image_name == image.NAME))
return self.get_image(lambda image: image_name == image.NAME)
def get_image_by_id(self, image_id):
return self.get_image(lambda image: (image_id == image.ID))
return self.get_image(lambda image: image_id == image.ID)
def get_image_instance(self, requested_id, requested_name):
# Using 'if requested_id:' doesn't work properly when requested_id=0

10
plugins/modules/one_service.py
View file

@ -330,11 +330,11 @@ def get_service(module, auth, pred):
def get_service_by_id(module, auth, service_id):
return get_service(module, auth, lambda service: (int(service["ID"]) == int(service_id))) if service_id else None
return get_service(module, auth, lambda service: int(service["ID"]) == int(service_id)) if service_id else None
def get_service_by_name(module, auth, service_name):
return get_service(module, auth, lambda service: (service["NAME"] == service_name))
return get_service(module, auth, lambda service: service["NAME"] == service_name)
def get_service_info(module, auth, service):
@ -681,13 +681,11 @@ def delete_service(module, auth, service_id):
def get_template_by_name(module, auth, template_name):
return get_template(module, auth, lambda template: (template["NAME"] == template_name))
return get_template(module, auth, lambda template: template["NAME"] == template_name)
def get_template_by_id(module, auth, template_id):
return (
get_template(module, auth, lambda template: (int(template["ID"]) == int(template_id))) if template_id else None
)
return get_template(module, auth, lambda template: int(template["ID"]) == int(template_id)) if template_id else None
def get_template_id(module, auth, requested_id, requested_name):

4
plugins/modules/one_template.py
View file

@ -226,10 +226,10 @@ class TemplateModule(OpenNebulaModule):
return None
def get_template_by_id(self, template_id, filter):
return self.get_template(lambda template: (template_id == template.ID), filter)
return self.get_template(lambda template: template_id == template.ID, filter)
def get_template_by_name(self, name, filter):
return self.get_template(lambda template: (name == template.NAME), filter)
return self.get_template(lambda template: name == template.NAME, filter)
def get_template_instance(self, requested_id, requested_name, filter):
if requested_id:

20
plugins/modules/one_vm.py
View file

@ -766,11 +766,11 @@ def get_template(module, client, predicate):
def get_template_by_name(module, client, template_name):
return get_template(module, client, lambda template: (template_name == template.NAME))
return get_template(module, client, lambda template: template_name == template.NAME)
def get_template_by_id(module, client, template_id):
return get_template(module, client, lambda template: (template_id == template.ID))
return get_template(module, client, lambda template: template_id == template.ID)
def get_template_id(module, client, requested_id, requested_name):
@ -805,11 +805,11 @@ def get_datastore(module, client, predicate):
def get_datastore_by_name(module, client, datastore_name):
return get_datastore(module, client, lambda datastore: (datastore_name == datastore.NAME))
return get_datastore(module, client, lambda datastore: datastore_name == datastore.NAME)
def get_datastore_by_id(module, client, datastore_id):
return get_datastore(module, client, lambda datastore: (datastore_id == datastore.ID))
return get_datastore(module, client, lambda datastore: datastore_id == datastore.ID)
def get_datastore_id(module, client, requested_id, requested_name):
@ -1396,25 +1396,21 @@ def wait_for_running(module, client, vm, wait_timeout):
client,
vm,
wait_timeout,
lambda state, lcm_state: (state in [VM_STATES.index("ACTIVE")] and lcm_state in [LCM_STATES.index("RUNNING")]),
lambda state, lcm_state: state in [VM_STATES.index("ACTIVE")] and lcm_state in [LCM_STATES.index("RUNNING")],
)
def wait_for_done(module, client, vm, wait_timeout):
return wait_for_state(
module, client, vm, wait_timeout, lambda state, lcm_state: (state in [VM_STATES.index("DONE")])
)
return wait_for_state(module, client, vm, wait_timeout, lambda state, lcm_state: state in [VM_STATES.index("DONE")])
def wait_for_hold(module, client, vm, wait_timeout):
return wait_for_state(
module, client, vm, wait_timeout, lambda state, lcm_state: (state in [VM_STATES.index("HOLD")])
)
return wait_for_state(module, client, vm, wait_timeout, lambda state, lcm_state: state in [VM_STATES.index("HOLD")])
def wait_for_poweroff(module, client, vm, wait_timeout):
return wait_for_state(
module, client, vm, wait_timeout, lambda state, lcm_state: (state in [VM_STATES.index("POWEROFF")])
module, client, vm, wait_timeout, lambda state, lcm_state: state in [VM_STATES.index("POWEROFF")]
)

4
plugins/modules/one_vnet.py
View file

@ -320,10 +320,10 @@ class NetworksModule(OpenNebulaModule):
return None
def get_template_by_id(self, template_id):
return self.get_template(lambda template: (template_id == template.ID))
return self.get_template(lambda template: template_id == template.ID)
def get_template_by_name(self, name):
return self.get_template(lambda template: (name == template.NAME))
return self.get_template(lambda template: name == template.NAME)
def get_template_instance(self, requested_id, requested_name):
if requested_id:

2
plugins/modules/pkg5.py
View file

@ -133,7 +133,7 @@ def ensure(module, state, packages, params):
"subcommand": "install",
},
"latest": {
"filter": lambda p: (not is_installed(module, p) or not is_latest(module, p)),
"filter": lambda p: not is_installed(module, p) or not is_latest(module, p),
"subcommand": "install",
},
"absent": {