Merge branch 'rpc' -> add support for interactive mode

1 files changed, 4 insertions, 13 deletions

diff --git a/src/rpc-server/commands/trex_rpc_cmd_general.cpp b/src/rpc-server/commands/trex_rpc_cmd_general.cpp
index 0c9f2c49..ae87d749 100644
--- a/src/rpc-server/commands/trex_rpc_cmd_general.cpp
+++ b/src/rpc-server/commands/trex_rpc_cmd_general.cpp
@@ -21,7 +21,8 @@ limitations under the License.
 
 #include "trex_rpc_cmds.h"
 #include <trex_rpc_server_api.h>
-#include <trex_stateless_api.h>
+#include <trex_stateless.h>
+#include <trex_stateless_port.h>
 #include <trex_rpc_cmds_table.h>
 
 #include <fstream>
@@ -154,7 +155,7 @@ TrexRpcCmdGetSysInfo::_run(const Json::Value &params, Json::Value &result) {
     section["uptime"] = TrexRpcServer::get_server_uptime();
 
     /* FIXME: core count */
-    section["dp_core_count"] = 1;
+    section["dp_core_count"] = instance.get_dp_core_count();
     section["core_type"] = get_cpu_model();
 
     /* ports */
@@ -271,17 +272,7 @@ TrexRpcCmdGetPortStats::_run(const Json::Value &params, Json::Value &result) {
 
     result["result"]["status"] = port->get_state_as_string();
 
-    result["result"]["tx_bps"]         = Json::Value::UInt64(port->get_port_stats().tx_bps);
-    result["result"]["tx_pps"]         = Json::Value::UInt64(port->get_port_stats().tx_pps);
-    result["result"]["total_tx_pkts"]  = Json::Value::UInt64(port->get_port_stats().total_tx_pkts);
-    result["result"]["total_tx_bytes"] = Json::Value::UInt64(port->get_port_stats().total_tx_bytes);
-
-    result["result"]["rx_bps"]         = Json::Value::UInt64(port->get_port_stats().rx_bps);
-    result["result"]["rx_pps"]         = Json::Value::UInt64(port->get_port_stats().rx_pps);
-    result["result"]["total_rx_pkts"]  = Json::Value::UInt64(port->get_port_stats().total_rx_pkts);
-    result["result"]["total_rx_bytes"] = Json::Value::UInt64(port->get_port_stats().total_rx_bytes);
-
-    result["result"]["tx_rx_error"]    = Json::Value::UInt64(port->get_port_stats().tx_rx_errors);
+    port->encode_stats(result["result"]);
 
     return (TREX_RPC_CMD_OK);
 }