RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 02:57:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #44106 from sebastian-philipp/mgr-tox-37

Browse Source 
mgr/tox.ini: Add python 3.7 environment 

Reviewed-by: Adam King <adking@redhat.com>
This commit is contained in:
Sebastian Wagner 2021-11-25 17:54:26 +01:00 committed by GitHub
commit f3d3dcee87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 55 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pybind/mgr/CMakeLists.txt
View File

@ -13,7 +13,7 @@ if(WITH_MGR_ROOK_CLIENT)
endif()
if(WITH_TESTS)
include(AddCephTest)
add_tox_test(mgr ${CMAKE_CURRENT_SOURCE_DIR} TOX_ENVS py3 mypy flake8 jinjalint nooptional)
add_tox_test(mgr ${CMAKE_CURRENT_SOURCE_DIR} TOX_ENVS py3 py37 mypy flake8 jinjalint nooptional)
endif()
# Location needs to match default setting for mgr_module_path, currently:

12
src/pybind/mgr/cephadm/tests/fixtures.py
View File

@ -18,6 +18,12 @@ from orchestrator import raise_if_exception, OrchResult, HostSpec, DaemonDescrip
from tests import mock
def async_side_effect(result):
async def side_effect(*args, **kwargs):
return result
return side_effect
def get_ceph_option(_, key):
return __file__
@ -184,9 +190,3 @@ def make_daemons_running(cephadm_module, service_name):
own_dds = cephadm_module.cache.get_daemons_by_service(service_name)
for dd in own_dds:
dd.status = DaemonDescriptionStatus.running # We're changing the reference
def _deploy_cephadm_binary(host):
def foo(*args, **kwargs):
return True
return foo

74
src/pybind/mgr/cephadm/tests/test_cephadm.py
View File

