From 0a742831f423e5cc066ddda2bd52cf32f4487801 Mon Sep 17 00:00:00 2001 From: "Rutkowski, Adam J" Date: Thu, 11 Aug 2022 12:06:34 +0200 Subject: [PATCH] Update DRBD API usage (create-md requires force param) Signed-off-by: Rutkowski, Adam J --- test/functional/tests/example/example_test.py | 4 ++-- .../tests/failover_standby/test_failover_multihost.py | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/functional/tests/example/example_test.py b/test/functional/tests/example/example_test.py index 4cf06cc..87aebdd 100644 --- a/test/functional/tests/example/example_test.py +++ b/test/functional/tests/example/example_test.py @@ -195,12 +195,12 @@ def test_drbd_example(): with TestRun.use_dut(dut1), TestRun.step(f"Create a DRBD instance on {dut1}"): primary = Drbd(caches) - primary.create_metadata() + primary.create_metadata(force=True) primary.up() with TestRun.use_dut(dut2), TestRun.step(f"Create a DRBD instance on {dut2}"): secondary = Drbd(caches) - secondary.create_metadata() + secondary.create_metadata(force=True) secondary.up() with TestRun.use_dut(dut1), TestRun.step(f"Set {dut1} as primary node"): diff --git a/test/functional/tests/failover_standby/test_failover_multihost.py b/test/functional/tests/failover_standby/test_failover_multihost.py index 5a478d6..fd01db5 100644 --- a/test/functional/tests/failover_standby/test_failover_multihost.py +++ b/test/functional/tests/failover_standby/test_failover_multihost.py @@ -114,12 +114,12 @@ def test_functional_activate_twice_round_trip(filesystem): with TestRun.use_dut(dut), TestRun.step(f"Create DRBD instances on {dut.ip}"): caches_original_resource.save() dut.cache_drbd = Drbd(caches_original_resource) - dut.cache_drbd.create_metadata() + dut.cache_drbd.create_metadata(force=True) dut.cache_drbd_dev = dut.cache_drbd.up() cores_resource.save() dut.core_drbd = Drbd(cores_resource) - dut.core_drbd.create_metadata() + dut.core_drbd.create_metadata(force=True) dut.core_drbd_dev = dut.core_drbd.up() with TestRun.use_dut(primary_node), TestRun.step( @@ -284,12 +284,12 @@ def test_functional_activate_twice_new_host(filesystem): with TestRun.use_dut(dut), TestRun.step(f"Create DRBD instances on {dut.ip}"): caches_original_resource.save() dut.cache_drbd = Drbd(caches_original_resource) - dut.cache_drbd.create_metadata() + dut.cache_drbd.create_metadata(force=True) dut.cache_drbd_dev = dut.cache_drbd.up() cores_resource.save() dut.core_drbd = Drbd(cores_resource) - dut.core_drbd.create_metadata() + dut.core_drbd.create_metadata(force=True) dut.core_drbd_dev = dut.core_drbd.up() with TestRun.use_dut(primary_node), TestRun.step( @@ -556,6 +556,6 @@ def new_failover_instance(new_secondary_node, drbd_resource, *, autoload): ): drbd_resource.save() if not autoload: - new_secondary_node.cache_drbd.create_metadata() + new_secondary_node.cache_drbd.create_metadata(force=True) new_secondary_node.cache_drbd = Drbd(drbd_resource) new_secondary_node.cache_drbd_dev = new_secondary_node.cache_drbd.up()