import quincy beta 17.1.0

[ceph.git] / ceph / src / rgw / rgw_basic_types.cc

diff --git a/ceph/src/rgw/rgw_basic_types.cc b/ceph/src/rgw/rgw_basic_types.cc
index 01cca48c2185cf91b6dea8ea68e29df6a26b9539..f306fa10ac9ea1e5e4afbec472fda45749d9f3df 100644 (file)
--- a/ceph/src/rgw/rgw_basic_types.cc
+++ b/ceph/src/rgw/rgw_basic_types.cc
@@ -8,12 +8,18 @@
 #include "cls/user/cls_user_types.h"
 
 #include "rgw_basic_types.h"
+#include "rgw_bucket.h"
 #include "rgw_xml.h"
+
 #include "common/ceph_json.h"
+#include "common/Formatter.h"
 
+using std::ostream;
 using std::string;
 using std::stringstream;
 
+using namespace std;
+
 void decode_json_obj(rgw_user& val, JSONObj *obj)
 {
   val.from_str(obj->get_data());
@@ -69,6 +75,14 @@ std::string rgw_bucket::get_key(char tenant_delim, char id_delim, size_t reserve
   return key;
 }
 
+void rgw_bucket::generate_test_instances(list<rgw_bucket*>& o)
+{
+  rgw_bucket *b = new rgw_bucket;
+  init_bucket(b, "tenant", "name", "pool", ".index_pool", "marker", "123");
+  o.push_back(b);
+  o.push_back(new rgw_bucket);
+}
+
 std::string rgw_bucket_shard::get_key(char tenant_delim, char id_delim,
                                       char shard_delim) const
 {
@@ -91,6 +105,50 @@ void decode_json_obj(rgw_zone_id& zid, JSONObj *obj)
   decode_json_obj(zid.id, obj);
 }
 
+void rgw_user::generate_test_instances(list<rgw_user*>& o)
+{
+  rgw_user *u = new rgw_user("tenant", "user");
+
+  o.push_back(u);
+  o.push_back(new rgw_user);
+}
+
+void rgw_data_placement_target::dump(Formatter *f) const
+{
+  encode_json("data_pool", data_pool, f);
+  encode_json("data_extra_pool", data_extra_pool, f);
+  encode_json("index_pool", index_pool, f);
+}
+
+void rgw_data_placement_target::decode_json(JSONObj *obj) {
+  JSONDecoder::decode_json("data_pool", data_pool, obj);
+  JSONDecoder::decode_json("data_extra_pool", data_extra_pool, obj);
+  JSONDecoder::decode_json("index_pool", index_pool, obj);
+}
+
+void rgw_bucket::dump(Formatter *f) const
+{
+  encode_json("name", name, f);
+  encode_json("marker", marker, f);
+  encode_json("bucket_id", bucket_id, f);
+  encode_json("tenant", tenant, f);
+  encode_json("explicit_placement", explicit_placement, f);
+}
+
+void rgw_bucket::decode_json(JSONObj *obj) {
+  JSONDecoder::decode_json("name", name, obj);
+  JSONDecoder::decode_json("marker", marker, obj);
+  JSONDecoder::decode_json("bucket_id", bucket_id, obj);
+  JSONDecoder::decode_json("tenant", tenant, obj);
+  JSONDecoder::decode_json("explicit_placement", explicit_placement, obj);
+  if (explicit_placement.data_pool.empty()) {
+    /* decoding old format */
+    JSONDecoder::decode_json("pool", explicit_placement.data_pool, obj);
+    JSONDecoder::decode_json("data_extra_pool", explicit_placement.data_extra_pool, obj);
+    JSONDecoder::decode_json("index_pool", explicit_placement.index_pool, obj);
+  }
+}
+
 namespace rgw {
 namespace auth {
 ostream& operator <<(ostream& m, const Principal& p) {