ceph-dencoder: add RGWRealm support.

Signed-off-by: yuliyang <yuliyang@cmss.chinamobile.com>

diff --git a/src/rgw/rgw_dencoder.cc b/src/rgw/rgw_dencoder.cc
index c5e7d73e788b811ff40d3b2ba95a4723a70d0712..91078c15db17581fd26b577cc5c889c3e672a870 100644 (file)
--- a/src/rgw/rgw_dencoder.cc
+++ b/src/rgw/rgw_dencoder.cc
@@ -456,6 +456,20 @@ void RGWZone::generate_test_instances(list<RGWZone*> &o)
   o.push_back(new RGWZone);
 }
 
+void RGWRealm::generate_test_instances(list<RGWRealm*> &o)
+{
+  RGWRealm *z = new RGWRealm;
+  o.push_back(z);
+  o.push_back(new RGWRealm);
+}
+
+void RGWPeriod::generate_test_instances(list<RGWPeriod*> &o)
+{
+  RGWPeriod *z = new RGWPeriod;
+  o.push_back(z);
+  o.push_back(new RGWPeriod);
+}
+
 void RGWZoneParams::generate_test_instances(list<RGWZoneParams*> &o)
 {
   o.push_back(new RGWZoneParams);

diff --git a/src/rgw/rgw_zone.h b/src/rgw/rgw_zone.h
index 81a79ae01658a5ce7ffacf75fabd9028d714000c..f982915382ceb099cfc61dc1d294608ecf90141b 100644 (file)
--- a/src/rgw/rgw_zone.h
+++ b/src/rgw/rgw_zone.h
@@ -773,6 +773,7 @@ public:
 
   void dump(Formatter *f) const;
   void decode_json(JSONObj *obj);
+  static void generate_test_instances(list<RGWRealm*>& o);
 
   const std::string& get_current_period() const {
     return current_period;
@@ -971,6 +972,7 @@ public:
   }
   void dump(Formatter *f) const;
   void decode_json(JSONObj *obj);
+  static void generate_test_instances(list<RGWPeriod*>& o);
 
   static std::string get_staging_id(const std::string& realm_id) {
     return realm_id + ":staging";

diff --git a/src/tools/ceph-dencoder/types.h b/src/tools/ceph-dencoder/types.h
index 31770de3a5bb6a5bae711666ddb44ca353a43aa2..8bff4e05251b25b736ce31e166f637bedb3508fe 100644 (file)
--- a/src/tools/ceph-dencoder/types.h
+++ b/src/tools/ceph-dencoder/types.h
@@ -346,6 +346,8 @@ TYPE(RGWObjManifest)
 TYPE(RGWZoneParams)
 TYPE(RGWZone)
 TYPE(RGWZoneGroup)
+TYPE(RGWRealm)
+TYPE(RGWPeriod)
 
 #include "rgw/rgw_acl.h"
 TYPE(ACLPermission)