Merge pull request #83 from rdkcentral/go_cli_json

Go cli json

build/cli/makefile

@@ -23,6 +23,7 @@ include ../makefile.inc
 #
 
 PROGRAM = $(INSTALLDIR)/bin/onewifi_em_cli
+PROGRAM_GO = $(INSTALLDIR)/bin/cli
 EM_CLI_LIBRARY = $(INSTALLDIR)/lib/libemcli.so
 
 INCLUDEDIRS = \
@@ -71,7 +72,7 @@ GENERIC_OBJECTS = $(GENERIC_SOURCES:.c=.o)
 EMCLIOBJECTS = $(CLI_OBJECTS) $(GENERIC_OBJECTS)
 MAIN_OBJECT = $(MAIN_SOURCE:.c=.o) 
 
-all: $(EM_CLI_LIBRARY) $(PROGRAM)
+all: $(EM_CLI_LIBRARY) $(PROGRAM) $(PROGRAM_GO)
 
 $(PROGRAM): $(MAIN_OBJECT)
 	$(CXX) -o $@ $(MAIN_OBJECT) $(LDFLAGS)
@@ -88,11 +89,14 @@ $(CLI_OBJECTS): %.o: %.cpp
 $(MAIN_OBJECT): %.o: %.c
 	$(CXX) $(CFLAGS) -o $@ -c $<
 
+$(PROGRAM_GO):
+	go build -o $(PROGRAM_GO) $(ONEWIFI_EM_SRC)/cli/main.go
+
 # Clean target: "make -f Makefile.Linux clean" to remove unwanted objects and executables.
 #
 
 clean:
-	$(RM) $(MAIN_OBJECT) $(EMCLIOBJECTS) $(EM_CLI_LIBRARY) $(PROGRAM)
+	$(RM) $(MAIN_OBJECT) $(EMCLIOBJECTS) $(EM_CLI_LIBRARY) $(PROGRAM) $(PROGRAM_GO)
 
 #
 # Run target: "make -f Makefile.Linux run" to execute the application

go.mod

@@ -0,0 +1,3 @@
+module unified-wifi-mesh/cli
+
+go 1.18

inc/em_base.h

@@ -201,7 +201,7 @@ typedef char    em_subdoc_data_buff_t[EM_SUBDOC_BUFF_SZ];
 typedef char    em_status_string_t[EM_IO_BUFF_SZ];
 typedef unsigned	char    em_raw_data_t[EM_SUBDOC_BUFF_SZ];
 
-typedef int (* em_editor_callback_t)(const char *);
+typedef int (* em_editor_callback_t)(char *);
 
 typedef struct {
     unsigned char   dsap;
@@ -2742,7 +2742,7 @@ typedef enum {
 } em_network_node_data_type_t;
 
 typedef struct em_network_node {
-    em_short_string_t   key;
+    em_long_string_t   key;
     em_network_node_data_type_t type;
     em_long_string_t    value_str;
     unsigned int        value_int;

inc/em_cli.h

@@ -28,15 +28,19 @@ class em_cli_t {
 public:
 	em_editor_callback_t m_editor_cb;
 
-    char *exec(char *in, size_t in_len, em_status_string_t out);
+	char *exec(char *in, size_t in_len, em_status_string_t out);
+    em_network_node_t *exec(char *in, size_t in_len);
     int init(em_editor_callback_t func);
 	const char *get_first_cmd_str();
 	const char *get_next_cmd_str(const char *cmd);
 
-	em_network_node_t *get_network_tree(const char *file_name);
+	em_network_node_t *get_network_tree_by_file(const char *file_name);
+	em_network_node_t *get_network_tree(char *buff);
 	int get_network_tree_node(cJSON *obj, em_network_node_t *root);
 	void free_network_tree(em_network_node_t *tree);
 	void free_network_tree_node(em_network_node_t *node);
+	void *network_tree_to_json(em_network_node_t *root);
+	cJSON *network_tree_node_to_json(em_network_node_t *node, cJSON *parent);
 	void print_network_tree(em_network_node_t *tree);
 	void print_network_tree_node(em_network_node_t *node, unsigned int *pident);
 

inc/em_cli_apis.h

@@ -19,16 +19,24 @@
 #ifndef EM_CLI_APIS_H
 #define EM_CLI_APIS_H
 
-#include "em_base.h"
-
+#ifdef __cplusplus
 extern "C" {
-	char *exec(char *in, size_t in_len, em_status_string_t out);
-    int init(em_editor_callback_t func);
-    const char *get_first_cmd_str();
-    const char *get_next_cmd_str(const char *cmd);
-	em_network_node_t *get_network_tree(const char *file_name);
-	void free_network_tree(em_network_node_t *node);
-	void print_network_tree(em_network_node_t *node);
-}
+#endif
 
+#include "em_base.h"
+
+em_network_node_t *exec(char *in, size_t in_len);
+int init(em_editor_callback_t func);
+const char *get_first_cmd_str();
+const char *get_next_cmd_str(const char *cmd);
+em_network_node_t *get_network_tree_by_file(const char *file_name);
+em_network_node_t *get_network_tree(char *buff);
+void free_network_tree(em_network_node_t *node);
+void *network_tree_to_json(em_network_node_t *node);
+void print_network_tree(em_network_node_t *node);
+
+#ifdef __cplusplus
+}  // extern "C"
 #endif
+
+#endif // EM_CLI_APIS_H

install/bin/NetworkSSID.json

@@ -1,6 +1,5 @@
 {
-    "wfa-dataelements:SetSSID":	{
-
+	"wfa-dataelements:SetSSID":	{
 		"NetworkSSIDList":	[{
 				"SSID":	"private_ssid",
 				"PassPhrase":	"test-fronthaul",
@@ -46,6 +45,6 @@
 				"MobilityDomain":	"00:01:02:03:04:05",
 				"HaulType":	["Backhaul"]
 			}],
-        "ID":	"OneWifiMesh"
+		"ID":	"OneWifiMesh"
 	}
-}
+}