Merging lastest 'master' to side branch 'vm'

Conflicts:
	scripts/automation/trex_control_plane/console/trex_console.py

1 files changed, 12 insertions, 0 deletions

diff --git a/src/rpc-server/trex_rpc_cmd.cpp b/src/rpc-server/trex_rpc_cmd.cpp
index fb31fa9d..b5dd121c 100644
--- a/src/rpc-server/trex_rpc_cmd.cpp
+++ b/src/rpc-server/trex_rpc_cmd.cpp
@@ -217,12 +217,24 @@ TrexRpcCommand::parse_string(const Json::Value &parent, const std::string &name,
     return parent[name].asString();
 }
 
+/**
+ * object version
+ */
 const Json::Value &
 TrexRpcCommand::parse_object(const Json::Value &parent, const std::string &name, Json::Value &result) {
     check_field_type(parent, name, FIELD_TYPE_OBJ, result);
     return parent[name];
 }
 
+/**
+ * index version
+ */
+const Json::Value &
+TrexRpcCommand::parse_object(const Json::Value &parent, int index, Json::Value &result) {
+    check_field_type(parent, index, FIELD_TYPE_OBJ, result);
+    return parent[index];
+}
+
 const Json::Value &
 TrexRpcCommand::parse_array(const Json::Value &parent, const std::string &name, Json::Value &result) {
     check_field_type(parent, name, FIELD_TYPE_ARRAY, result);