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

cleanup(inventory): Rename GetVmiOptions to InventoryOptions

Browse Source 
... and ensure base_domain is always initialized with the cluster
domain. This is done in preparation for a major refactoring of the
inventory plugin.

Signed-off-by: Felix Matouschek <fmatouschek@redhat.com>
This commit is contained in:
Felix Matouschek
2024-06-27 10:24:41 +02:00
parent 241ca75b28
commit 63a03d75b2
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/inventory/kubevirt.py
View File

@@ -228,7 +228,7 @@ class KubeVirtInventoryException(Exception):
@dataclass @dataclass
class GetVmiOptions: class InventoryOptions:
""" """
This class holds the options defined by the user. This class holds the options defined by the user.
""" """
@@ -427,7 +427,7 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
else: else:
namespaces = self.get_available_namespaces(client) namespaces = self.get_available_namespaces(client)
opts = GetVmiOptions( opts = InventoryOptions(
connection.get("api_version"), connection.get("api_version"),
connection.get("label_selector"), connection.get("label_selector"),
connection.get("network_name", connection.get("interface_name")), connection.get("network_name", connection.get("interface_name")),
@@ -444,7 +444,10 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
client = get_api_client() client = get_api_client()
name = self.get_default_host_name(client.configuration.host) name = self.get_default_host_name(client.configuration.host)
namespaces = self.get_available_namespaces(client) namespaces = self.get_available_namespaces(client)
opts = GetVmiOptions(host_format=self.host_format) opts = InventoryOptions(
host_format=self.host_format,
base_domain=self.get_cluster_domain(client),
)
for namespace in namespaces: for namespace in namespaces:
self.get_vmis_for_namespace(client, name, namespace, opts) self.get_vmis_for_namespace(client, name, namespace, opts)
@@ -484,7 +487,7 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
return [namespace.metadata.name for namespace in obj.items] return [namespace.metadata.name for namespace in obj.items]
def get_vmis_for_namespace( def get_vmis_for_namespace(
self, client: K8SClient, name: str, namespace: str, opts: GetVmiOptions self, client: K8SClient, name: str, namespace: str, opts: InventoryOptions
) -> None: ) -> None:
""" """
get_vmis_for_namespace lists all VirtualMachineInstances in a namespace get_vmis_for_namespace lists all VirtualMachineInstances in a namespace
@@ -719,7 +722,7 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
vmi_name: str, vmi_name: str,
ip_address: str, ip_address: str,
service: Optional[Dict], service: Optional[Dict],
opts: GetVmiOptions, opts: InventoryOptions,
) -> None: ) -> None:
""" """
set_ansible_host_and_port sets the ansible_host and possibly the ansible_port var. set_ansible_host_and_port sets the ansible_host and possibly the ansible_port var.