From 8ad5a15156c11e23c95a0969a4ec0eb3f79846cf Mon Sep 17 00:00:00 2001 From: Tim Burke Date: Mon, 28 Dec 2015 14:41:26 -0800 Subject: [PATCH] Include region when adding devices for functional tests This should quiet warnings like "WARNING: No region specified for z0-127.0.0.1:6000/sda. Defaulting to region 1." that have been appearing in test runs. Change-Id: Icbfdf52cf93ffaf187955b1c339f9f4799022c6f --- swift3/test/functional/run_test.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/swift3/test/functional/run_test.sh b/swift3/test/functional/run_test.sh index f986db34..f87cdc8d 100755 --- a/swift3/test/functional/run_test.sh +++ b/swift3/test/functional/run_test.sh @@ -58,15 +58,15 @@ swift-ring-builder object.builder create 0 3 0 swift-ring-builder container.builder create 0 3 0 swift-ring-builder account.builder create 0 3 0 -swift-ring-builder object.builder add z0-127.0.0.1:6000/sda 1 -swift-ring-builder object.builder add z1-127.0.0.1:6000/sdb 1 -swift-ring-builder object.builder add z2-127.0.0.1:6000/sdc 1 -swift-ring-builder container.builder add z0-127.0.0.1:6001/sda 1 -swift-ring-builder container.builder add z1-127.0.0.1:6001/sdb 1 -swift-ring-builder container.builder add z2-127.0.0.1:6001/sdc 1 -swift-ring-builder account.builder add z0-127.0.0.1:6002/sda 1 -swift-ring-builder account.builder add z1-127.0.0.1:6002/sdb 1 -swift-ring-builder account.builder add z2-127.0.0.1:6002/sdc 1 +swift-ring-builder object.builder add r1z0-127.0.0.1:6000/sda 1 +swift-ring-builder object.builder add r1z1-127.0.0.1:6000/sdb 1 +swift-ring-builder object.builder add r1z2-127.0.0.1:6000/sdc 1 +swift-ring-builder container.builder add r1z0-127.0.0.1:6001/sda 1 +swift-ring-builder container.builder add r1z1-127.0.0.1:6001/sdb 1 +swift-ring-builder container.builder add r1z2-127.0.0.1:6001/sdc 1 +swift-ring-builder account.builder add r1z0-127.0.0.1:6002/sda 1 +swift-ring-builder account.builder add r1z1-127.0.0.1:6002/sdb 1 +swift-ring-builder account.builder add r1z2-127.0.0.1:6002/sdc 1 swift-ring-builder object.builder rebalance swift-ring-builder container.builder rebalance