mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-08-13 17:44:22 -07:00
Remove kubevirt and set up redirects to community.kubevirt (#1317)
* Remove kubevirt and set up redirects to community.kubevirt This also removes the dependency on community.kubernetes which fixes https://github.com/ansible-collections/community.general/issues/354. * Update changelogs/fragments/1317-kubevirt-migration-removal.yml Co-authored-by: Felix Fontein <felix@fontein.de> * Update changelogs/fragments/1317-kubevirt-migration-removal.yml Co-authored-by: Felix Fontein <felix@fontein.de> * Add missed redirects Co-authored-by: Felix Fontein <felix@fontein.de>
This commit is contained in:
David Moreau Simard
GitHub
parent
ddaad1e650
commit
e53f153e30
34 changed files with 35 additions and 3591 deletions
|
|
@ -1,56 +0,0 @@
|
|||
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
|
||||
|
||||
from __future__ import (absolute_import, division, print_function)
|
||||
__metaclass__ = type
|
||||
|
||||
import json
|
||||
import pytest
|
||||
|
||||
from ansible_collections.community.general.plugins.module_utils import kubevirt as mymodule
|
||||
|
||||
|
||||
def test_simple_merge_dicts():
|
||||
dict1 = {'labels': {'label1': 'value'}}
|
||||
dict2 = {'labels': {'label2': 'value'}}
|
||||
dict3 = json.dumps({'labels': {'label1': 'value', 'label2': 'value'}}, sort_keys=True)
|
||||
assert dict3 == json.dumps(dict(mymodule.KubeVirtRawModule.merge_dicts(dict1, dict2)), sort_keys=True)
|
||||
|
||||
|
||||
def test_simple_multi_merge_dicts():
|
||||
dict1 = {'labels': {'label1': 'value', 'label3': 'value'}}
|
||||
dict2 = {'labels': {'label2': 'value'}}
|
||||
dict3 = json.dumps({'labels': {'label1': 'value', 'label2': 'value', 'label3': 'value'}}, sort_keys=True)
|
||||
assert dict3 == json.dumps(dict(mymodule.KubeVirtRawModule.merge_dicts(dict1, dict2)), sort_keys=True)
|
||||
|
||||
|
||||
def test_double_nested_merge_dicts():
|
||||
dict1 = {'metadata': {'labels': {'label1': 'value', 'label3': 'value'}}}
|
||||
dict2 = {'metadata': {'labels': {'label2': 'value'}}}
|
||||
dict3 = json.dumps({'metadata': {'labels': {'label1': 'value', 'label2': 'value', 'label3': 'value'}}}, sort_keys=True)
|
||||
assert dict3 == json.dumps(dict(mymodule.KubeVirtRawModule.merge_dicts(dict1, dict2)), sort_keys=True)
|
||||
|
||||
|
||||
@pytest.mark.parametrize("lval, operations, rval, result", [
|
||||
('v1', ['<', '<='], 'v2', True),
|
||||
('v1', ['>', '>=', '=='], 'v2', False),
|
||||
('v1', ['>'], 'v1alpha1', True),
|
||||
('v1', ['==', '<', '<='], 'v1alpha1', False),
|
||||
('v1beta5', ['==', '<=', '>='], 'v1beta5', True),
|
||||
('v1beta5', ['<', '>', '!='], 'v1beta5', False),
|
||||
|
||||
])
|
||||
def test_kubeapiversion_comparisons(lval, operations, rval, result):
|
||||
KubeAPIVersion = mymodule.KubeAPIVersion
|
||||
for op in operations:
|
||||
test = '(KubeAPIVersion("{0}") {1} KubeAPIVersion("{2}")) == {3}'.format(lval, op, rval, result)
|
||||
assert eval(test)
|
||||
|
||||
|
||||
@pytest.mark.parametrize("ver", ('nope', 'v1delta7', '1.5', 'v1beta', 'v'))
|
||||
def test_kubeapiversion_unsupported_versions(ver):
|
||||
threw = False
|
||||
try:
|
||||
mymodule.KubeAPIVersion(ver)
|
||||
except ValueError:
|
||||
threw = True
|
||||
assert threw
|
||||
|
|
@ -1,74 +0,0 @@
|
|||
from __future__ import (absolute_import, division, print_function)
|
||||
__metaclass__ = type
|
||||
|
||||
import pytest
|
||||
|
||||
from ansible.module_utils.basic import AnsibleModule
|
||||
from ansible_collections.community.general.tests.unit.compat.mock import MagicMock
|
||||
|
||||
from ansible_collections.community.kubernetes.plugins.module_utils.common import K8sAnsibleMixin
|
||||
from ansible_collections.community.kubernetes.plugins.module_utils.raw import KubernetesRawModule
|
||||
from ansible_collections.community.general.plugins.module_utils.kubevirt import KubeVirtRawModule
|
||||
|
||||
import openshift.dynamic
|
||||
|
||||
RESOURCE_DEFAULT_ARGS = {'api_version': 'v1alpha3', 'group': 'kubevirt.io',
|
||||
'prefix': 'apis', 'namespaced': True}
|
||||
|
||||
|
||||
class AnsibleExitJson(Exception):
|
||||
"""Exception class to be raised by module.exit_json and caught
|
||||
by the test case"""
|
||||
def __init__(self, **kwargs):
|
||||
for k in kwargs:
|
||||
setattr(self, k, kwargs[k])
|
||||
|
||||
def __getitem__(self, attr):
|
||||
return getattr(self, attr)
|
||||
|
||||
|
||||
class AnsibleFailJson(Exception):
|
||||
"""Exception class to be raised by module.fail_json and caught
|
||||
by the test case"""
|
||||
def __init__(self, **kwargs):
|
||||
for k in kwargs:
|
||||
setattr(self, k, kwargs[k])
|
||||
|
||||
def __getitem__(self, attr):
|
||||
return getattr(self, attr)
|
||||
|
||||
|
||||
def exit_json(*args, **kwargs):
|
||||
kwargs['success'] = True
|
||||
if 'changed' not in kwargs:
|
||||
kwargs['changed'] = False
|
||||
raise AnsibleExitJson(**kwargs)
|
||||
|
||||
|
||||
def fail_json(*args, **kwargs):
|
||||
kwargs['success'] = False
|
||||
raise AnsibleFailJson(**kwargs)
|
||||
|
||||
|
||||
@pytest.fixture()
|
||||
def base_fixture(monkeypatch):
|
||||
monkeypatch.setattr(
|
||||
AnsibleModule, "exit_json", exit_json)
|
||||
monkeypatch.setattr(
|
||||
AnsibleModule, "fail_json", fail_json)
|
||||
# Create mock methods in Resource directly, otherwise dyn client
|
||||
# tries binding those to corresponding methods in DynamicClient
|
||||
# (with partial()), which is more problematic to intercept
|
||||
openshift.dynamic.Resource.get = MagicMock()
|
||||
openshift.dynamic.Resource.create = MagicMock()
|
||||
openshift.dynamic.Resource.delete = MagicMock()
|
||||
openshift.dynamic.Resource.patch = MagicMock()
|
||||
openshift.dynamic.Resource.search = MagicMock()
|
||||
openshift.dynamic.Resource.watch = MagicMock()
|
||||
# Globally mock some methods, since all tests will use this
|
||||
KubernetesRawModule.patch_resource = MagicMock()
|
||||
KubernetesRawModule.patch_resource.return_value = ({}, None)
|
||||
K8sAnsibleMixin.get_api_client = MagicMock()
|
||||
K8sAnsibleMixin.get_api_client.return_value = None
|
||||
K8sAnsibleMixin.find_resource = MagicMock()
|
||||
KubeVirtRawModule.find_supported_resource = MagicMock()
|
||||
|
|
@ -1,80 +0,0 @@
|
|||
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
|
||||
|
||||
from __future__ import (absolute_import, division, print_function)
|
||||
__metaclass__ = type
|
||||
|
||||
import pytest
|
||||
|
||||
openshiftdynamic = pytest.importorskip("openshift.dynamic")
|
||||
|
||||
from ansible_collections.community.general.tests.unit.plugins.modules.utils import set_module_args
|
||||
from .kubevirt_fixtures import base_fixture, RESOURCE_DEFAULT_ARGS, AnsibleExitJson
|
||||
|
||||
from ansible_collections.community.kubernetes.plugins.module_utils.raw import KubernetesRawModule
|
||||
from ansible_collections.community.general.plugins.modules.cloud.kubevirt import kubevirt_rs as mymodule
|
||||
|
||||
KIND = 'VirtualMachineInstanceReplicaSet'
|
||||
|
||||
|
||||
@pytest.mark.usefixtures("base_fixture")
|
||||
@pytest.mark.parametrize("_replicas, _changed", ((1, True),
|
||||
(3, True),
|
||||
(2, False),
|
||||
(5, True),))
|
||||
def test_scale_rs_nowait(_replicas, _changed):
|
||||
_name = 'test-rs'
|
||||
# Desired state:
|
||||
args = dict(name=_name, namespace='vms', replicas=_replicas, wait=False)
|
||||
set_module_args(args)
|
||||
|
||||
# Mock pre-change state:
|
||||
resource_args = dict(kind=KIND, **RESOURCE_DEFAULT_ARGS)
|
||||
mymodule.KubeVirtVMIRS.find_supported_resource.return_value = openshiftdynamic.Resource(**resource_args)
|
||||
res_inst = openshiftdynamic.ResourceInstance('', dict(kind=KIND, metadata={'name': _name}, spec={'replicas': 2}))
|
||||
openshiftdynamic.Resource.get.return_value = res_inst
|
||||
openshiftdynamic.Resource.search.return_value = [res_inst]
|
||||
|
||||
# Final state, after patching the object
|
||||
KubernetesRawModule.patch_resource.return_value = dict(kind=KIND, metadata={'name': _name},
|
||||
spec={'replicas': _replicas}), None
|
||||
|
||||
# Run code:
|
||||
with pytest.raises(AnsibleExitJson) as result:
|
||||
mymodule.KubeVirtVMIRS().execute_module()
|
||||
|
||||
# Verify result:
|
||||
assert result.value['changed'] == _changed
|
||||
|
||||
|
||||
@pytest.mark.usefixtures("base_fixture")
|
||||
@pytest.mark.parametrize("_replicas, _success", ((1, False),
|
||||
(2, False),
|
||||
(5, True),))
|
||||
def test_scale_rs_wait(_replicas, _success):
|
||||
_name = 'test-rs'
|
||||
# Desired state:
|
||||
args = dict(name=_name, namespace='vms', replicas=5, wait=True)
|
||||
set_module_args(args)
|
||||
|
||||
# Mock pre-change state:
|
||||
resource_args = dict(kind=KIND, **RESOURCE_DEFAULT_ARGS)
|
||||
mymodule.KubeVirtVMIRS.find_supported_resource.return_value = openshiftdynamic.Resource(**resource_args)
|
||||
res_inst = openshiftdynamic.ResourceInstance('', dict(kind=KIND, metadata={'name': _name}, spec={'replicas': 2}))
|
||||
openshiftdynamic.Resource.get.return_value = res_inst
|
||||
openshiftdynamic.Resource.search.return_value = [res_inst]
|
||||
|
||||
# ~Final state, after patching the object (`replicas` match desired state)
|
||||
KubernetesRawModule.patch_resource.return_value = dict(kind=KIND, name=_name, metadata={'name': _name},
|
||||
spec={'replicas': 5}), None
|
||||
|
||||
# Final final state, as returned by resource.watch()
|
||||
final_obj = dict(metadata=dict(name=_name), status=dict(readyReplicas=_replicas), **resource_args)
|
||||
event = openshiftdynamic.ResourceInstance(None, final_obj)
|
||||
openshiftdynamic.Resource.watch.return_value = [dict(object=event)]
|
||||
|
||||
# Run code:
|
||||
with pytest.raises(Exception) as result:
|
||||
mymodule.KubeVirtVMIRS().execute_module()
|
||||
|
||||
# Verify result:
|
||||
assert result.value['success'] == _success
|
||||
|
|
@ -1,115 +0,0 @@
|
|||
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
|
||||
|
||||
from __future__ import (absolute_import, division, print_function)
|
||||
__metaclass__ = type
|
||||
|
||||
import pytest
|
||||
|
||||
openshiftdynamic = pytest.importorskip("openshift.dynamic")
|
||||
|
||||
from ansible_collections.community.general.tests.unit.plugins.modules.utils import set_module_args
|
||||
from .kubevirt_fixtures import base_fixture, RESOURCE_DEFAULT_ARGS, AnsibleExitJson
|
||||
|
||||
from ansible_collections.community.general.plugins.module_utils.kubevirt import KubeVirtRawModule
|
||||
from ansible_collections.community.general.plugins.modules.cloud.kubevirt import kubevirt_vm as mymodule
|
||||
|
||||
KIND = 'VirtulMachine'
|
||||
|
||||
|
||||
@pytest.mark.usefixtures("base_fixture")
|
||||
def test_create_vm_with_multus_nowait():
|
||||
# Desired state:
|
||||
args = dict(
|
||||
state='present', name='testvm',
|
||||
namespace='vms',
|
||||
interfaces=[
|
||||
{'bridge': {}, 'name': 'default', 'network': {'pod': {}}},
|
||||
{'bridge': {}, 'name': 'mynet', 'network': {'multus': {'networkName': 'mynet'}}},
|
||||
],
|
||||
wait=False,
|
||||
)
|
||||
set_module_args(args)
|
||||
|
||||
# State as "returned" by the "k8s cluster":
|
||||
resource_args = dict(kind=KIND, **RESOURCE_DEFAULT_ARGS)
|
||||
KubeVirtRawModule.find_supported_resource.return_value = openshiftdynamic.Resource(**resource_args)
|
||||
openshiftdynamic.Resource.get.return_value = None # Object doesn't exist in the cluster
|
||||
|
||||
# Run code:
|
||||
with pytest.raises(AnsibleExitJson) as result:
|
||||
mymodule.KubeVirtVM().execute_module()
|
||||
|
||||
# Verify result:
|
||||
assert result.value['changed']
|
||||
assert result.value['method'] == 'create'
|
||||
|
||||
|
||||
@pytest.mark.usefixtures("base_fixture")
|
||||
@pytest.mark.parametrize("_wait", (False, True))
|
||||
def test_vm_is_absent(_wait):
|
||||
# Desired state:
|
||||
args = dict(
|
||||
state='absent', name='testvmi',
|
||||
namespace='vms',
|
||||
wait=_wait,
|
||||
)
|
||||
set_module_args(args)
|
||||
|
||||
# State as "returned" by the "k8s cluster":
|
||||
resource_args = dict(kind=KIND, **RESOURCE_DEFAULT_ARGS)
|
||||
KubeVirtRawModule.find_supported_resource.return_value = openshiftdynamic.Resource(**resource_args)
|
||||
openshiftdynamic.Resource.get.return_value = None # Object doesn't exist in the cluster
|
||||
|
||||
# Run code:
|
||||
with pytest.raises(AnsibleExitJson) as result:
|
||||
mymodule.KubeVirtVM().execute_module()
|
||||
|
||||
# Verify result:
|
||||
assert not result.value['kubevirt_vm']
|
||||
assert result.value['method'] == 'delete'
|
||||
# Note: nothing actually gets deleted, as we mock that there's not object in the cluster present,
|
||||
# so if the method changes to something other than 'delete' at some point, that's fine
|
||||
|
||||
|
||||
@pytest.mark.usefixtures("base_fixture")
|
||||
def test_vmpreset_create():
|
||||
KIND = 'VirtulMachineInstancePreset'
|
||||
# Desired state:
|
||||
args = dict(state='present', name='testvmipreset', namespace='vms', memory='1024Mi', wait=False)
|
||||
set_module_args(args)
|
||||
|
||||
# State as "returned" by the "k8s cluster":
|
||||
resource_args = dict(kind=KIND, **RESOURCE_DEFAULT_ARGS)
|
||||
KubeVirtRawModule.find_supported_resource.return_value = openshiftdynamic.Resource(**resource_args)
|
||||
openshiftdynamic.Resource.get.return_value = None # Object doesn't exist in the cluster
|
||||
|
||||
# Run code:
|
||||
with pytest.raises(AnsibleExitJson) as result:
|
||||
mymodule.KubeVirtVM().execute_module()
|
||||
|
||||
# Verify result:
|
||||
assert result.value['changed']
|
||||
assert result.value['method'] == 'create'
|
||||
|
||||
|
||||
@pytest.mark.usefixtures("base_fixture")
|
||||
def test_vmpreset_is_absent():
|
||||
KIND = 'VirtulMachineInstancePreset'
|
||||
# Desired state:
|
||||
args = dict(state='absent', name='testvmipreset', namespace='vms')
|
||||
set_module_args(args)
|
||||
|
||||
# State as "returned" by the "k8s cluster":
|
||||
resource_args = dict(kind=KIND, **RESOURCE_DEFAULT_ARGS)
|
||||
KubeVirtRawModule.find_supported_resource.return_value = openshiftdynamic.Resource(**resource_args)
|
||||
openshiftdynamic.Resource.get.return_value = None # Object doesn't exist in the cluster
|
||||
|
||||
# Run code:
|
||||
with pytest.raises(AnsibleExitJson) as result:
|
||||
mymodule.KubeVirtVM().execute_module()
|
||||
|
||||
# Verify result:
|
||||
assert not result.value['kubevirt_vm']
|
||||
assert result.value['method'] == 'delete'
|
||||
# Note: nothing actually gets deleted, as we mock that there's not object in the cluster present,
|
||||
# so if the method changes to something other than 'delete' at some point, that's fine
|
||||
Loading…
Add table
Add a link
Reference in a new issue