cloud: rename ObjectDefaultTier to StorageClass

diff --git a/bacula/src/stored/stored_conf.c b/bacula/src/stored/stored_conf.c
index 01756af811499e7966dd49befd93295f7556af39..47b25f74d09b951f36e473c02a59957055bb74c9 100644 (file)
--- 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 1c9a29fb9a1e8024a2f5a0e5aaa7f98092eb0f92..744a3ad790b37f7dd34a99e30994366b6696f00d 100755 (executable)
--- 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 <<END_OF_DATA >${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