From 65b3e045334ce93162fadc85ea241b8b7667482d Mon Sep 17 00:00:00 2001 From: imarom Date: Tue, 18 Aug 2015 13:22:53 +0300 Subject: draft --- .../src/commands/trex_rpc_cmd_general.cpp | 47 ++++++++++++++++++++++ src/rpc-server/src/commands/trex_rpc_cmds.h | 29 +++++++++++++ src/rpc-server/src/trex_rpc_cmds_table.cpp | 9 ++++- 3 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 src/rpc-server/src/commands/trex_rpc_cmd_general.cpp (limited to 'src/rpc-server') diff --git a/src/rpc-server/src/commands/trex_rpc_cmd_general.cpp b/src/rpc-server/src/commands/trex_rpc_cmd_general.cpp new file mode 100644 index 00000000..2be4a76f --- /dev/null +++ b/src/rpc-server/src/commands/trex_rpc_cmd_general.cpp @@ -0,0 +1,47 @@ +/* + Itay Marom + Cisco Systems, Inc. +*/ + +/* +Copyright (c) 2015-2015 Cisco Systems, Inc. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ +#include "trex_rpc_cmds.h" +#include <../linux_dpdk/version.h> + +using namespace std; + +/** + * get status + * + */ +TrexRpcCommand::rpc_cmd_rc_e +TrexRpcCmdGetStatus::_run(const Json::Value ¶ms, Json::Value &result) { + + /* validate count */ + if (params.size() != 0) { + return (TrexRpcCommand::RPC_CMD_PARAM_COUNT_ERR); + } + + Json::Value §ion = result["result"]; + + section["general"]["version"] = VERSION_BUILD_NUM; + section["general"]["build_date"] = get_build_date(); + section["general"]["build_time"] = get_build_time(); + section["general"]["version_user"] = VERSION_USER; + + return (RPC_CMD_OK); +} + diff --git a/src/rpc-server/src/commands/trex_rpc_cmds.h b/src/rpc-server/src/commands/trex_rpc_cmds.h index 44b72c4c..0778b75d 100644 --- a/src/rpc-server/src/commands/trex_rpc_cmds.h +++ b/src/rpc-server/src/commands/trex_rpc_cmds.h @@ -28,6 +28,11 @@ limitations under the License. /* all the RPC commands decl. goes here */ /******************* test section ************/ + +/** + * add + * + */ class TrexRpcCmdTestAdd : public TrexRpcCommand { public: TrexRpcCmdTestAdd() : TrexRpcCommand("rpc_test_add") {} @@ -35,6 +40,10 @@ protected: virtual rpc_cmd_rc_e _run(const Json::Value ¶ms, Json::Value &result); }; +/** + * sub + * + */ class TrexRpcCmdTestSub : public TrexRpcCommand { public: TrexRpcCmdTestSub() : TrexRpcCommand("rpc_test_sub") {} ; @@ -42,6 +51,10 @@ protected: virtual rpc_cmd_rc_e _run(const Json::Value ¶ms, Json::Value &result); }; +/** + * ping + * + */ class TrexRpcCmdPing : public TrexRpcCommand { public: TrexRpcCmdPing() : TrexRpcCommand("rpc_ping") {}; @@ -49,6 +62,10 @@ protected: virtual rpc_cmd_rc_e _run(const Json::Value ¶ms, Json::Value &result); }; +/** + * get all registered commands + * + */ class TrexRpcCmdGetReg : public TrexRpcCommand { public: TrexRpcCmdGetReg() : TrexRpcCommand("rpc_get_reg_cmds") {}; @@ -56,5 +73,17 @@ protected: virtual rpc_cmd_rc_e _run(const Json::Value ¶ms, Json::Value &result); }; +/** + * get status + * + */ +class TrexRpcCmdGetStatus : public TrexRpcCommand { +public: + TrexRpcCmdGetStatus() : TrexRpcCommand("rpc_get_status") {}; +protected: + virtual rpc_cmd_rc_e _run(const Json::Value ¶ms, Json::Value &result); +}; + + /**************** test section end *************/ #endif /* __TREX_RPC_CMD_H__ */ diff --git a/src/rpc-server/src/trex_rpc_cmds_table.cpp b/src/rpc-server/src/trex_rpc_cmds_table.cpp index 7635f14f..04a56389 100644 --- a/src/rpc-server/src/trex_rpc_cmds_table.cpp +++ b/src/rpc-server/src/trex_rpc_cmds_table.cpp @@ -32,6 +32,7 @@ TrexRpcCommandsTable::TrexRpcCommandsTable() { register_command(new TrexRpcCmdTestSub()); register_command(new TrexRpcCmdPing()); register_command(new TrexRpcCmdGetReg()); + register_command(new TrexRpcCmdGetStatus()); } TrexRpcCommandsTable::~TrexRpcCommandsTable() { @@ -41,7 +42,13 @@ TrexRpcCommandsTable::~TrexRpcCommandsTable() { } TrexRpcCommand * TrexRpcCommandsTable::lookup(const string &method_name) { - return m_rpc_cmd_table[method_name]; + auto search = m_rpc_cmd_table.find(method_name); + + if (search != m_rpc_cmd_table.end()) { + return search->second; + } else { + return NULL; + } } -- cgit 1.2.3-korg