import 15.2.4

[ceph.git] / ceph / src / python-common / ceph / tests / test_drive_group.py

diff --git a/ceph/src/python-common/ceph/tests/test_drive_group.py b/ceph/src/python-common/ceph/tests/test_drive_group.py
index c0734ced82e39919cd86a16bbbf6ba0fac75f353..a34e93aaa27c9eccea2b94cef45edd484aa5563f 100644 (file)
--- a/ceph/src/python-common/ceph/tests/test_drive_group.py
+++ b/ceph/src/python-common/ceph/tests/test_drive_group.py
@@ -24,7 +24,7 @@ from ceph.deployment.drive_group import DriveGroupSpec, DeviceSelection, \
 ])
 def test_DriveGroup(test_input):
     dg = [DriveGroupSpec.from_json(inp) for inp in test_input][0]
-    assert dg.placement.pattern_matches_hosts(['hostname']) == ['hostname']
+    assert dg.placement.filter_matching_hosts(lambda label=None, as_hostspec=None: ['hostname']) == ['hostname']
     assert dg.service_id == 'testing_drivegroup'
     assert all([isinstance(x, Device) for x in dg.data_devices.paths])
     assert dg.data_devices.paths[0].path == '/dev/sda'
@@ -53,7 +53,7 @@ def test_DriveGroup_fail(test_input):
 
 def test_drivegroup_pattern():
     dg = DriveGroupSpec(PlacementSpec(host_pattern='node[1-3]'), data_devices=DeviceSelection(all=True))
-    assert dg.placement.pattern_matches_hosts(['node{}'.format(i) for i in range(10)]) == ['node1', 'node2', 'node3']
+    assert dg.placement.filter_matching_hosts(lambda label=None, as_hostspec=None: ['node{}'.format(i) for i in range(10)]) == ['node1', 'node2', 'node3']
 
 
 def test_drive_selection():