test/encoding/types.h: Adjusting src/messages entries

This patch is about:
- Adding the missing headers from src/messages
- Adding the missing types from the existing headers
- Adding blank lines to keep includes and types in a visual block.
  That is much easier to read and keep the same visual as the rest of the file.

Signed-off-by: Erwan Velu <erwan@redhat.com>

diff --git a/src/test/encoding/types.h b/src/test/encoding/types.h
index a72fb366c3c8ed6e6a1b0e226bc0b22b99c05620..0a9147519d6a377405aede0f0ba1333ff5168b2a 100644 (file)
--- a/src/test/encoding/types.h
+++ b/src/test/encoding/types.h
@@ -505,195 +505,366 @@ TYPE(journal::Entry)
 // --- messages ---
 #include "messages/MAuth.h"
 MESSAGE(MAuth)
+
 #include "messages/MAuthReply.h"
 MESSAGE(MAuthReply)
+
 #include "messages/MCacheExpire.h"
 MESSAGE(MCacheExpire)
+
 #include "messages/MClientCapRelease.h"
 MESSAGE(MClientCapRelease)
+
 #include "messages/MClientCaps.h"
 MESSAGE(MClientCaps)
+
 #include "messages/MClientLease.h"
 MESSAGE(MClientLease)
+
 #include "messages/MClientReconnect.h"
 MESSAGE(MClientReconnect)
+
 #include "messages/MClientReply.h"
 MESSAGE(MClientReply)
+
 #include "messages/MClientRequest.h"
 MESSAGE(MClientRequest)
+
 #include "messages/MClientRequestForward.h"
 MESSAGE(MClientRequestForward)
+
+#include "messages/MClientQuota.h"
+MESSAGE(MClientQuota)
+
 #include "messages/MClientSession.h"
 MESSAGE(MClientSession)
+
 #include "messages/MClientSnap.h"
 MESSAGE(MClientSnap)
+
 #include "messages/MCommand.h"
 MESSAGE(MCommand)
+
 #include "messages/MCommandReply.h"
 MESSAGE(MCommandReply)
+
+#include "messages/MConfig.h"
+MESSAGE(MConfig)
+
+#include "messages/MDataPing.h"
+MESSAGE(MDataPing)
+
 #include "messages/MDentryLink.h"
 MESSAGE(MDentryLink)
+
 #include "messages/MDentryUnlink.h"
 MESSAGE(MDentryUnlink)
+
 #include "messages/MDirUpdate.h"
 MESSAGE(MDirUpdate)
+
 #include "messages/MDiscover.h"
 MESSAGE(MDiscover)
+
 #include "messages/MDiscoverReply.h"
 MESSAGE(MDiscoverReply)
+
 #include "messages/MExportCaps.h"
 MESSAGE(MExportCaps)
+
 #include "messages/MExportCapsAck.h"
 MESSAGE(MExportCapsAck)
+
 #include "messages/MExportDir.h"
 MESSAGE(MExportDir)
+
 #include "messages/MExportDirAck.h"
 MESSAGE(MExportDirAck)
+
 #include "messages/MExportDirCancel.h"
 MESSAGE(MExportDirCancel)
+
 #include "messages/MExportDirDiscover.h"
 MESSAGE(MExportDirDiscover)
+
 #include "messages/MExportDirDiscoverAck.h"
 MESSAGE(MExportDirDiscoverAck)
+
 #include "messages/MExportDirFinish.h"
 MESSAGE(MExportDirFinish)
+
 #include "messages/MExportDirNotify.h"
 MESSAGE(MExportDirNotify)
+
 #include "messages/MExportDirNotifyAck.h"
 MESSAGE(MExportDirNotifyAck)
+
 #include "messages/MExportDirPrep.h"
 MESSAGE(MExportDirPrep)
+
 #include "messages/MExportDirPrepAck.h"
 MESSAGE(MExportDirPrepAck)
+
 #include "messages/MForward.h"
 MESSAGE(MForward)
