From f5eb845a0f7a2c28d3a88a37479bcb34f882f40c Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Fri, 8 Feb 2013 13:14:49 -0800 Subject: [PATCH] rgw: change json formatting for swift list container Fixes: #4048 There is some difference in the way swift formats the xml output and the json output for list container. In xml the entity is named 'name' and in json it is named 'subdir'. Signed-off-by: Yehuda Sadeh (cherry picked from commit 3e4d79fe42dfc3ca70dc4d5d2aff5223f62eb34b) --- src/rgw/rgw_rest_swift.cc | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/rgw/rgw_rest_swift.cc b/src/rgw/rgw_rest_swift.cc index 64614b5f59baf..34a73633f9ae2 100644 --- a/src/rgw/rgw_rest_swift.cc +++ b/src/rgw/rgw_rest_swift.cc @@ -158,9 +158,17 @@ void RGWListBucket_ObjStore_SWIFT::send_response() if (name.compare(delimiter) == 0) goto next; - s->formatter->open_object_section("object"); - s->formatter->dump_string("name", pref_iter->first); - s->formatter->close_section(); + s->formatter->open_object_section("subdir"); + + /* swift is a bit inconsistent here */ + switch (s->format) { + case RGW_FORMAT_XML: + s->formatter->dump_string("name", pref_iter->first); + break; + default: + s->formatter->dump_string("subdir", pref_iter->first); + } + s->formatter->close_section(); } next: if (do_objs) -- 2.39.5