From 062dedef2c74ffc936bc16ac7172ac0d77b7b7ea Mon Sep 17 00:00:00 2001 From: "norbert.bizet" Date: Tue, 26 Jul 2022 06:46:14 -0400 Subject: [PATCH] cloud: rename ObjectDefaultTier to StorageClass --- bacula/src/stored/stored_conf.c | 2 +- regress/tests/cloud-object-tier-test | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bacula/src/stored/stored_conf.c b/bacula/src/stored/stored_conf.c index 01756af81..47b25f74d 100644 --- a/bacula/src/stored/stored_conf.c +++ b/bacula/src/stored/stored_conf.c @@ -240,7 +240,7 @@ static RES_ITEM cloud_items[] = { {"DriverCommand", store_strname, ITEM(res_cloud.driver_command), 0, 0, 0}, {"TransferPriority", store_transfer_priority, ITEM(res_cloud.transfer_priority), 0, ITEM_DEFAULT, 0}, {"TransferRetention", store_time, ITEM(res_cloud.transfer_retention), 0, ITEM_DEFAULT, 5 * 3600 * 24}, - {"ObjectsDefaultTier", store_objects_default_tier, ITEM(res_cloud.objects_default_tier), 0, ITEM_DEFAULT, 0}, + {"StorageClass", store_objects_default_tier, ITEM(res_cloud.objects_default_tier), 0, ITEM_DEFAULT, 0}, {NULL, NULL, {0}, 0, 0, 0} }; diff --git a/regress/tests/cloud-object-tier-test b/regress/tests/cloud-object-tier-test index 1c9a29fb9..744a3ad79 100755 --- a/regress/tests/cloud-object-tier-test +++ b/regress/tests/cloud-object-tier-test @@ -51,7 +51,7 @@ test_tier() echo " == checking tier[$1]: $2 ==" -$bperl -e 'add_attribute("$conf/bacula-sd.conf", "ObjectsDefaultTier", "'$2'", "Cloud")' +$bperl -e 'add_attribute("$conf/bacula-sd.conf", "StorageClass", "'$2'", "Cloud")' cat <${cwd}/tmp/bconcmds @output /dev/null @@ -86,7 +86,7 @@ else fi } -estat = 0 +estat=0 for key in "${!tiers[@]}"; do test_tier $key ${tiers[$key]}; done -- 2.47.3