Implement devtest tool for testing in cli

Author: AswiniViswanathan

inc/em.h

@@ -61,6 +61,7 @@ class em_t :
     pthread_t   m_tid;
     bool    m_exit;
     bool m_is_al_em;
+    bool dev_test_enable;
 
 	/**
 	 * @brief Set of hashed messages that have been sent in co-located systems
@@ -1149,7 +1150,9 @@ class em_t :
 	 */
 	static const char *state_2_str(em_state_t state);
 
-    
+
+	bool get_devteststatus(){return dev_test_enable;}
+	void set_devteststatus(bool enable ) { dev_test_enable = enable;} 
 	/**!
 	 * @brief Initializes the EasyMesh interface with the specified parameters.
 	 *

inc/em_base.h

@@ -1925,6 +1925,7 @@ typedef enum {
     em_cmd_type_btm_sta,
     em_cmd_type_dev_init,
     em_cmd_type_dev_test,
+    em_cmd_type_set_dev_test,
     em_cmd_type_cfg_renew,
     em_cmd_type_vap_config,
     em_cmd_type_sta_list,
@@ -2544,6 +2545,7 @@ typedef enum {
     em_bus_event_type_chirp,
     em_bus_event_type_reset,
     em_bus_event_type_dev_test,
+    em_bus_event_type_set_dev_test,
     em_bus_event_type_get_network,
     em_bus_event_type_get_device,
     em_bus_event_type_remove_device,
@@ -3063,6 +3065,31 @@ typedef struct {
 	em_cli_type_t	cli_type;
 } em_cli_params_t;
 
+typedef enum {
+	em_dev_test_type_ssid,
+	em_dev_test_type_channel,
+	em_dev_test_type_max
+} em_dev_test_type;
+
+typedef enum {
+        em_dev_test_status_inprogess,
+        em_dev_test_status_idle,
+	em_dev_test_status_complete,
+	em_dev_test_status_failed,
+        em_dev_test_status_max
+} em_dev_test_status;
+
+typedef struct{
+	int num_iteration[em_dev_test_type_max];
+	em_dev_test_type test_type[em_dev_test_type_max];
+	int enabled[em_dev_test_type_max];
+	int num_of_iteration_completed[em_dev_test_type_max];
+	int test_inprogress[em_dev_test_type_max];
+	em_dev_test_status test_status[em_dev_test_type_max];
+        em_haul_type_t haul_type;
+        em_freq_band_t freq_band;
+}em_dev_test_info;
+
 #ifndef SSL_KEY
 #if OPENSSL_VERSION_NUMBER < 0x30000000L
 #define SSL_KEY EC_KEY

inc/em_cli.h

@@ -21,6 +21,7 @@
 
 #include "em_base.h"
 #include "em_cmd_exec.h"
+#include <pthread.h>
 
 class em_cli_t {
 
@@ -40,7 +41,7 @@ class em_cli_t {
 	 */
 	em_cmd_t& get_command(char *in, size_t in_len, em_network_node_t *node = NULL);
     em_long_string_t	m_lib_dbg_file_name;
-
+	pthread_mutex_t cli_lock;
 public:
 
 	em_cli_params_t	m_params;
@@ -141,7 +142,6 @@ class em_cli_t {
 	 */
 	void dump_lib_dbg(char *str);
 
-    
 	/**!
 	 * @brief Constructor for the em_cli_t class.
 	 *

inc/em_cli_apis.h

@@ -399,7 +399,6 @@ extern "C" {
 	 * @note Ensure that the format string is correctly specified to avoid runtime errors.
 	 */
 	void dump_lib_dbg(char *fmt);
-
 #ifdef __cplusplus
 }  // extern "C"
 #endif

inc/em_cmd_cli.h

