From a6b456dfbdb0098a2362315f41da628f9209bf94 Mon Sep 17 00:00:00 2001
From: Johan Wikman <johan.wikman@mariadb.com>
Date: Mon, 10 Jun 2019 18:39:53 +0300
Subject: [PATCH] MXS-2556 Add support for routers to new config mechanism

---
 include/maxscale/config2.hh |  3 ++-
 server/core/config2.cc      | 26 ++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/include/maxscale/config2.hh b/include/maxscale/config2.hh
index aa952ccf0..47dd37c37 100644
--- a/include/maxscale/config2.hh
+++ b/include/maxscale/config2.hh
@@ -42,7 +42,8 @@ public:
     enum Kind
     {
         FILTER,
-        MONITOR
+        MONITOR,
+        ROUTER
     };
 
     using ParamsByName = std::map<std::string, Param*>;
diff --git a/server/core/config2.cc b/server/core/config2.cc
index 5abad061d..5c184362b 100644
--- a/server/core/config2.cc
+++ b/server/core/config2.cc
@@ -49,6 +49,28 @@ const char* pzCore_monitor_params[] = {
     nullptr,
 };
 
+const char* pzCore_router_params[] =
+{
+    CN_AUTH_ALL_SERVERS,
+    CN_CONNECTION_TIMEOUT,
+    CN_ENABLE_ROOT_USER,
+    CN_LOCALHOST_MATCH_WILDCARD_HOST,
+    CN_LOG_AUTH_WARNINGS,
+    CN_MAX_CONNECTIONS,
+    CN_MAX_RETRY_INTERVAL,
+    CN_NET_WRITE_TIMEOUT,
+    CN_PASSWORD,
+    CN_RETAIN_LAST_STATEMENTS,
+    CN_RETRY_ON_FAILURE,
+    CN_ROUTER,
+    CN_SERVERS,
+    CN_SESSION_TRACK_TRX_STATE,
+    CN_STRIP_DB_ESC,
+    CN_TYPE,
+    CN_USER,
+    nullptr
+};
+
 bool is_core_param(Specification::Kind kind, const std::string& param)
 {
     bool rv = false;
@@ -65,6 +87,10 @@ bool is_core_param(Specification::Kind kind, const std::string& param)
         pzCore_params = pzCore_monitor_params;
         break;
 
+    case Specification::ROUTER:
+        pzCore_params = pzCore_router_params;
+        break;
+
     default:
         mxb_assert(!true);
     }