+
+#include "messages/MFSMap.h"
+MESSAGE(MFSMap)
+
+#include "messages/MFSMapUser.h"
+MESSAGE(MFSMapUser)
+
+#include "messages/MGatherCaps.h"
+MESSAGE(MGatherCaps)
+
+#include "messages/MGenericMessage.h"
+MESSAGE(MGenericMessage)
+
+#include "messages/MGetConfig.h"
+MESSAGE(MGetConfig)
+
 #include "messages/MGetPoolStats.h"
 MESSAGE(MGetPoolStats)
+
 #include "messages/MGetPoolStatsReply.h"
 MESSAGE(MGetPoolStatsReply)
+
 #include "messages/MHeartbeat.h"
 MESSAGE(MHeartbeat)
+
 #include "messages/MInodeFileCaps.h"
 MESSAGE(MInodeFileCaps)
+
 #include "messages/MLock.h"
 MESSAGE(MLock)
+
 #include "messages/MLog.h"
 MESSAGE(MLog)
+
 #include "messages/MLogAck.h"
 MESSAGE(MLogAck)
+
+#include "messages/MMDSOpenIno.h"
+MESSAGE(MMDSOpenIno)
+
+#include "messages/MMDSOpenInoReply.h"
+MESSAGE(MMDSOpenInoReply)
+
 #include "messages/MMDSBeacon.h"
 MESSAGE(MMDSBeacon)
+
 #include "messages/MMDSCacheRejoin.h"
 MESSAGE(MMDSCacheRejoin)
+
 #include "messages/MMDSFindIno.h"
 MESSAGE(MMDSFindIno)
+
 #include "messages/MMDSFindInoReply.h"
 MESSAGE(MMDSFindInoReply)
+
 #include "messages/MMDSFragmentNotify.h"
 MESSAGE(MMDSFragmentNotify)
+
 #include "messages/MMDSLoadTargets.h"
 MESSAGE(MMDSLoadTargets)
+
 #include "messages/MMDSMap.h"
 MESSAGE(MMDSMap)
+
+#include "messages/MMgrReport.h"
+MESSAGE(MMgrReport)
+
 #include "messages/MMDSResolve.h"
 MESSAGE(MMDSResolve)
+
 #include "messages/MMDSResolveAck.h"
 MESSAGE(MMDSResolveAck)
+
 #include "messages/MMDSSlaveRequest.h"
 MESSAGE(MMDSSlaveRequest)
+
+#include "messages/MMDSSnapUpdate.h"
+MESSAGE(MMDSSnapUpdate)
+
 #include "messages/MMDSTableRequest.h"
 MESSAGE(MMDSTableRequest)
+
+#include "messages/MMgrClose.h"
+MESSAGE(MMgrClose)
+
+#include "messages/MMgrConfigure.h"
+MESSAGE(MMgrConfigure)
+
+#include "messages/MMgrDigest.h"
+MESSAGE(MMgrDigest)
+
+#include "messages/MMgrMap.h"
+MESSAGE(MMgrMap)
+
+#include "messages/MMgrOpen.h"
+MESSAGE(MMgrOpen)
+
 #include "messages/MMonCommand.h"
 MESSAGE(MMonCommand)
+
 #include "messages/MMonCommandAck.h"
 MESSAGE(MMonCommandAck)
+
 #include "messages/MMonElection.h"
 MESSAGE(MMonElection)
+
 #include "messages/MMonGetMap.h"
 MESSAGE(MMonGetMap)
+
 #include "messages/MMonGetVersion.h"
 MESSAGE(MMonGetVersion)
+
 #include "messages/MMonGetVersionReply.h"
 MESSAGE(MMonGetVersionReply)
+
 #include "messages/MMonGlobalID.h"
 MESSAGE(MMonGlobalID)
+
 #include "messages/MMonJoin.h"
 MESSAGE(MMonJoin)
+
 #include "messages/MMonMap.h"
 MESSAGE(MMonMap)
+
+#include "messages/MMonMetadata.h"
+MESSAGE(MMonMetadata)
+
 #include "messages/MMonPaxos.h"
 MESSAGE(MMonPaxos)
+
 #include "messages/MMonProbe.h"
 MESSAGE(MMonProbe)
+
 #include "messages/MMonScrub.h"
 MESSAGE(MMonScrub)
