mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-04-18 18:01:31 +00:00
Fix imports, part 2 (#42)
* Recover missing netapp.ontap module doc fragments from ansible/ansible@pre-ansible-base. * Fix PEP8 issues. * Remove netbox empty files, and test which shouldn't be here. * Add forgotten file for kubevirt tests. * Fix unit test imports. * ansible/ansible#68415 has been fixed. * Clean up/rearrange imports. * Update ignore.txt, fix boilerplate. * Netapp docs fragment: fix spacing * Forgot to adjust kubevirt tests.
This commit is contained in:
Felix Fontein
GitHub
parent
25394eeafb
commit
07ecfc940c
118 changed files with 486 additions and 423 deletions
|
|
@ -21,8 +21,8 @@ import pytest
|
|||
|
||||
from ansible_collections.community.general.tests.unit.compat import mock, unittest
|
||||
from ansible_collections.community.general.plugins.module_utils.gcp import (_get_gcp_ansible_credentials, _get_gcp_credentials, _get_gcp_environ_var,
|
||||
_get_gcp_environment_credentials,
|
||||
_validate_credentials_file)
|
||||
_get_gcp_environment_credentials,
|
||||
_validate_credentials_file)
|
||||
|
||||
# Fake data/function used for testing
|
||||
fake_env_data = {'GCE_EMAIL': 'gce-email'}
|
||||
|
|
|
|||
|
|
@ -17,9 +17,9 @@
|
|||
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
|
||||
from ansible_collections.community.general.tests.unit.compat import unittest
|
||||
from ansible_collections.google.cloud.plugins.module_utils.gcp_utils import (GcpRequest,
|
||||
navigate_hash,
|
||||
remove_nones_from_dict,
|
||||
replace_resource_dict)
|
||||
navigate_hash,
|
||||
remove_nones_from_dict,
|
||||
replace_resource_dict)
|
||||
|
||||
|
||||
class ReplaceResourceDictTestCase(unittest.TestCase):
|
||||
|
|
|
|||
|
|
@ -1,152 +0,0 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# Copyright: (c) 2019, Bruno Inec (@sweenu) <bruno@inec.fr>
|
||||
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
|
||||
import pytest
|
||||
|
||||
from ansible_collections.netbox.netbox.plugins.module_utils.net_tools.netbox.netbox_utils import (
|
||||
QUERY_TYPES,
|
||||
_build_diff,
|
||||
create_netbox_object,
|
||||
delete_netbox_object,
|
||||
update_netbox_object,
|
||||
normalize_data,
|
||||
)
|
||||
|
||||
|
||||
def test_normalize_data():
|
||||
assert "name" not in QUERY_TYPES
|
||||
assert QUERY_TYPES.get("rack") == "slug"
|
||||
assert QUERY_TYPES.get("primary_ip") != "slug"
|
||||
|
||||
raw_data = {
|
||||
"name": "Some name",
|
||||
"primary_ip": "10.3.72.74/31",
|
||||
"rack": "Some rack",
|
||||
}
|
||||
normalized_data = raw_data.copy()
|
||||
normalized_data["rack"] = "some-rack"
|
||||
|
||||
assert normalize_data(raw_data) == normalized_data
|
||||
|
||||
|
||||
def test_build_diff():
|
||||
before = "The state before"
|
||||
after = {"A": "more", "complicated": "state"}
|
||||
diff = _build_diff(before=before, after=after)
|
||||
assert diff == {"before": before, "after": after}
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def nb_obj_mock(mocker):
|
||||
serialized_object = {"The serialized": "object"}
|
||||
nb_obj = mocker.Mock(name="nb_obj_mock")
|
||||
nb_obj.delete.return_value = True
|
||||
nb_obj.update.return_value = True
|
||||
nb_obj.update.side_effect = serialized_object.update
|
||||
nb_obj.serialize.return_value = serialized_object
|
||||
|
||||
return nb_obj
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def endpoint_mock(mocker, nb_obj_mock):
|
||||
endpoint = mocker.Mock(name="endpoint_mock")
|
||||
endpoint.create.return_value = nb_obj_mock
|
||||
|
||||
return endpoint
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def on_creation_diff():
|
||||
return _build_diff(before={"state": "absent"}, after={"state": "present"})
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def on_deletion_diff():
|
||||
return _build_diff(before={"state": "present"}, after={"state": "absent"})
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def data():
|
||||
return {"name": "Some Netbox object name"}
|
||||
|
||||
|
||||
def test_create_netbox_object(endpoint_mock, data, on_creation_diff):
|
||||
return_value = endpoint_mock.create().serialize()
|
||||
|
||||
serialized_obj, diff = create_netbox_object(
|
||||
endpoint_mock, data, check_mode=False
|
||||
)
|
||||
assert endpoint_mock.create.called_once_with(data)
|
||||
assert serialized_obj == return_value
|
||||
assert diff == on_creation_diff
|
||||
|
||||
|
||||
def test_create_netbox_object_in_check_mode(endpoint_mock, data, on_creation_diff):
|
||||
serialized_obj, diff = create_netbox_object(
|
||||
endpoint_mock, data, check_mode=True
|
||||
)
|
||||
assert endpoint_mock.create.not_called()
|
||||
assert serialized_obj == data
|
||||
assert diff == on_creation_diff
|
||||
|
||||
|
||||
def test_delete_netbox_object(nb_obj_mock, on_deletion_diff):
|
||||
serialized_obj, diff = delete_netbox_object(nb_obj_mock, check_mode=False)
|
||||
assert nb_obj_mock.delete.called_once()
|
||||
assert serialized_obj == nb_obj_mock.serialize()
|
||||
assert diff == on_deletion_diff
|
||||
|
||||
|
||||
def test_delete_netbox_object_in_check_mode(nb_obj_mock, on_deletion_diff):
|
||||
serialized_obj, diff = delete_netbox_object(nb_obj_mock, check_mode=True)
|
||||
assert nb_obj_mock.delete.not_called()
|
||||
assert serialized_obj == nb_obj_mock.serialize()
|
||||
assert diff == on_deletion_diff
|
||||
|
||||
|
||||
def test_update_netbox_object_no_changes(nb_obj_mock):
|
||||
unchanged_data = nb_obj_mock.serialize()
|
||||
serialized_obj, diff = update_netbox_object(nb_obj_mock, unchanged_data, check_mode=True)
|
||||
assert nb_obj_mock.update.not_called()
|
||||
assert serialized_obj == unchanged_data
|
||||
assert diff is None
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def changed_serialized_obj(nb_obj_mock):
|
||||
changed_serialized_obj = nb_obj_mock.serialize().copy()
|
||||
changed_serialized_obj[list(changed_serialized_obj.keys())[0]] += " (modified)"
|
||||
|
||||
return changed_serialized_obj
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def on_update_diff(nb_obj_mock, changed_serialized_obj):
|
||||
return _build_diff(before=nb_obj_mock.serialize().copy(), after=changed_serialized_obj)
|
||||
|
||||
|
||||
def test_update_netbox_object_with_changes(
|
||||
nb_obj_mock, changed_serialized_obj, on_update_diff
|
||||
):
|
||||
serialized_obj, diff = update_netbox_object(
|
||||
nb_obj_mock, changed_serialized_obj, check_mode=False
|
||||
)
|
||||
assert nb_obj_mock.update.called_once_with(changed_serialized_obj)
|
||||
assert serialized_obj == nb_obj_mock.serialize()
|
||||
assert diff == on_update_diff
|
||||
|
||||
|
||||
def test_update_netbox_object_with_changes_in_check_mode(
|
||||
nb_obj_mock, changed_serialized_obj, on_update_diff
|
||||
):
|
||||
updated_serialized_obj = nb_obj_mock.serialize().copy()
|
||||
updated_serialized_obj.update(changed_serialized_obj)
|
||||
|
||||
serialized_obj, diff = update_netbox_object(
|
||||
nb_obj_mock, changed_serialized_obj, check_mode=True
|
||||
)
|
||||
assert nb_obj_mock.update.not_called()
|
||||
|
||||
assert serialized_obj == updated_serialized_obj
|
||||
assert diff == on_update_diff
|
||||
|
|
@ -9,7 +9,7 @@ __metaclass__ = type
|
|||
import sys
|
||||
|
||||
from ansible_collections.community.general.tests.unit.compat import unittest
|
||||
from ansible_collections.cisco.aci.plugins.module_utils.network.aci.aci import ACIModule
|
||||
from ansible_collections.cisco.aci.plugins.module_utils.aci import ACIModule
|
||||
from ansible.module_utils.six import PY2
|
||||
from ansible.module_utils._text import to_native
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,8 @@ from ansible_collections.community.general.tests.unit.compat import unittest
|
|||
from ansible_collections.community.general.tests.unit.compat.mock import Mock
|
||||
|
||||
|
||||
from ansible_collections.community.general.plugins.module_utils.network.netscaler.netscaler import ConfigProxy, get_immutables_intersection, ensure_feature_is_enabled, log, loglines
|
||||
from ansible_collections.community.general.plugins.module_utils.network.netscaler.netscaler import (ConfigProxy, get_immutables_intersection,
|
||||
ensure_feature_is_enabled, log, loglines)
|
||||
|
||||
|
||||
class TestNetscalerConfigProxy(unittest.TestCase):
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue