1 files changed, 147 insertions, 14 deletions

diff --git a/src/rpc-server/commands/trex_rpc_cmd_general.cpp b/src/rpc-server/commands/trex_rpc_cmd_general.cpp
index d5aa3a90..afa15973 100644
--- a/src/rpc-server/commands/trex_rpc_cmd_general.cpp
+++ b/src/rpc-server/commands/trex_rpc_cmd_general.cpp
@@ -18,9 +18,17 @@ 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 <trex_rpc_server_api.h>
 #include <trex_stateless_api.h>
+#include <trex_rpc_cmds_table.h>
+
+#include <fstream>
+#include <iostream>
+#include <unistd.h>
+
+//#include <netdb.h>
 
 #ifndef TREX_RPC_MOCK_SERVER
     #include <../linux_dpdk/version.h>
@@ -29,36 +37,161 @@ limitations under the License.
 using namespace std;
 
 /**
- * get status
+ * ping command
+ */
+trex_rpc_cmd_rc_e 
+TrexRpcCmdPing::_run(const Json::Value &params, Json::Value &result) {
+
+    result["result"] = "ACK";
+    return (TREX_RPC_CMD_OK);
+}
+
+/**
+ * query command
+ */
+trex_rpc_cmd_rc_e 
+TrexRpcCmdGetCmds::_run(const Json::Value &params, Json::Value &result) {
+    vector<string> cmds;
+
+    TrexRpcCommandsTable::get_instance().query(cmds);
+
+    Json::Value test = Json::arrayValue;
+    for (auto cmd : cmds) {
+        test.append(cmd);
+    }
+
+    result["result"] = test;
+
+    return (TREX_RPC_CMD_OK);
+}
+
+/**
+ * get version
  * 
  */
 trex_rpc_cmd_rc_e
-TrexRpcCmdGetStatus::_run(const Json::Value &params, Json::Value &result) {
+TrexRpcCmdGetVersion::_run(const Json::Value &params, Json::Value &result) {
 
     Json::Value &section = result["result"];
 
     #ifndef TREX_RPC_MOCK_SERVER
 
-    section["general"]["version"]       = VERSION_BUILD_NUM;
-    section["general"]["build_date"]    = get_build_date();
-    section["general"]["build_time"]    = get_build_time();
-    section["general"]["built_by"]      = VERSION_USER;
+    section["version"]       = VERSION_BUILD_NUM;
+    section["build_date"]    = get_build_date();
+    section["build_time"]    = get_build_time();
+    section["built_by"]      = VERSION_USER;
 
     #else
 
-    section["general"]["version"]       = "v0.0";
-    section["general"]["build_date"]    = __DATE__;
-    section["general"]["build_time"]    = __TIME__;
-    section["general"]["version_user"]  = "MOCK";
+    section["version"]       = "v0.0";
+    section["build_date"]    = __DATE__;
+    section["build_time"]    = __TIME__;
+    section["built_by"]      = "MOCK";
 
     #endif
 
-    section["general"]["uptime"]        = TrexRpcServer::get_server_uptime();
-    section["general"]["owner"]         = TrexRpcServer::get_owner();
+    return (TREX_RPC_CMD_OK);
+}
+
+/**
+ * get the CPU model
+ * 
+ */
+std::string 
+TrexRpcCmdGetSysInfo::get_cpu_model() {
+
+    static const string cpu_prefix = "model name";
+    std::ifstream cpuinfo("/proc/cpuinfo");
+
+    if (cpuinfo.is_open()) {
+        while (cpuinfo.good()) {
+
+            std::string line;
+            getline(cpuinfo, line);
+
+            int pos = line.find(cpu_prefix);
+            if (pos == string::npos) {
+                continue;
+            }
 
-    // ports
+            /* trim it */
+            int index = cpu_prefix.size() + 1;
+            while ( (line[index] == ' ') || (line[index] == ':') ) {
+                index++;
+            }
 
-    section["ports"]["count"]           = TrexStateless::get_instance().get_port_count();
+            return line.substr(index);
+        }
+    }
+
+    return "unknown";
+}
+
+void
+TrexRpcCmdGetSysInfo::get_hostname(string &hostname) {
+    char buffer[256];
+    buffer[0] = 0;
+
+    gethostname(buffer, sizeof(buffer));
+
+    /* write hostname */
+    hostname = buffer;
+}
+
+/**
+ * get system info
+ * 
+ */
+trex_rpc_cmd_rc_e
+TrexRpcCmdGetSysInfo::_run(const Json::Value &params, Json::Value &result) {
+    string hostname;
+
+    TrexStateless & instance = TrexStateless::get_instance();
+
+    Json::Value &section = result["result"];
+
+    get_hostname(hostname);
+    section["hostname"]  = hostname;
+
+    section["uptime"] = TrexRpcServer::get_server_uptime();
+
+    /* FIXME: core count */
+    section["dp_core_count"] = 1;
+    section["core_type"] = get_cpu_model();
+
+    /* ports */
+   
+
+    section["port_count"] = instance.get_port_count();
+
+    section["ports"] = Json::arrayValue;
+
+    for (int i = 0; i < instance.get_port_count(); i++) {
+        string driver;
+        string speed;
+
+        TrexStatelessPort *port = instance.get_port_by_id(i);
+        port->get_properties(driver, speed);
+
+        section["ports"][i]["index"]   = i;
+        section["ports"][i]["driver"]  = driver;
+        section["ports"][i]["speed"]   = speed;
+
+        switch (port->get_state()) {
+        case TrexStatelessPort::PORT_STATE_DOWN:
+            section["ports"][i]["status"] = "down";
+            break;
+
+        case TrexStatelessPort::PORT_STATE_UP_IDLE:
+            section["ports"][i]["status"] = "idle";
+            break;
+
+        case TrexStatelessPort::PORT_STATE_TRANSMITTING:
+            section["ports"][i]["status"] = "transmitting";
+            break;
+        }
+
+    }
 
     return (TREX_RPC_CMD_OK);
 }