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

Merge pull request #41906 from mgfritch/cephadm-test-monaddrv

Browse Source 
cephadm: add `bootstrap --mon-addrv` test

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
This commit is contained in:
Sebastian Wagner 2021-07-02 15:16:42 +02:00 committed by GitHub
commit c301a13485
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 52 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cephadm/cephadm
View File

@ -3492,7 +3492,7 @@ def prepare_mon_addresses(
addr_arg)
port = int(hasport[0])
# strip off v1: or v2: prefix
addr = re.sub(r'^\w+:', '', addr)
addr = re.sub(r'^v\d+:', '', addr)
base_ip = addr[0:-(len(str(port))) - 1]
check_ip_port(ctx, base_ip, port)
else:

51
src/cephadm/tests/test_cephadm.py
View File

@ -1147,6 +1147,57 @@ class TestBootstrap(object):
retval = cd.command_bootstrap(ctx)
assert retval == 0
@pytest.mark.parametrize('mon_addrv, list_networks, err',
[
# IPv4
(
'192.168.1.1',
{'192.168.1.0/24': {'eth0': ['192.168.1.1']}},
r'must use square backets',
),
(
'[192.168.1.1]',
{'192.168.1.0/24': {'eth0': ['192.168.1.1']}},
r'must include port number',
),
(
'[192.168.1.1:1234]',
{'192.168.1.0/24': {'eth0': ['192.168.1.1']}},
None,
),
(
'[v2:192.168.1.1:3300,v1:192.168.1.1:6789]',
{'192.168.1.0/24': {'eth0': ['192.168.1.1']}},
None,
),
# IPv6
(
'[::ffff:192.168.1.1:1234]',
{'ffff::/64': {'eth0': ['::ffff:c0a8:101']}},
None,
),
(
'[0000:0000:0000:0000:0000:FFFF:C0A8:0101:1234]',
{'ffff::/64': {'eth0': ['::ffff:c0a8:101']}},
None,
),
(
'[v2:0000:0000:0000:0000:0000:FFFF:C0A8:0101:3300,v1:0000:0000:0000:0000:0000:FFFF:C0A8:0101:6789]',
{'ffff::/64': {'eth0': ['::ffff:c0a8:101']}},
None,
),
])
def test_mon_addrv(self, mon_addrv, list_networks, err, cephadm_fs):
cmd = self._get_cmd('--mon-addrv', mon_addrv)
if err:
with with_cephadm_ctx(cmd, list_networks=list_networks) as ctx:
with pytest.raises(cd.Error, match=err):
cd.command_bootstrap(ctx)
else:
with with_cephadm_ctx(cmd, list_networks=list_networks) as ctx:
retval = cd.command_bootstrap(ctx)
assert retval == 0
def test_allow_fqdn_hostname(self, cephadm_fs):
hostname = 'foo.bar'
cmd = self._get_cmd(