internet/kubevirt.core
3
0
Fork 0
mirror of https://github.com/kubevirt/kubevirt.core.git synced 2026-07-30 03:14:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #41 from 0xFelix/cleanup-to-dict

Browse Source 
cleanup: Remove __resource_field_to_dict workaround from inventory
This commit is contained in:
kubevirt-bot
2024-02-29 15:52:57 +01:00
committed by GitHub
parent 4429ac8c03 e0cde14f30
commit 735cddbe15
1 changed files with 9 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
plugins/inventory/kubevirt.py
View File

@@ -167,24 +167,19 @@ from typing import (
Dict, Dict,
List, List,
Optional, Optional,
Tuple,
Union,
) )
# Handle import errors of python kubernetes client. # Handle import errors of python kubernetes client.
# HAS_K8S_MODULE_HELPER imported below will print a warning to the user if the client is missing. # HAS_K8S_MODULE_HELPER imported below will print a warning to the user if the client is missing.
try: try:
from kubernetes.dynamic.resource import Resource, ResourceField from kubernetes.dynamic.resource import Resource
from kubernetes.dynamic.exceptions import DynamicApiError, ServiceUnavailableError from kubernetes.dynamic.exceptions import DynamicApiError, ServiceUnavailableError
except ImportError: except ImportError:
class Resource: class Resource:
pass pass
class ResourceField:
pass
class DynamicApiError(Exception): class DynamicApiError(Exception):
pass pass
@@ -521,12 +516,10 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
vmi_annotations = ( vmi_annotations = (
{} {}
if not vmi.metadata.annotations if not vmi.metadata.annotations
else self.__resource_field_to_dict(vmi.metadata.annotations) else vmi.metadata.annotations.to_dict()
) )
vmi_labels = ( vmi_labels = (
{} {} if not vmi.metadata.labels else vmi.metadata.labels.to_dict()
if not vmi.metadata.labels
else self.__resource_field_to_dict(vmi.metadata.labels)
) )
# Add vmi to the namespace group # Add vmi to the namespace group
@@ -570,21 +563,17 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
# Add hostvars from status # Add hostvars from status
vmi_active_pods = ( vmi_active_pods = (
{} {} if not vmi.status.activePods else vmi.status.activePods.to_dict()
if not vmi.status.activePods
else self.__resource_field_to_dict(vmi.status.activePods)
) )
self.inventory.set_variable(vmi_name, "vmi_active_pods", vmi_active_pods) self.inventory.set_variable(vmi_name, "vmi_active_pods", vmi_active_pods)
vmi_conditions = ( vmi_conditions = (
[] []
if not vmi.status.conditions if not vmi.status.conditions
else [self.__resource_field_to_dict(c) for c in vmi.status.conditions] else [c.to_dict() for c in vmi.status.conditions]
) )
self.inventory.set_variable(vmi_name, "vmi_conditions", vmi_conditions) self.inventory.set_variable(vmi_name, "vmi_conditions", vmi_conditions)
vmi_guest_os_info = ( vmi_guest_os_info = (
{} {} if not vmi.status.guestOSInfo else vmi.status.guestOSInfo.to_dict()
if not vmi.status.guestOSInfo
else self.__resource_field_to_dict(vmi.status.guestOSInfo)
) )
self.inventory.set_variable( self.inventory.set_variable(
vmi_name, "vmi_guest_os_info", vmi_guest_os_info vmi_name, "vmi_guest_os_info", vmi_guest_os_info
@@ -592,7 +581,7 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
vmi_interfaces = ( vmi_interfaces = (
[] []
if not vmi.status.interfaces if not vmi.status.interfaces
else [self.__resource_field_to_dict(i) for i in vmi.status.interfaces] else [i.to_dict() for i in vmi.status.interfaces]
) )
self.inventory.set_variable(vmi_name, "vmi_interfaces", vmi_interfaces) self.inventory.set_variable(vmi_name, "vmi_interfaces", vmi_interfaces)
self.inventory.set_variable( self.inventory.set_variable(
@@ -611,10 +600,7 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
vmi_phase_transition_timestamps = ( vmi_phase_transition_timestamps = (
[] []
if not vmi.status.phaseTransitionTimestamps if not vmi.status.phaseTransitionTimestamps
else [ else [p.to_dict() for p in vmi.status.phaseTransitionTimestamps]
self.__resource_field_to_dict(p)
for p in vmi.status.phaseTransitionTimestamps
]
) )
self.inventory.set_variable( self.inventory.set_variable(
vmi_name, vmi_name,
@@ -630,7 +616,7 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
vmi_volume_status = ( vmi_volume_status = (
[] []
if not vmi.status.volumeStatus if not vmi.status.volumeStatus
else [self.__resource_field_to_dict(v) for v in vmi.status.volumeStatus] else [v.to_dict() for v in vmi.status.volumeStatus]
) )
self.inventory.set_variable( self.inventory.set_variable(
vmi_name, "vmi_volume_status", vmi_volume_status vmi_name, "vmi_volume_status", vmi_volume_status
@@ -710,25 +696,6 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
self.inventory.set_variable(vmi_name, "ansible_host", ansible_host) self.inventory.set_variable(vmi_name, "ansible_host", ansible_host)
def __resource_field_to_dict(
self, field: Union[Dict, List, ResourceField, Tuple]
) -> Dict:
"""
Replace this with ResourceField.to_dict() once available in a stable release of
the Kubernetes Python client
See
https://github.com/kubernetes-client/python/blob/main/kubernetes/base/dynamic/resource.py#L393
"""
if isinstance(field, ResourceField):
return {
k: self.__resource_field_to_dict(v) for k, v in field.__dict__.items()
}
if isinstance(field, (list, tuple)):
return [self.__resource_field_to_dict(item) for item in field]
return field
# This function is copied from the kubernetes.core sources and a fix to handle apis of the format a/b/c was applied. # This function is copied from the kubernetes.core sources and a fix to handle apis of the format a/b/c was applied.
# To ensure compatibility with KubeVirt >=1.1.0 the kubernetes.core Discoverers original method is monkey patched with this one. # To ensure compatibility with KubeVirt >=1.1.0 the kubernetes.core Discoverers original method is monkey patched with this one.