new port attr commands: flow control, link status, led status

add user friendly description to ports
add xstats
enable start with link down at stateless. in CPP status will update itself upon link up, in Python need to restart client at this phase.

Signed-off-by: Yaroslav Brustinov <ybrustin@cisco.com>

4 files changed, 88 insertions, 10 deletions

diff --git a/src/rpc-server/commands/trex_rpc_cmd_general.cpp b/src/rpc-server/commands/trex_rpc_cmd_general.cpp
index 342ec594..f6b088a5 100644
--- a/src/rpc-server/commands/trex_rpc_cmd_general.cpp
+++ b/src/rpc-server/commands/trex_rpc_cmd_general.cpp
@@ -346,18 +346,38 @@ trex_rpc_cmd_rc_e
 TrexRpcCmdSetPortAttr::_run(const Json::Value &params, Json::Value &result) {
 
     uint8_t port_id = parse_port(params, result);
-    TrexStatelessPort *port = get_stateless_obj()->get_port_by_id(port_id);
 
     const Json::Value &attr = parse_object(params, "attr", result);
-
+    int ret = 0;
     /* iterate over all attributes in the dict */
     for (const std::string &name : attr.getMemberNames()) {
-
-        /* handle promiscuous */
         if (name == "promiscuous") {
             bool enabled = parse_bool(attr[name], "enabled", result);
-            port->set_promiscuous(enabled);
+            ret = get_stateless_obj()->get_platform_api()->set_promiscuous(port_id, enabled);
+        }
+        else if (name == "link_status") {
+            bool up = parse_bool(attr[name], "up", result);
+            ret = get_stateless_obj()->get_platform_api()->set_link_status(port_id, up);
+        }
+        else if (name == "led_status") {
+            bool on = parse_bool(attr[name], "on", result);
+            ret = get_stateless_obj()->get_platform_api()->set_led_status(port_id, on);
+        } else if (name == "flow_ctrl_mode") {
+            int mode = parse_int(attr[name], "mode", result);
+            ret = get_stateless_obj()->get_platform_api()->set_flow_ctrl(port_id, mode);
+        } else {
+            generate_execute_err(result, "Not recognized attribute: " + name);
+            break;
         }
+        if (ret != 0){
+            if ( ret == -ENOTSUP ) {
+                generate_execute_err(result, "Error applying " + name + ": operation is not supported for this NIC.");
+            }
+            else if (ret) {
+                generate_execute_err(result, "Error applying " + name + " attribute, return value: " + to_string(ret));
+            }
+        }
+        break;
     }
 
     result["result"] = Json::objectValue;
@@ -437,6 +457,60 @@ TrexRpcCmdRelease::_run(const Json::Value &params, Json::Value &result) {
 }
 
 /**
+ * get port extended stats names (keys of dict)
+ *
+ */
+trex_rpc_cmd_rc_e
+TrexRpcCmdGetPortXStatsNames::_run(const Json::Value &params, Json::Value &result) {
+
+    uint8_t port_id = parse_port(params, result);
+    xstats_names_t xstats_names;
+
+    int ret = get_stateless_obj()->get_platform_api()->get_xstats_names(port_id, xstats_names);
+    if (ret < 0) {
+        if ( ret == -ENOTSUP ) {
+            generate_execute_err(result, "Operation not supported");
+        }
+        else if (ret) {
+            generate_execute_err(result, "Operation failed, error code: " + to_string(ret));
+        }
+    } else {
+        for (int i=0; i<xstats_names.size(); i++) {
+            result["result"]["xstats_names"].append(xstats_names[i]);
+        }
+    }
+
+    return (TREX_RPC_CMD_OK);
+}
+
+/**
+ * get port extended stats (values of dict)
+ *
+ */
+trex_rpc_cmd_rc_e
+TrexRpcCmdGetPortXStatsValues::_run(const Json::Value &params, Json::Value &result) {
+
+    uint8_t port_id = parse_port(params, result);
+    xstats_values_t xstats_values;
+
+    int ret = get_stateless_obj()->get_platform_api()->get_xstats_values(port_id, xstats_values);
+    if (ret < 0) {
+        if ( ret == -ENOTSUP ) {
+            generate_execute_err(result, "Operation not supported");
+        }
+        else if (ret) {
+            generate_execute_err(result, "Operation failed, error code: " + to_string(ret));
+        }
+    } else {
+        for (int i=0; i<xstats_values.size(); i++) {
+            result["result"]["xstats_values"].append((Json::Value::UInt64) xstats_values[i]);
+        }
+    }
+
+    return (TREX_RPC_CMD_OK);
+}
+
+/**
  * get port stats
  *
  */
@@ -477,7 +551,7 @@ TrexRpcCmdGetPortStatus::_run(const Json::Value &params, Json::Value &result) {
     result["result"]["max_stream_id"] = port->get_max_stream_id();
 
     /* attributes */
-    result["result"]["attr"]["promiscuous"]["enabled"] = port->get_promiscuous();
+    result["result"]["attr"]["promiscuous"]["enabled"] = get_stateless_obj()->get_platform_api()->get_promiscuous(port_id);
 
     return (TREX_RPC_CMD_OK);
 }
diff --git a/src/rpc-server/commands/trex_rpc_cmds.h b/src/rpc-server/commands/trex_rpc_cmds.h
index a68796ae..5fde1d0c 100644
--- a/src/rpc-server/commands/trex_rpc_cmds.h
+++ b/src/rpc-server/commands/trex_rpc_cmds.h
@@ -87,9 +87,11 @@ TREX_RPC_CMD_DEFINE(TrexRpcCmdRelease,    "release",         1, true,  APIClass:
 /**
  * port commands
  */
-TREX_RPC_CMD_DEFINE(TrexRpcCmdGetPortStats,   "get_port_stats",   1, false, APIClass::API_CLASS_TYPE_CORE);
-TREX_RPC_CMD_DEFINE(TrexRpcCmdGetPortStatus,  "get_port_status",  1, false, APIClass::API_CLASS_TYPE_CORE);
-TREX_RPC_CMD_DEFINE(TrexRpcCmdSetPortAttr,    "set_port_attr",    3, false, APIClass::API_CLASS_TYPE_CORE);
+TREX_RPC_CMD_DEFINE(TrexRpcCmdGetPortStats,        "get_port_stats",         1, false, APIClass::API_CLASS_TYPE_CORE);
+TREX_RPC_CMD_DEFINE(TrexRpcCmdGetPortStatus,       "get_port_status",        1, false, APIClass::API_CLASS_TYPE_CORE);
+TREX_RPC_CMD_DEFINE(TrexRpcCmdSetPortAttr,         "set_port_attr",          2, true,  APIClass::API_CLASS_TYPE_CORE);
+TREX_RPC_CMD_DEFINE(TrexRpcCmdGetPortXStatsValues, "get_port_xstats_values", 1, false, APIClass::API_CLASS_TYPE_CORE);
+TREX_RPC_CMD_DEFINE(TrexRpcCmdGetPortXStatsNames,  "get_port_xstats_names",  1, false, APIClass::API_CLASS_TYPE_CORE);
 
 /**
  * stream cmds
diff --git a/src/rpc-server/trex_rpc_cmd.cpp b/src/rpc-server/trex_rpc_cmd.cpp
index 28145f13..265d426b 100644
--- a/src/rpc-server/trex_rpc_cmd.cpp
+++ b/src/rpc-server/trex_rpc_cmd.cpp
@@ -87,7 +87,7 @@ TrexRpcCommand::check_param_count(const Json::Value &params, int expected, Json:
 
     if (params.size() < expected) {
         std::stringstream ss;
-        ss << "method expects at least '" << expected << "' parameter(s), '" << params.size() << "' provided";
+        ss << "method '" << m_name << "' expects at least " << expected << " parameter(s), " << params.size() << " provided";
         generate_parse_err(result, ss.str());
     }
 }
diff --git a/src/rpc-server/trex_rpc_cmds_table.cpp b/src/rpc-server/trex_rpc_cmds_table.cpp
index 762dd614..cddf19b9 100644
--- a/src/rpc-server/trex_rpc_cmds_table.cpp
+++ b/src/rpc-server/trex_rpc_cmds_table.cpp
@@ -47,6 +47,8 @@ TrexRpcCommandsTable::TrexRpcCommandsTable() {
     register_command(new TrexRpcCmdGetPortStats());
     register_command(new TrexRpcCmdGetPortStatus());
     register_command(new TrexRpcCmdSetPortAttr());
+    register_command(new TrexRpcCmdGetPortXStatsValues());
+    register_command(new TrexRpcCmdGetPortXStatsNames());
     
 
     /* stream commands */