diff options
Diffstat (limited to 'src/rgw/rgw_dencoder.cc')
-rw-r--r-- | src/rgw/rgw_dencoder.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/rgw/rgw_dencoder.cc b/src/rgw/rgw_dencoder.cc index 3626c9a84e1..0447533f72d 100644 --- a/src/rgw/rgw_dencoder.cc +++ b/src/rgw/rgw_dencoder.cc @@ -13,7 +13,7 @@ void RGWObjManifestPart::generate_test_instances(std::list<RGWObjManifestPart*>& o.push_back(new RGWObjManifestPart); RGWObjManifestPart *p = new RGWObjManifestPart; - rgw_bucket b("bucket", ".pool", "marker_", "12"); + rgw_bucket b("tenant", "bucket", ".pool", "marker_", "12"); p->loc = rgw_obj(b, "object"); p->loc_ofs = 512 * 1024; p->size = 128 * 1024; @@ -25,7 +25,7 @@ void RGWObjManifest::generate_test_instances(std::list<RGWObjManifest*>& o) RGWObjManifest *m = new RGWObjManifest; for (int i = 0; i<10; i++) { RGWObjManifestPart p; - rgw_bucket b("bucket", ".pool", "marker_", "12"); + rgw_bucket b("tenant", "bucket", ".pool", "marker_", "12"); p.loc = rgw_obj(b, "object"); p.loc_ofs = 0; p.size = 512 * 1024; @@ -63,7 +63,7 @@ void rgw_log_entry::generate_test_instances(list<rgw_log_entry*>& o) void rgw_intent_log_entry::generate_test_instances(list<rgw_intent_log_entry*>& o) { rgw_intent_log_entry *e = new rgw_intent_log_entry; - rgw_bucket b("bucket", "pool", "marker", "10"); + rgw_bucket b("tenant", "bucket", "pool", "marker", "10"); e->obj = rgw_obj(b, "object"); e->intent = DEL_OBJ; o.push_back(e); @@ -254,7 +254,7 @@ void RGWUserInfo::generate_test_instances(list<RGWUserInfo*>& o) void rgw_bucket::generate_test_instances(list<rgw_bucket*>& o) { - rgw_bucket *b = new rgw_bucket("name", "pool", "marker", "123"); + rgw_bucket *b = new rgw_bucket("tenant", "name", "pool", "marker", "123"); o.push_back(b); o.push_back(new rgw_bucket); } @@ -262,7 +262,7 @@ void rgw_bucket::generate_test_instances(list<rgw_bucket*>& o) void RGWBucketInfo::generate_test_instances(list<RGWBucketInfo*>& o) { RGWBucketInfo *i = new RGWBucketInfo; - i->bucket = rgw_bucket("bucket", "pool", "marker", "10"); + i->bucket = rgw_bucket("tenant", "bucket", "pool", "marker", "10"); i->owner = "owner"; i->flags = BUCKET_SUSPENDED; o.push_back(i); @@ -272,7 +272,7 @@ void RGWBucketInfo::generate_test_instances(list<RGWBucketInfo*>& o) void RGWBucketEnt::generate_test_instances(list<RGWBucketEnt*>& o) { RGWBucketEnt *e = new RGWBucketEnt; - e->bucket = rgw_bucket("bucket", "pool", "marker", "10"); + e->bucket = rgw_bucket("tenant", "bucket", "pool", "marker", "10"); e->size = 1024; e->size_rounded = 4096; e->count = 1; @@ -292,7 +292,7 @@ void RGWUploadPartInfo::generate_test_instances(list<RGWUploadPartInfo*>& o) void rgw_obj::generate_test_instances(list<rgw_obj*>& o) { - rgw_bucket b = rgw_bucket("bucket", "pool", "marker", "10"); + rgw_bucket b = rgw_bucket("tenant", "bucket", "pool", "marker", "10"); rgw_obj *obj = new rgw_obj(b, "object"); o.push_back(obj); o.push_back(new rgw_obj); |