ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-23 02:41:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

[PR #8814/ecc048bc backport][stable-9] Use dict comprehension in plugins (#8819)

Browse source 
Use dict comprehension in plugins (#8814)

* use dict comprehension in plugins

* Apply suggestions from code review

* add changelog frag

* fix references in changelog frag

(cherry picked from commit ecc048bc12)

Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>
This commit is contained in:
patchback[bot] 2024-09-01 20:55:02 +02:00 • committed by GitHub
parent 7f729d99a2
commit af08ea33b1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
24 changed files with 81 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

26
plugins/modules/lxd_container.py
View file

@ -616,8 +616,15 @@ class LXDContainerManagement(object):
def _instance_ipv4_addresses(self, ignore_devices=None):
ignore_devices = ['lo'] if ignore_devices is None else ignore_devices
data = (self._get_instance_state_json() or {}).get('metadata', None) or {}
network = dict((k, v) for k, v in (data.get('network', None) or {}).items() if k not in ignore_devices)
addresses = dict((k, [a['address'] for a in v['addresses'] if a['family'] == 'inet']) for k, v in network.items())
network = {
k: v
for k, v in data.get('network', {}).items()
if k not in ignore_devices
}
addresses = {
k: [a['address'] for a in v['addresses'] if a['family'] == 'inet']
for k, v in network.items()
}
return addresses
@staticmethod
@ -748,19 +755,22 @@ class LXDContainerManagement(object):
def run(self):
"""Run the main method."""
def adjust_content(content):
return content if not isinstance(content, dict) else {
k: v for k, v in content.items() if not (self.ignore_volatile_options and k.startswith('volatile.'))
}
try:
if self.trust_password is not None:
self.client.authenticate(self.trust_password)
self.ignore_volatile_options = self.module.params.get('ignore_volatile_options')
self.old_instance_json = self._get_instance_json()
self.old_sections = dict(
(section, content) if not isinstance(content, dict)
else (section, dict((k, v) for k, v in content.items()
if not (self.ignore_volatile_options and k.startswith('volatile.'))))
for section, content in (self.old_instance_json.get('metadata', None) or {}).items()
self.old_sections = {
section: adjust_content(content)
for section, content in self.old_instance_json.get('metadata', {}).items()
if section in set(CONFIG_PARAMS) - set(CONFIG_CREATION_PARAMS)
)
}
self.diff['before']['instance'] = self.old_sections
# preliminary, will be overwritten in _apply_instance_configs() if called