From 4a8d286201efdff814f106e92147c697c32a94a9 Mon Sep 17 00:00:00 2001 From: suvendhu Date: Thu, 1 Jun 2023 10:46:23 +0530 Subject: [PATCH] icwmp UCI adjustment --- .gitignore | 1 + libbbfdm/dmtree/tr181/deviceinfo.c | 2 +- libbbfdm/dmtree/tr181/gatewayinfo.c | 6 +++--- test/cmocka/functional_api_test_bbfd.c | 6 +++--- test/files/var/state/cwmp | 12 ------------ test/files/var/state/icwmp | 2 ++ 6 files changed, 10 insertions(+), 19 deletions(-) delete mode 100644 test/files/var/state/cwmp create mode 100644 test/files/var/state/icwmp diff --git a/.gitignore b/.gitignore index 7e53e149..3b075f2c 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ install_manifest.txt *.so bbfdmd/src/bbfdmd docs/index.md +__pycache__ diff --git a/libbbfdm/dmtree/tr181/deviceinfo.c b/libbbfdm/dmtree/tr181/deviceinfo.c index 090768cf..9db04037 100644 --- a/libbbfdm/dmtree/tr181/deviceinfo.c +++ b/libbbfdm/dmtree/tr181/deviceinfo.c @@ -131,7 +131,7 @@ static bool is_update_process_allowed(void) if (dmubus_object_exist("tr069")) { struct uci_section *s = NULL, *stmp = NULL; - uci_path_foreach_sections_safe(varstate, "cwmp", "sess_status", stmp, s) { + uci_path_foreach_sections_safe(varstate, "icwmp", "sess_status", stmp, s) { dmuci_get_value_by_section_string(s, "current_status", &tr069_status); } } diff --git a/libbbfdm/dmtree/tr181/gatewayinfo.c b/libbbfdm/dmtree/tr181/gatewayinfo.c index 8bfbfb66..0749e9e4 100644 --- a/libbbfdm/dmtree/tr181/gatewayinfo.c +++ b/libbbfdm/dmtree/tr181/gatewayinfo.c @@ -12,7 +12,7 @@ static int get_manufacturer_oui(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { - dmuci_get_option_value_string_varstate("cwmp", "gatewayinfo", "oui", value); + dmuci_get_option_value_string_varstate("icwmp", "gatewayinfo", "oui", value); if (*value[0] == '\0') { dmuci_get_option_value_string("cwmp", "cpe", "manufacturer_oui", value); if (*value[0] == '\0') @@ -24,7 +24,7 @@ static int get_manufacturer_oui(char *refparam, struct dmctx *ctx, void *data, c static int get_product_class(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { - dmuci_get_option_value_string_varstate("cwmp", "gatewayinfo", "class", value); + dmuci_get_option_value_string_varstate("icwmp", "gatewayinfo", "class", value); if (*value[0] == '\0') { dmuci_get_option_value_string("cwmp", "cpe", "product_class", value); if (*value[0] == '\0') @@ -36,7 +36,7 @@ static int get_product_class(char *refparam, struct dmctx *ctx, void *data, char static int get_serial_number(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { - dmuci_get_option_value_string_varstate("cwmp", "gatewayinfo", "serial", value); + dmuci_get_option_value_string_varstate("icwmp", "gatewayinfo", "serial", value); if (*value[0] == '\0') { dmuci_get_option_value_string("cwmp", "cpe", "serial_number", value); if (*value[0] == '\0') diff --git a/test/cmocka/functional_api_test_bbfd.c b/test/cmocka/functional_api_test_bbfd.c index 69fa7d83..792a5916 100644 --- a/test/cmocka/functional_api_test_bbfd.c +++ b/test/cmocka/functional_api_test_bbfd.c @@ -140,17 +140,17 @@ static void test_bbf_api_uci(void **state) assert_string_equal(value, ""); // dmuci_get_option_value_string_varstate: test with correct config/option and wrong section name - uci_res = dmuci_get_option_value_string_varstate("cwmp", "acss", "dhcp_url", &value); + uci_res = dmuci_get_option_value_string_varstate("icwmp", "acss", "dhcp_url", &value); assert_int_equal(uci_res, -1); assert_string_equal(value, ""); // dmuci_get_option_value_string_varstate: test with correct config/section and wrong option name - uci_res = dmuci_get_option_value_string_varstate("cwmp", "acs", "hcp_url", &value); + uci_res = dmuci_get_option_value_string_varstate("icwmp", "acs", "hcp_url", &value); assert_int_equal(uci_res, -1); assert_string_equal(value, ""); // dmuci_get_option_value_string_varstate: test correct config/section/option - uci_res = dmuci_get_option_value_string_varstate("cwmp", "acs", "dhcp_url", &value); + uci_res = dmuci_get_option_value_string_varstate("icwmp", "acs", "dhcp_url", &value); assert_int_equal(uci_res, 0); assert_string_equal(value, "http://192.168.1.123:8080/openacs"); diff --git a/test/files/var/state/cwmp b/test/files/var/state/cwmp deleted file mode 100644 index 84f6b1bd..00000000 --- a/test/files/var/state/cwmp +++ /dev/null @@ -1,12 +0,0 @@ -config acs 'acs' - option dhcp_url 'http://192.168.1.123:8080/openacs' - -config inform_parameter - option informparam_instance '1' - option enable 'true' - option parameter_name 'Device.DeviceInfo.UpTime' - option events_list '1 BOOT' - -config inform_parameter - option enable '0' - option informparam_instance '2' diff --git a/test/files/var/state/icwmp b/test/files/var/state/icwmp new file mode 100644 index 00000000..d07a0a4b --- /dev/null +++ b/test/files/var/state/icwmp @@ -0,0 +1,2 @@ +config acs 'acs' + option dhcp_url 'http://192.168.1.123:8080/openacs'