test/crimson: extract msgr test commands to header

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>

diff --git a/src/test/crimson/test_cmds.h b/src/test/crimson/test_cmds.h
new file mode 100644 (file)
index 0000000..2320d30
--- /dev/null
+++ b/src/test/crimson/test_cmds.h
@@ -0,0 +1,76 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+
+#pragma once
+
+namespace ceph::net::test {
+
+enum class cmd_t : char {
+  none = '\0',
+  shutdown,
+  suite_start,
+  suite_stop,
+  suite_connect_me,
+  suite_send_me,
+  suite_keepalive_me,
+  suite_markdown,
+  suite_recv_op
+};
+
+enum class policy_t : char {
+  none = '\0',
+  stateful_server,
+  stateless_server,
+  lossless_peer,
+  lossless_peer_reuse,
+  lossy_client,
+  lossless_client
+};
+
+inline std::ostream& operator<<(std::ostream& out, const cmd_t& cmd) {
+  switch(cmd) {
+   case cmd_t::none:
+    return out << "none";
+   case cmd_t::shutdown:
+    return out << "shutdown";
+   case cmd_t::suite_start:
+    return out << "suite_start";
+   case cmd_t::suite_stop:
+    return out << "suite_stop";
+   case cmd_t::suite_connect_me:
+    return out << "suite_connect_me";
+   case cmd_t::suite_send_me:
+    return out << "suite_send_me";
+   case cmd_t::suite_keepalive_me:
+    return out << "suite_keepalive_me";
+   case cmd_t::suite_markdown:
+    return out << "suite_markdown";
+   case cmd_t::suite_recv_op:
+    return out << "suite_recv_op";
+   default:
+    ceph_abort();
+  }
+}
+
+inline std::ostream& operator<<(std::ostream& out, const policy_t& policy) {
+  switch(policy) {
+   case policy_t::none:
+    return out << "none";
+   case policy_t::stateful_server:
+    return out << "stateful_server";
+   case policy_t::stateless_server:
+    return out << "stateless_server";
+   case policy_t::lossless_peer:
+    return out << "lossless_peer";
+   case policy_t::lossless_peer_reuse:
+    return out << "lossless_peer_reuse";
+   case policy_t::lossy_client:
+    return out << "lossy_client";
+   case policy_t::lossless_client:
+    return out << "lossless_client";
+   default:
+    ceph_abort();
+  }
+}
+
+} // namespace ceph::net::test

diff --git a/src/test/crimson/test_messenger.cc b/src/test/crimson/test_messenger.cc
index 484c8fc5ddf2903b22712c6ed8535cb7af989293..d52868ce23813c8165df16762789ad8d2cd9efa6 100644 (file)
--- a/src/test/crimson/test_messenger.cc
+++ b/src/test/crimson/test_messenger.cc
@@ -23,6 +23,8 @@
 #include <seastar/core/reactor.hh>
 #include <seastar/core/sleep.hh>
 
+#include "test_cmds.h"
+
 namespace bpo = boost::program_options;
 
 namespace {
@@ -594,6 +596,8 @@ using crimson::net::Interceptor;
 using crimson::net::Messenger;
 using crimson::net::SocketPolicy;
 using crimson::net::tag_bp_t;
+using ceph::net::test::cmd_t;
+using ceph::net::test::policy_t;
 
 struct counter_t { unsigned counter = 0; };
 
@@ -875,28 +879,6 @@ struct TestInterceptor : public Interceptor {
   }
 };
 
-enum class cmd_t : char {
-  none = '\0',
-  shutdown,
-  suite_start,
-  suite_stop,
-  suite_connect_me,
-  suite_send_me,
-  suite_keepalive_me,
-  suite_markdown,
-  suite_recv_op
-};
-
-enum class policy_t : char {
-  none = '\0',
-  stateful_server,
-  stateless_server,
-  lossless_peer,
-  lossless_peer_reuse,
-  lossy_client,
-  lossless_client
-};
-
 SocketPolicy to_socket_policy(policy_t policy) {
   switch (policy) {
    case policy_t::stateful_server: