cleanup(inventory,tests): Remove dependency on addict

Replace the remaining uses of addict's Dict with ResourceField of the
Kubernetes client. This allows to drop the dependency on addict.

Signed-off-by: Felix Matouschek <fmatouschek@redhat.com>
This commit is contained in:
Felix Matouschek
2024-07-11 15:32:25 +02:00
parent 060ac97b68
commit c55763b5aa
3 changed files with 6 additions and 8 deletions

View File

@@ -1,4 +1,3 @@
addict
pytest pytest
pytest-ansible pytest-ansible
pytest-mock pytest-mock

View File

@@ -8,7 +8,7 @@ __metaclass__ = type
import pytest import pytest
from addict import Dict from kubernetes.dynamic.resource import ResourceField
from ansible.template import Templar from ansible.template import Templar
@@ -96,21 +96,21 @@ def client(mocker, request):
items = param["namespaces"] items = param["namespaces"]
else: else:
items = [{"metadata": {"name": DEFAULT_NAMESPACE}}] items = [{"metadata": {"name": DEFAULT_NAMESPACE}}]
namespaces.items = [Dict(item) for item in items] namespaces.items = [ResourceField(item) for item in items]
vms = mocker.Mock() vms = mocker.Mock()
vms.items = [Dict(item) for item in param.get("vms", [])] vms.items = [ResourceField(item) for item in param.get("vms", [])]
vmis = mocker.Mock() vmis = mocker.Mock()
vmis.items = [Dict(item) for item in param.get("vmis", [])] vmis.items = [ResourceField(item) for item in param.get("vmis", [])]
services = mocker.Mock() services = mocker.Mock()
services.items = [Dict(item) for item in param.get("services", [])] services.items = [ResourceField(item) for item in param.get("services", [])]
dns = mocker.Mock() dns = mocker.Mock()
if "base_domain" in param: if "base_domain" in param:
base_domain = param["base_domain"] base_domain = param["base_domain"]
else: else:
base_domain = DEFAULT_BASE_DOMAIN base_domain = DEFAULT_BASE_DOMAIN
dns_obj = Dict({"spec": {"baseDomain": base_domain}}) dns_obj = ResourceField({"spec": {"baseDomain": base_domain}})
dns.items = [dns_obj] dns.items = [dns_obj]
namespace_client = mocker.Mock() namespace_client = mocker.Mock()

View File

@@ -2,7 +2,6 @@
jsonpatch jsonpatch
kubernetes>=28.1.0 kubernetes>=28.1.0
PyYAML>=3.11 PyYAML>=3.11
addict
pytest pytest
pytest-mock pytest-mock
pytest-xdist pytest-xdist