@@ -47,8 +47,8 @@ class em_cmd_cli_t : public em_cmd_exec_t {
 	 *
 	 * @note Ensure that the node and buff are properly initialized before calling this function.
 	 */
-	int     get_edited_node(em_network_node_t *node, const char *header, char *buff);
-    
+   	static int     get_edited_node(em_network_node_t *node, const char *header, char *buff);
+ 
 	/**!
 	 * @brief Executes a command and stores the result.
 	 *
@@ -64,7 +64,6 @@ class em_cmd_cli_t : public em_cmd_exec_t {
 	 */
 	int execute(char *result);
 
-    
 	/**!
 	 * @brief Constructor for the em_cmd_cli_t class.
 	 *

inc/em_ctrl.h

@@ -24,6 +24,7 @@
 #include "dm_easy_mesh_ctrl.h"
 #include "em_orch_ctrl.h"
 #include "bus.h"
+#include "em_dev_test_ctrl.h"
 
 class em_cmd_ctrl_t;
 class AlServiceAccessPoint;
@@ -34,7 +35,7 @@ class em_ctrl_t : public em_mgr_t {
     em_cmd_ctrl_t   *m_ctrl_cmd;
     em_orch_ctrl_t *m_orch;
 	bus_handle_t m_bus_hdl;
-
+	em_dev_test_t dev_test;
 
 	/**!
 	 * @brief Handles a bus event.
@@ -306,7 +307,8 @@ class em_ctrl_t : public em_mgr_t {
 	 *
 	 * @note Ensure that the event structure is properly initialized before passing it to this function.
 	 */
-	void handle_dev_test(em_bus_event_t *evt);
+	void handle_get_dev_test(em_bus_event_t *evt);
+	void handle_set_dev_test(em_bus_event_t *evt);
 
 	/**!
 	 * @brief Handles the get database event.

inc/em_dev_test_ctrl.h

@@ -0,0 +1,36 @@
+/**
+ * Copyright 2023 Comcast Cable Communications Management, LLC
+ *
+ * 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.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef EMDEVTEST_H
+#define EMDEVTEST_H
+
+#include "em_base.h"
+#define DEV_TEST_COMMAND_COUNT 2
+class em_dev_test_t {
+
+public:
+    em_dev_test_info dev_test_info;
+    void encode(em_subdoc_info_t *subdoc, hash_map_t *m_em_map, bool update, bool autconfig_renew_status);
+    void analyze_set_dev_test(em_bus_event_t *evt, hash_map_t *m_em_map);
+    void decode(em_subdoc_info_t *subdoc, hash_map_t *m_em_map, const char *str);
+    em_dev_test_t();
+    ~em_dev_test_t();
+
+};
+
+#endif

inc/em_orch.h

@@ -259,6 +259,17 @@ class em_orch_t {
 	 * @returns True if the command type is in progress, false otherwise.
 	 */
 	bool is_cmd_type_in_progress(em_bus_event_t *evt);
+
+	/**!
+	 * @brief Checks if a command type is currently in progress.
+	 *
+	 * This function determines whether a dev test commands types are identified by the
+	 * parameter `type`, is currently being processed or is in progress.
+	 *
+	 *
+	 * @returns True if the command type is in progress, false otherwise.
+	 */
+	bool get_dev_test_status();
 
 	/**!
 	 * @brief Checks if a command type is currently in progress.

src/agent/dm_easy_mesh_agent.cpp

@@ -159,10 +159,13 @@ int dm_easy_mesh_agent_t::analyze_autoconfig_renew(em_bus_event_t *evt, em_cmd_t
     int num = 0;
     unsigned int index = 0;
     em_cmd_t *tmp;
+    mac_addr_str_t mac_str;
 
     raw = (em_bus_event_type_cfg_renew_params_t *)evt->u.raw_buff;
     memcpy(dm.get_controller_interface_mac(), raw->ctrl_src, sizeof(mac_address_t));
     memcpy(dm.get_radio(index)->get_radio_info()->intf.mac, raw->radio, sizeof(mac_address_t));
+    dm_easy_mesh_t::macbytes_to_string(raw->radio, mac_str);
+    printf("%s:%d Renew Radiomac = %s\n", __func__, __LINE__,mac_str);
     pcmd[num] = new em_cmd_cfg_renew_t(em_service_type_agent, evt->params, dm);
     tmp = pcmd[num];
     num++;

src/cli/em_cli.cpp

@@ -43,7 +43,6 @@
 #include "em_cli.h"
 #include <readline/readline.h>
 #include <readline/history.h>
-
 em_cli_t g_cli;
 
 em_network_node_t *em_cli_t::get_reset_tree(char *platform)
@@ -191,7 +190,16 @@ em_cmd_t& em_cli_t::get_command(char *in, size_t in_len, em_network_node_t *node
                                 strlen("Summary@RadioEnable"));
                     }
                     break;
-
+		case em_cmd_type_dev_test:
+                    if ((tmp = strstr(cmd->m_param.u.args.fixed_args, "DevTest")) != NULL) {
+                        *tmp = 0;
+                    }
+		if (strncmp(args[num_args - 1], "1", strlen("1")) == 0) {
+			strncat(cmd->m_param.u.args.fixed_args, "DevTest@update", strlen("DevTest@update"));
+		} else {
+			strncat(cmd->m_param.u.args.fixed_args, "DevTest", strlen("DevTest"));
+		}
+		break;
                 default:
                     break;
             }
@@ -210,7 +218,6 @@ em_cmd_t& em_cli_t::get_command(char *in, size_t in_len, em_network_node_t *node
 
 	em_cmd_cli_t::m_client_cmd_spec[idx].m_param.net_node = node;
 
-
     return em_cmd_cli_t::m_client_cmd_spec[idx];
 }
 
@@ -221,6 +228,7 @@ em_network_node_t *em_cli_t::exec(char *in, size_t sz, em_network_node_t *node)
 	em_network_node_t *new_node;
     em_cmd_cli_t *cli_cmd;
 
+	pthread_mutex_lock(&cli_lock);
     snprintf(cmd, sizeof(cmd),  "%s", in);
     cli_cmd = new em_cmd_cli_t(get_command(cmd, sz, node));
 
@@ -239,10 +247,9 @@ em_network_node_t *em_cli_t::exec(char *in, size_t sz, em_network_node_t *node)
     }
 
     delete cli_cmd;
-
+	pthread_mutex_unlock(&cli_lock);
     new_node = em_net_node_t::get_network_tree(result);	
 	free(result);
-
 	return new_node;
 }
 
@@ -266,13 +273,12 @@ void em_cli_t::dump_lib_dbg(char *str)
         return;
     }
 
-    fputs("\n==========\n", fp);	
+    fputs("\n==========\n", fp);
     fputs(str, fp);
 
     fclose(fp);
 }
 
-
 int em_cli_t::init(em_cli_params_t	*params)
 {
 	memcpy(&m_params, params, sizeof(em_cli_params_t));

src/cli/em_cmd_cli.cpp

@@ -48,7 +48,7 @@ em_cmd_params_t spec_params[] = {
 	{.u = {.args = {0, {"", "", "", "", ""}, "none"}}},
 	{.u = {.args = {2, {"", "", "", "", ""}, "Reset.json"}}},
 	{.u = {.args = {1, {"", "", "", "", ""}, "Radiocap.json"}}},
-	{.u = {.args = {1, {"", "", "", "", ""}, "DevTest"}}},
+	{.u = {.args = {2, {"", "", "", "", ""}, "DevTest"}}},
 	{.u = {.args = {1, {"", "", "", "", ""}, "CfgRenew.json"}}},
 	{.u = {.args = {1, {"", "", "", "", ""}, "VapConfig.json"}}},
 	{.u = {.args = {2, {"", "", "", "", ""}, "Network"}}},
@@ -73,6 +73,7 @@ em_cmd_params_t spec_params[] = {
 	{.u = {.args = {2, {"", "", "", "", ""}, "ScanResult"}}},
     {.u = {.args = {2, {"", "", "", "", ""}, "MLDConfig"}}},
     {.u = {.args = {2, {"", "", "", "", ""}, "MLDReconfig"}}},
+	{.u = {.args = {2, {"", "", "", "", ""}, "DevTest.json"}}},
 	{.u = {.args = {0, {"", "", "", "", ""}, "max"}}},
 };
 
@@ -106,7 +107,8 @@ em_cmd_t em_cmd_cli_t::m_client_cmd_spec[] = {
     em_cmd_t(em_cmd_type_set_policy, spec_params[24]),
     em_cmd_t(em_cmd_type_get_mld_config, spec_params[26]),
     em_cmd_t(em_cmd_type_mld_reconfig, spec_params[27]),
-    em_cmd_t(em_cmd_type_max, spec_params[28]),
+    em_cmd_t(em_cmd_type_set_dev_test, spec_params[28]),
+    em_cmd_t(em_cmd_type_max, spec_params[29]),
 };
 
 int em_cmd_cli_t::get_edited_node(em_network_node_t *node, const char *header, char *buff)
@@ -117,7 +119,8 @@ int em_cmd_cli_t::get_edited_node(em_network_node_t *node, const char *header, c
     bool found_result = false;
     unsigned int i;
 	em_long_string_t	key;
-	char *net_id = m_cmd.m_param.u.args.args[1], *formatted, *node_str;
+	em_small_string_t net_id = "OneWifiMesh";
+	char *formatted, *node_str;
 
     for (i = 0; i < node->num_children; i++) {
         if (strncmp(node->child[i]->key, "Result", strlen("Result")) == 0) {
@@ -155,7 +158,7 @@ int em_cmd_cli_t::get_edited_node(em_network_node_t *node, const char *header, c
 	}
 
 	node_str = em_net_node_t::get_network_tree_string(new_node);
-	m_cli.dump_lib_dbg(node_str);
+//	m_cli.dump_lib_dbg(node_str);
 	em_net_node_t::free_network_tree_string(node_str);
 	obj = (cJSON *)em_net_node_t::network_tree_to_json(new_node);
 	formatted = cJSON_Print(obj);
@@ -201,7 +204,20 @@ int em_cmd_cli_t::execute(char *result)
         case em_cmd_type_dev_test:
             bevt->type = em_bus_event_type_dev_test;
             info = &bevt->u.subdoc;
-            snprintf(info->name, sizeof(info->name), "%s", param->u.args.fixed_args);
+	    strncpy(info->name, param->u.args.fixed_args, strlen(param->u.args.fixed_args) + 1);
+            break;
+
+        case em_cmd_type_set_dev_test:
+            if ((node = m_cmd.m_param.net_node) == NULL) {
+                return -1;
+            }
+            bevt->type = em_bus_event_type_set_dev_test;
+	    info = &bevt->u.subdoc;
+            strncpy(info->name, param->u.args.fixed_args, strlen(param->u.args.fixed_args) + 1);
+                        if ((bevt->data_len = get_edited_node(node, "SetDevTest", info->buff)) < 0) {
+                printf("%s:%d: failed to open file at location:%s error:%d\n", __func__, __LINE__, param->u.args.fixed_args, errno);
+                return -1;
+                        }
             break;
 
         case em_cmd_type_cfg_renew:
@@ -485,7 +501,8 @@ int em_cmd_cli_t::execute(char *result)
 
     /* Receive result. */
     if ((ret = recv(dsock, (unsigned char *)result, EM_MAX_EVENT_DATA_LEN, 0)) <= 0) {
-        printf("%s:%d: result read error on socket, err:%d\n", __func__, __LINE__, errno);
+        snprintf(result, sizeof(em_long_string_t), "%s:%d: result read error on socket, err:%d\n", __func__, __LINE__, errno);
+	//g_cli.dump_lib_dbg(result);
         return -1;
     }