@ -23,7 +23,7 @@ from orchestrator import DaemonDescription, InventoryHost, \
HostSpec, OrchestratorError, DaemonDescriptionStatus, OrchestratorEvent
from tests import mock
from .fixtures import wait, _run_cephadm, match_glob, with_host, \
with_cephadm_module, with_service, _deploy_cephadm_binary, make_daemons_running
with_cephadm_module, with_service, make_daemons_running, async_side_effect
from cephadm.module import CephadmOrchestrator
"""
@ -85,7 +85,7 @@ def with_osd_daemon(cephadm_module: CephadmOrchestrator, _run_cephadm, host: str
if ceph_volume_lvm_list:
_run_cephadm.side_effect = ceph_volume_lvm_list
else:
def _ceph_volume_list(s, host, entity, cmd, **kwargs):
async def _ceph_volume_list(s, host, entity, cmd, **kwargs):
logging.info(f'ceph-volume cmd: {cmd}')
if 'raw' in cmd:
return json.dumps({
@ -404,7 +404,7 @@ class TestCephadm(object):
@mock.patch("cephadm.serve.CephadmServe._run_cephadm")
def test_daemon_check_extra_config(self, _run_cephadm, cephadm_module: CephadmOrchestrator):
_run_cephadm.return_value = ('{}', '', 0)
_run_cephadm.side_effect = async_side_effect(('{}', '', 0))
with with_host(cephadm_module, 'test'):
@ -693,7 +693,7 @@ class TestCephadm(object):
@mock.patch("cephadm.serve.CephadmServe._run_cephadm")
def test_apply_osd_save(self, _run_cephadm, cephadm_module: CephadmOrchestrator):
_run_cephadm.return_value = ('{}', '', 0)
_run_cephadm.side_effect = async_side_effect(('{}', '', 0))
with with_host(cephadm_module, 'test'):
spec = DriveGroupSpec(
@ -718,7 +718,7 @@ class TestCephadm(object):
cephadm_module.cache.update_host_devices('test', inventory.devices)
_run_cephadm.return_value = (['{}'], '', 0)
_run_cephadm.side_effect = async_side_effect((['{}'], '', 0))
assert CephadmServe(cephadm_module)._apply_all_services() is False
@ -734,7 +734,7 @@ class TestCephadm(object):
@mock.patch("cephadm.serve.CephadmServe._run_cephadm")
def test_apply_osd_save_non_collocated(self, _run_cephadm, cephadm_module: CephadmOrchestrator):
_run_cephadm.return_value = ('{}', '', 0)
_run_cephadm.side_effect = async_side_effect(('{}', '', 0))
with with_host(cephadm_module, 'test'):
spec = DriveGroupSpec(
@ -758,7 +758,7 @@ class TestCephadm(object):
cephadm_module.cache.update_host_devices('test', inventory.devices)
_run_cephadm.return_value = (['{}'], '', 0)
_run_cephadm.side_effect = async_side_effect((['{}'], '', 0))
assert CephadmServe(cephadm_module)._apply_all_services() is False
@ -818,7 +818,7 @@ class TestCephadm(object):
disks_found = [
'[{"data": "/dev/vdb", "data_size": "50.00 GB", "encryption": "None"}, {"data": "/dev/vdc", "data_size": "50.00 GB", "encryption": "None"}]']
d_to_cv.return_value = 'foo'
_run_cv_cmd.return_value = (disks_found, '', 0)
_run_cv_cmd.side_effect = async_side_effect((disks_found, '', 0))
preview = cephadm_module.osd_service.generate_previews([dg], 'test')
for osd in preview:
@ -942,7 +942,7 @@ class TestCephadm(object):
@mock.patch("cephadm.serve.CephadmServe._run_cephadm")
def test_remove_duplicate_osds(self, _run_cephadm, cephadm_module: CephadmOrchestrator):
_run_cephadm.return_value = ('{}', '', 0)
_run_cephadm.side_effect = async_side_effect(('{}', '', 0))
with with_host(cephadm_module, 'host1'):
with with_host(cephadm_module, 'host2'):
with with_osd_daemon(cephadm_module, _run_cephadm, 'host1', 1) as dd1: # type: DaemonDescription
@ -993,7 +993,6 @@ class TestCephadm(object):
RGWSpec(service_id="foo"),
]
)
@mock.patch("cephadm.serve.CephadmServe._deploy_cephadm_binary", _deploy_cephadm_binary('test'))
@mock.patch("cephadm.serve.CephadmServe._run_cephadm", _run_cephadm('{}'))
def test_daemon_add(self, spec: ServiceSpec, cephadm_module):
unmanaged_spec = ServiceSpec.from_json(spec.to_json())
@ -1036,7 +1035,7 @@ class TestCephadm(object):
@mock.patch("cephadm.services.nfs.NFSService.purge", mock.MagicMock())
@mock.patch("cephadm.services.nfs.NFSService.create_rados_config_obj", mock.MagicMock())
def test_daemon_add_fail(self, _run_cephadm, entity, success, spec, cephadm_module):
_run_cephadm.return_value = '{}', '', 0
_run_cephadm.side_effect = async_side_effect(('{}', '', 0))
with with_host(cephadm_module, 'test'):
with with_service(cephadm_module, spec):
_run_cephadm.side_effect = OrchestratorError('fail')
@ -1062,7 +1061,7 @@ class TestCephadm(object):
@mock.patch("cephadm.serve.CephadmServe._run_cephadm")
def test_daemon_place_fail_health_warning(self, _run_cephadm, cephadm_module):
_run_cephadm.return_value = ('{}', '', 0)
_run_cephadm.side_effect = async_side_effect(('{}', '', 0))
with with_host(cephadm_module, 'test'):
_run_cephadm.side_effect = OrchestratorError('fail')
ps = PlacementSpec(hosts=['test:0.0.0.0=a'], count=1)
@ -1077,7 +1076,7 @@ class TestCephadm(object):
@mock.patch("cephadm.serve.CephadmServe._run_cephadm")
def test_apply_spec_fail_health_warning(self, _run_cephadm, cephadm_module: CephadmOrchestrator):
_run_cephadm.return_value = ('{}', '', 0)
_run_cephadm.side_effect = async_side_effect(('{}', '', 0))
with with_host(cephadm_module, 'test'):
CephadmServe(cephadm_module)._apply_all_services()
ps = PlacementSpec(hosts=['fail'], count=1)
@ -1092,7 +1091,7 @@ class TestCephadm(object):
@mock.patch("cephadm.module.CephadmOrchestrator.get_foreign_ceph_option")
@mock.patch("cephadm.serve.CephadmServe._run_cephadm")
def test_invalid_config_option_health_warning(self, _run_cephadm, get_foreign_ceph_option, cephadm_module: CephadmOrchestrator):
_run_cephadm.return_value = ('{}', '', 0)
_run_cephadm.side_effect = async_side_effect(('{}', '', 0))
with with_host(cephadm_module, 'test'):
ps = PlacementSpec(hosts=['test:0.0.0.0=a'], count=1)
get_foreign_ceph_option.side_effect = KeyError
@ -1163,7 +1162,7 @@ class TestCephadm(object):
)
@mock.patch("cephadm.serve.CephadmServe._run_cephadm")
def test_blink_device_light(self, _run_cephadm, on_bool, fault_ident, cephadm_module):
_run_cephadm.return_value = '{}', '', 0
_run_cephadm.side_effect = async_side_effect(('{}', '', 0))
with with_host(cephadm_module, 'test'):
c = cephadm_module.blink_device_light(fault_ident, on_bool, [('test', '', 'dev')])
on_off = 'on' if on_bool else 'off'
@ -1173,7 +1172,7 @@ class TestCephadm(object):
@mock.patch("cephadm.serve.CephadmServe._run_cephadm")
def test_blink_device_light_custom(self, _run_cephadm, cephadm_module):
_run_cephadm.return_value = '{}', '', 0
_run_cephadm.side_effect = async_side_effect(('{}', '', 0))
with with_host(cephadm_module, 'test'):
cephadm_module.set_store('blink_device_light_cmd', 'echo hello')
c = cephadm_module.blink_device_light('ident', True, [('test', '', '/dev/sda')])
@ -1183,7 +1182,7 @@ class TestCephadm(object):
@mock.patch("cephadm.serve.CephadmServe._run_cephadm")
def test_blink_device_light_custom_per_host(self, _run_cephadm, cephadm_module):
_run_cephadm.return_value = '{}', '', 0
_run_cephadm.side_effect = async_side_effect(('{}', '', 0))
with with_host(cephadm_module, 'mgr0'):
cephadm_module.set_store('mgr0/blink_device_light_cmd',
'xyz --foo --{{ ident_fault }}={{\'on\' if on else \'off\'}} \'{{ path or dev }}\'')
@ -1262,7 +1261,6 @@ class TestCephadm(object):
), CephadmOrchestrator.apply_container),
]
)
@mock.patch("cephadm.serve.CephadmServe._deploy_cephadm_binary", _deploy_cephadm_binary('test'))
@mock.patch("subprocess.run", None)
@mock.patch("cephadm.serve.CephadmServe._run_cephadm", _run_cephadm('{}'))
@mock.patch("cephadm.services.nfs.NFSService.run_grace_tool", mock.MagicMock())
@ -1274,7 +1272,6 @@ class TestCephadm(object):
with with_service(cephadm_module, spec, meth, 'test'):
pass
@mock.patch("cephadm.serve.CephadmServe._deploy_cephadm_binary", _deploy_cephadm_binary('test'))
@mock.patch("cephadm.serve.CephadmServe._run_cephadm", _run_cephadm('{}'))
def test_mds_config_purge(self, cephadm_module: CephadmOrchestrator):
spec = ServiceSpec('mds', service_id='fsname')
@ -1365,7 +1362,8 @@ class TestCephadm(object):
@mock.patch("cephadm.module.HostCache.get_hosts")
def test_maintenance_enter_success(self, _hosts, _get_daemon_types, _host_ok, _run_cephadm, cephadm_module: CephadmOrchestrator):
hostname = 'host1'
_run_cephadm.return_value = [''], ['something\nsuccess - systemd target xxx disabled'], 0
_run_cephadm.side_effect = async_side_effect(
([''], ['something\nsuccess - systemd target xxx disabled'], 0))
_host_ok.return_value = 0, 'it is okay'
_get_daemon_types.return_value = ['crash']
_hosts.return_value = [hostname, 'other_host']
@ -1382,7 +1380,8 @@ class TestCephadm(object):
@mock.patch("cephadm.module.HostCache.get_hosts")
def test_maintenance_enter_failure(self, _hosts, _get_daemon_types, _host_ok, _run_cephadm, cephadm_module: CephadmOrchestrator):
hostname = 'host1'
_run_cephadm.return_value = [''], ['something\nfailed - disable the target'], 0
_run_cephadm.side_effect = async_side_effect(
([''], ['something\nfailed - disable the target'], 0))
_host_ok.return_value = 0, 'it is okay'
_get_daemon_types.return_value = ['crash']
_hosts.return_value = [hostname, 'other_host']
@ -1398,8 +1397,8 @@ class TestCephadm(object):
@mock.patch("cephadm.module.HostCache.get_hosts")
def test_maintenance_exit_success(self, _hosts, _get_daemon_types, _run_cephadm, cephadm_module: CephadmOrchestrator):
hostname = 'host1'
_run_cephadm.return_value = [''], [
'something\nsuccess - systemd target xxx enabled and started'], 0
_run_cephadm.side_effect = async_side_effect(([''], [
'something\nsuccess - systemd target xxx enabled and started'], 0))
_get_daemon_types.return_value = ['crash']
_hosts.return_value = [hostname, 'other_host']
cephadm_module.inventory.add_host(HostSpec(hostname, status='maintenance'))
@ -1414,7 +1413,8 @@ class TestCephadm(object):
@mock.patch("cephadm.module.HostCache.get_hosts")
def test_maintenance_exit_failure(self, _hosts, _get_daemon_types, _run_cephadm, cephadm_module: CephadmOrchestrator):
hostname = 'host1'
_run_cephadm.return_value = [''], ['something\nfailed - unable to enable the target'], 0
_run_cephadm.side_effect = async_side_effect(
([''], ['something\nfailed - unable to enable the target'], 0))
_get_daemon_types.return_value = ['crash']
_hosts.return_value = [hostname, 'other_host']
cephadm_module.inventory.add_host(HostSpec(hostname, status='maintenance'))
@ -1429,10 +1429,10 @@ class TestCephadm(object):
@mock.patch("cephadm.ssh.SSHManager._check_execute_command")
@mock.patch("cephadm.ssh.SSHManager._write_remote_file")
def test_etc_ceph(self, _write_file, check_execute_command, execute_command, remote_connection, cephadm_module):
_write_file.return_value = None
check_execute_command.return_value = ''
execute_command.return_value = '{}', '', 0
remote_connection.return_value = mock.Mock()
_write_file.side_effect = async_side_effect(None)
check_execute_command.side_effect = async_side_effect('')
execute_command.side_effect = async_side_effect(('{}', '', 0))
remote_connection.side_effect = async_side_effect(mock.Mock())
assert cephadm_module.manage_etc_ceph_ceph_conf is False
@ -1482,7 +1482,7 @@ class TestCephadm(object):
assert cephadm_module.get_module_option('registry_username') == username
assert cephadm_module.get_module_option('registry_password') == password
_run_cephadm.return_value = '{}', '', 0
_run_cephadm.side_effect = async_side_effect(('{}', '', 0))
with with_host(cephadm_module, 'test'):
# test successful login with valid args
code, out, err = cephadm_module.registry_login('test-url', 'test-user', 'test-password')
@ -1517,7 +1517,7 @@ class TestCephadm(object):
check_registry_credentials('json-url', 'json-user', 'json-pass')
# test bad login where args are valid but login command fails
_run_cephadm.return_value = '{}', 'error', 1
_run_cephadm.side_effect = async_side_effect(('{}', 'error', 1))
code, out, err = cephadm_module.registry_login('fail-url', 'fail-user', 'fail-password')
assert err == 'Host test failed to login to fail-url as fail-user with given password'
check_registry_credentials('json-url', 'json-user', 'json-pass')
@ -1553,7 +1553,7 @@ class TestCephadm(object):
@mock.patch("cephadm.serve.CephadmServe._run_cephadm")
def test_ceph_volume_no_filter_for_batch(self, _run_cephadm, cephadm_module: CephadmOrchestrator):
_run_cephadm.return_value = ('{}', '', 0)
_run_cephadm.side_effect = async_side_effect(('{}', '', 0))
error_message = """cephadm exited with an error code: 1, stderr:/usr/bin/podman:stderr usage: ceph-volume inventory [-h] [--format {plain,json,json-pretty}] [path]/usr/bin/podman:stderr ceph-volume inventory: error: unrecognized arguments: --filter-for-batch
Traceback (most recent call last):
@ -1581,14 +1581,14 @@ Traceback (most recent call last):
@mock.patch("cephadm.serve.CephadmServe._run_cephadm")
def test_osd_activate_datadevice(self, _run_cephadm, cephadm_module: CephadmOrchestrator):
_run_cephadm.return_value = ('{}', '', 0)
_run_cephadm.side_effect = async_side_effect(('{}', '', 0))
with with_host(cephadm_module, 'test', refresh_hosts=False):
with with_osd_daemon(cephadm_module, _run_cephadm, 'test', 1):
pass
@mock.patch("cephadm.serve.CephadmServe._run_cephadm")
def test_osd_activate_datadevice_fail(self, _run_cephadm, cephadm_module: CephadmOrchestrator):
_run_cephadm.return_value = ('{}', '', 0)
_run_cephadm.side_effect = async_side_effect(('{}', '', 0))
with with_host(cephadm_module, 'test', refresh_hosts=False):
cephadm_module.mock_store_set('_ceph_get', 'osd_map', {
'osds': [
@ -1609,9 +1609,9 @@ Traceback (most recent call last):
'type': 'data'
}]
}
_run_cephadm.reset_mock(return_value=True)
_run_cephadm.reset_mock(return_value=True, side_effect=True)
def _r_c(*args, **kwargs):
async def _r_c(*args, **kwargs):
if 'ceph-volume' in args:
return (json.dumps(ceph_volume_lvm_list), '', 0)
else:
@ -1628,10 +1628,10 @@ Traceback (most recent call last):
@mock.patch("cephadm.serve.CephadmServe._run_cephadm")
def test_osd_activate_datadevice_dbdevice(self, _run_cephadm, cephadm_module: CephadmOrchestrator):
_run_cephadm.return_value = ('{}', '', 0)
_run_cephadm.side_effect = async_side_effect(('{}', '', 0))
with with_host(cephadm_module, 'test', refresh_hosts=False):
def _ceph_volume_list(s, host, entity, cmd, **kwargs):
async def _ceph_volume_list(s, host, entity, cmd, **kwargs):
logging.info(f'ceph-volume cmd: {cmd}')
if 'raw' in cmd:
return json.dumps({

10
src/pybind/mgr/cephadm/tests/test_services.py
View File

@ -17,7 +17,7 @@ from cephadm.services.monitoring import GrafanaService, AlertmanagerService, Pro
from cephadm.module import CephadmOrchestrator
from ceph.deployment.service_spec import IscsiServiceSpec, MonitoringSpec, AlertManagerSpec, \
ServiceSpec, RGWSpec
from cephadm.tests.fixtures import with_host, with_service, _run_cephadm
from cephadm.tests.fixtures import with_host, with_service, _run_cephadm, async_side_effect
from orchestrator import OrchestratorError
from orchestrator._interface import DaemonDescription
@ -236,7 +236,7 @@ class TestISCSIService:
class TestMonitoring:
@patch("cephadm.serve.CephadmServe._run_cephadm")
def test_alertmanager_config(self, _run_cephadm, cephadm_module: CephadmOrchestrator):
_run_cephadm.return_value = ('{}', '', 0)
_run_cephadm.side_effect = async_side_effect(('{}', '', 0))
with with_host(cephadm_module, 'test'):
with with_service(cephadm_module, AlertManagerSpec()):
@ -280,7 +280,7 @@ class TestMonitoring:
@patch("cephadm.serve.CephadmServe._run_cephadm")
def test_prometheus_config(self, _run_cephadm, cephadm_module: CephadmOrchestrator):
_run_cephadm.return_value = ('{}', '', 0)
_run_cephadm.side_effect = async_side_effect(('{}', '', 0))
with with_host(cephadm_module, 'test'):
with with_service(cephadm_module, MonitoringSpec('node-exporter')) as _, \
@ -326,7 +326,7 @@ class TestMonitoring:
@patch("cephadm.module.CephadmOrchestrator.get_mgr_ip", lambda _: '1::4')
@patch("cephadm.services.monitoring.verify_tls", lambda *_: None)
def test_grafana_config(self, _run_cephadm, cephadm_module: CephadmOrchestrator):
_run_cephadm.return_value = ('{}', '', 0)
_run_cephadm.side_effect = async_side_effect(('{}', '', 0))
with with_host(cephadm_module, 'test'):
cephadm_module.set_store('grafana_crt', 'c')
@ -391,7 +391,7 @@ class TestMonitoring:
@patch("cephadm.serve.CephadmServe._run_cephadm")
def test_monitoring_ports(self, _run_cephadm, cephadm_module: CephadmOrchestrator):
_run_cephadm.return_value = ('{}', '', 0)
_run_cephadm.side_effect = async_side_effect(('{}', '', 0))
with with_host(cephadm_module, 'test'):

7
src/pybind/mgr/cephadm/tests/test_ssh.py
View File

@ -8,6 +8,7 @@ except ImportError:
AsyncMock = None
import pytest
try:
from asyncssh.misc import ConnectionLost
except ImportError:
@ -17,7 +18,7 @@ from ceph.deployment.hostspec import HostSpec
from cephadm import CephadmOrchestrator
from cephadm.serve import CephadmServe
from cephadm.tests.fixtures import with_host, wait
from cephadm.tests.fixtures import with_host, wait, async_side_effect
@pytest.mark.skipif(ConnectionLost is None, reason='no asyncssh')
@ -25,8 +26,8 @@ class TestWithSSH:
@mock.patch("cephadm.ssh.SSHManager._execute_command")
@mock.patch("cephadm.ssh.SSHManager._check_execute_command")
def test_offline(self, check_execute_command, execute_command, cephadm_module):
check_execute_command.return_value = ''
execute_command.return_value = '', '', 0
check_execute_command.side_effect = async_side_effect('')
execute_command.side_effect = async_side_effect(('', '', 0))
if not AsyncMock:
# can't run this test if we could not import AsyncMock

2
src/pybind/mgr/tox.ini
View File

@ -1,6 +1,7 @@
[tox]
envlist =
py3,
py37,
mypy,
fix
flake8
@ -8,6 +9,7 @@ envlist =
nooptional
skipsdist = true
requires = cython
skip_missing_interpreters = true
[pytest]
log_level=NOTSET