+
 #include "messages/MMonSync.h"
 MESSAGE(MMonSync)
+
 #include "messages/MMonSubscribe.h"
 MESSAGE(MMonSubscribe)
+
 #include "messages/MMonSubscribeAck.h"
 MESSAGE(MMonSubscribeAck)
+
+#include "messages/MNop.h"
+MESSAGE(MNop)
+
 #include "messages/MOSDAlive.h"
 MESSAGE(MOSDAlive)
+
 #include "messages/MOSDBoot.h"
 MESSAGE(MOSDBoot)
+
 #include "messages/MOSDFailure.h"
 MESSAGE(MOSDFailure)
+
 #include "messages/MOSDMap.h"
 MESSAGE(MOSDMap)
+
 #include "messages/MOSDOp.h"
 MESSAGE(MOSDOp)
+
 #include "messages/MOSDOpReply.h"
 MESSAGE(MOSDOpReply)
+
 #include "messages/MOSDPGBackfill.h"
 MESSAGE(MOSDPGBackfill)
+
 #include "messages/MOSDPGCreate.h"
 MESSAGE(MOSDPGCreate)
+
+#include "messages/MOSDPGCreate2.h"
+MESSAGE(MOSDPGCreate2)
+
 #include "messages/MOSDPGInfo.h"
 MESSAGE(MOSDPGInfo)
+
 #include "messages/MOSDPGLog.h"
 MESSAGE(MOSDPGLog)
+
 #include "messages/MOSDPGNotify.h"
 MESSAGE(MOSDPGNotify)
+
 #include "messages/MOSDPGQuery.h"
 MESSAGE(MOSDPGQuery)
+
 #include "messages/MOSDPGRemove.h"
 MESSAGE(MOSDPGRemove)
+
 #include "messages/MOSDPGRecoveryDelete.h"
 MESSAGE(MOSDPGRecoveryDelete)
+
 #include "messages/MOSDPGRecoveryDeleteReply.h"
 MESSAGE(MOSDPGRecoveryDeleteReply)
+
 #include "messages/MOSDPGScan.h"
 MESSAGE(MOSDPGScan)
+
 #include "messages/MOSDPGTemp.h"
 MESSAGE(MOSDPGTemp)
+
 #include "messages/MOSDPGTrim.h"
 MESSAGE(MOSDPGTrim)
+
 #include "messages/MOSDPing.h"
 MESSAGE(MOSDPing)
+
 #include "messages/MOSDRepScrub.h"
 MESSAGE(MOSDRepScrub)
+
 #include "messages/MOSDScrub.h"
 MESSAGE(MOSDScrub)
+
+#include "messages/MOSDScrub2.h"
+MESSAGE(MOSDScrub2)
+
 #include "messages/MOSDForceRecovery.h"
 MESSAGE(MOSDForceRecovery)
+
 #include "messages/MPGStats.h"
 MESSAGE(MPGStats)
+
 #include "messages/MPGStatsAck.h"
 MESSAGE(MPGStatsAck)
+
 #include "messages/MPing.h"
 MESSAGE(MPing)
+
 #include "messages/MPoolOp.h"
 MESSAGE(MPoolOp)
+
 #include "messages/MPoolOpReply.h"
 MESSAGE(MPoolOpReply)
+
 #include "messages/MRemoveSnaps.h"
 MESSAGE(MRemoveSnaps)
+
 #include "messages/MRoute.h"
 MESSAGE(MRoute)
+
+#include "messages/MServiceMap.h"
+MESSAGE(MServiceMap)
+
 #include "messages/MStatfs.h"
 MESSAGE(MStatfs)
+
 #include "messages/MStatfsReply.h"
 MESSAGE(MStatfsReply)
+
+#include "messages/MTimeCheck.h"
+MESSAGE(MTimeCheck)
+
+#include "messages/MTimeCheck2.h"
+MESSAGE(MTimeCheck2)
+
 #include "messages/MWatchNotify.h"
 MESSAGE(MWatchNotify)
+
+#include "messages/PaxosServiceMessage.h"
+MESSAGE(PaxosServiceMessage)