rename 'libbbf_api' -> 'libbbfdm-api' & 'libbbf_dm' -> 'libbbfdm'

.gitlab-ci.yml

@@ -45,7 +45,7 @@ run_tools_test:
           - tools/out/datamodel_hdm.xml
           - tools/out/datamodel.xls
 
-run_libbbf_api_functional_test:
+run_libbbfdm_api_functional_test:
   stage: functional_test
   image: ${COMMON_IMAGE}
   allow_failure: false
@@ -60,7 +60,7 @@ run_libbbf_api_functional_test:
           - timestamp.log
           - functional-api-test-coverage.xml
 
-run_libbbf_dm_functional_test:
+run_libbbfdm_functional_test:
   stage: functional_test
   image: ${COMMON_IMAGE}
   allow_failure: false
@@ -75,7 +75,7 @@ run_libbbf_dm_functional_test:
           - timestamp.log
           - functional-test-coverage.xml
 
-run_libbbf_dm_memory_test:
+run_libbbfdm_memory_test:
   stage: functional_test
   image: ${COMMON_IMAGE}
   allow_failure: false

CMakeLists.txt

@@ -4,8 +4,8 @@ PROJECT(bbf C)
 
 OPTION(BBFDMD_ENABLED "build bbfdmd daemon with their dependencies" OFF)
 
-add_subdirectory(libbbf_api)
-add_subdirectory(libbbf_dm)
+add_subdirectory(libbbfdm-api)
+add_subdirectory(libbbfdm)
 
 IF(BBFDMD_ENABLED)
 	add_subdirectory(bbfdmd/src)

README.md

@@ -5,8 +5,8 @@ This package comprises of the below libraries:
 
 | Library |                    Description                    |
 | ------- | ------------------------------------------------- |
-| libbbf_dm | This provides the mechanism to add new parameters or extend the existing DM tree using json plugin or shared library plugin. |
-| libbbf_api | This provides the APIs for UCI, Ubus, JSON, CLI and memory management. |
+| libbbfdm | This provides the mechanism to add new parameters or extend the existing DM tree using json plugin or shared library plugin. |
+| libbbfdm-api | This provides the APIs for UCI, Ubus, JSON, CLI and memory management. |
 
 ## Design of bbfdm
 
@@ -23,7 +23,7 @@ This package comprises of the below libraries:
 │   └── vendor
 │       ├── iopsys
 │       └── vendor.h
-├── libbbf_api
+├── libbbfdm-api
 ├── scripts
 └── tools
 ```
@@ -40,8 +40,8 @@ This package comprises of the below libraries:
 
 	- `json` folder : TR-181 and TR-104 JSON files
 
-- `libbbf_api` folder which contains the source code of all API functions (UCI, Ubus, JSON, CLI and memory management). These API are used for GET/SET/ADD/Delete/Operate calls which can be called in internal or external packages.
-All APIs exposed by libbbf_api are presented in this header file [libbbf_api.h](https://dev.iopsys.eu/iopsys/bbf/-/tree/devel/libbbf_api/include/libbbf_api.h).
+- `libbbfdm-api` folder which contains the source code of all API functions (UCI, Ubus, JSON, CLI and memory management). These API are used for GET/SET/ADD/Delete/Operate calls which can be called in internal or external packages.
+All APIs exposed by libbbfdm-api are presented in this header file [libbbfdm-api.h](https://dev.iopsys.eu/iopsys/bbf/-/tree/devel/libbbfdm-api/include/libbbfdm-api.h).
 
 - `scripts` folder which contains the Diagnostics scripts
 

bbfdmd/src/CMakeLists.txt

@@ -12,5 +12,5 @@ ENDIF()
 
 FILE(GLOB BBF_SOURCES *.c)
 ADD_EXECUTABLE(bbfdmd ${BBF_SOURCES})
-TARGET_LINK_LIBRARIES(bbfdmd uci ubus ubox blobmsg_json bbf_api bbf_dm)
+TARGET_LINK_LIBRARIES(bbfdmd uci ubus ubox blobmsg_json bbfdm-api bbfdm)
 INSTALL(TARGETS bbfdmd DESTINATION usr/sbin)

bbfdmd/src/bbfdmd.c

@@ -39,7 +39,7 @@
 #include "events.h"
 #include "pretty_print.h"
 #include "get_helper.h"
-#include "libbbf_api/dmentry.h"
+#include "libbbfdm-api/dmentry.h"
 
 #define USP_SUBPROCESS_DEPTH (2)
 #define BBF_SCHEMA_UPDATE_TIMEOUT (60 * 1000)
@@ -1195,7 +1195,7 @@ static int usp_get_config(void)
 	if (!ctx)
 		return -1;
 
-	if (uci_load(ctx, "bbfdmd", &pkg)) {
+	if (uci_load(ctx, "bbfdm", &pkg)) {
 		uci_free_context(ctx);
 		return -1;
 	}
@@ -1206,7 +1206,7 @@ static int usp_get_config(void)
 		if (s == NULL || s->type == NULL)
 			continue;
 
-		if (strcmp(s->type, "globals") == 0) {
+		if (strcmp(s->type, "bbfdmd") == 0) {
 			struct uci_option *opn = NULL;
 
 			opn = uci_lookup_option(ctx, s, "loglevel");

bbfdmd/src/bbfdmd.h

@@ -5,7 +5,7 @@
 #include <libubox/blobmsg.h>
 #include <libubox/list.h>
 
-#include "libbbf_api/dmbbf.h"
+#include "libbbfdm-api/dmbbf.h"
 
 struct uspd_async_req {
 	struct ubus_context *ctx;

bbfdmd/src/get.c

@@ -25,7 +25,7 @@
 #include "get_helper.h"
 #include "pretty_print.h"
 #include "ipc.h"
-#include "libbbf_api/dmentry.h"
+#include "libbbfdm-api/dmentry.h"
 
 #include <libubus.h>
 

bbfdmd/src/get_helper.c

@@ -30,9 +30,9 @@
 #include "common.h"
 #include "pretty_print.h"
 
-#include "libbbf_api/dmentry.h"
-#include "libbbf_dm/dmtree/tr181/device.h"
-#include "libbbf_dm/dmtree/vendor/vendor.h"
+#include "libbbfdm-api/dmentry.h"
+#include "libbbfdm/dmtree/tr181/device.h"
+#include "libbbfdm/dmtree/vendor/vendor.h"
 
 DMOBJ *DM_ROOT_OBJ = tEntry181Obj;
 DM_MAP_VENDOR *DM_VENDOR_EXTENSION[2] = {

bbfdmd/src/get_helper.h

@@ -3,7 +3,7 @@
 
 #include "bbfdmd.h"
 #include "common.h"
-#include "libbbf_api/dmbbf.h"
+#include "libbbfdm-api/dmbbf.h"
 
 #include <libubus.h>
 

bbfdmd/src/operate.h

@@ -4,7 +4,7 @@
 #include "bbfdmd.h"
 #include "common.h"
 
-#include "libbbf_api/dmbbf.h"
+#include "libbbfdm-api/dmbbf.h"
 
 enum {
 	DM_OPERATE_COMMAND,

bbfdmd/src/set.h

@@ -4,7 +4,7 @@
 #include "bbfdmd.h"
 #include "common.h"
 
-#include "libbbf_api/dmbbf.h"
+#include "libbbfdm-api/dmbbf.h"
 
 enum {
 	DM_SET_PATH,

docs/guide/dynamic_dm.md

@@ -28,7 +28,7 @@ The **DM_MAP_OBJ** structure contains three arguments:
 
 For the other tables, they are defined in the same way as the Object and Parameter definition described above.
 
-> Note1: Shared library can only add vendor or standard objects that are not implemented by `libbbf_dm`
+> Note1: Shared library can only add vendor or standard objects that are not implemented by `libbbfdm`
 
 > Note2: Shared library is not allowed to overwrite objects/parameters
 
@@ -416,7 +416,7 @@ The application should bring its JSON file under **'/etc/bbfdm/json/'** path wit
 }
 ```
 
-> Note1: JSON File can only add vendor or standard objects that are not implemented by `libbbf_dm`
+> Note1: JSON File can only add vendor or standard objects that are not implemented by `libbbfdm`
 
 > Note2: JSON File is not allowed to overwrite objects/parameters
 

docs/guide/obj_param_extension.md

@@ -2,7 +2,7 @@
 
 As mentioned in README, all Data Models are stored in the **'dmtree'** folder. In order to implement a new object/parameter, you need to expand its get/set/add/delete functions and then save them in the right folder.
 
-`bbfdm` library offers a tool to generate templates of the source code from json files placed under **'dmtree/json'**. So, any developer can fill these json files ([tr181](https://dev.iopsys.eu/iopsys/bbf/-/tree/devel/libbbf_dm/dmtree/json/tr181.json) or [tr104](https://dev.iopsys.eu/iopsys/bbf/-/tree/devel/libbbf_dm/dmtree/json/tr104.json)) with mapping field according to UCI, UBUS or CLI commands then generate the source code in C.
+`bbfdm` library offers a tool to generate templates of the source code from json files placed under **'dmtree/json'**. So, any developer can fill these json files ([tr181](https://dev.iopsys.eu/iopsys/bbf/-/tree/devel/libbbfdm/dmtree/json/tr181.json) or [tr104](https://dev.iopsys.eu/iopsys/bbf/-/tree/devel/libbbfdm/dmtree/json/tr104.json)) with mapping field according to UCI, UBUS or CLI commands then generate the source code in C.
 
 ```bash
 $ ./convert_dm_json_to_c.py

docs/guide/tools.md

@@ -119,7 +119,7 @@ $ ./generate_dm_excel.py -d tr181 -v iopsys -p X_IOPSYS_EU_ -r git^https://dev.i
 ```
 
 ## Validate JSON plugin
-It is a [python script](https://dev.iopsys.eu/iopsys/bbf/-/tree/devel/tools/validate_json_plugin.py) to validate JSON plugin files for dynamic library or standard data model [TR181](https://dev.iopsys.eu/iopsys/bbf/-/tree/devel/libbbf_dm/dmtree/json/tr181.json), [TR104](https://dev.iopsys.eu/iopsys/bbf/-/tree/devel/libbbf_dm/dmtree/json/tr104.json), etc..
+It is a [python script](https://dev.iopsys.eu/iopsys/bbf/-/tree/devel/tools/validate_json_plugin.py) to validate JSON plugin files for dynamic library or standard data model [TR181](https://dev.iopsys.eu/iopsys/bbf/-/tree/devel/libbbfdm/dmtree/json/tr181.json), [TR104](https://dev.iopsys.eu/iopsys/bbf/-/tree/devel/libbbfdm/dmtree/json/tr104.json), etc..
 
 ```bash
 $ ./tools/validate_json_plugin.py test/files/etc/bbfdm/json/UserInterface.json
@@ -151,7 +151,7 @@ The parameters/keys used in tools_input.json file are mostly self-explanatory bu
 | | default: This contains the generic definition which has the capability to define more descriptive DM objects/parameters |
 | output.file_format | xls: An excel file listing the supported and unsupported DM objects/parameters |
 
-> Note: To add more description about the vendor extended DM objects/parameters, it is required to add the definition of the required/related DM objects/parameters in a json file (The json structure should follow same format as given in [tr181.json](https://dev.iopsys.eu/iopsys/bbf/-/tree/devel/libbbf_dm/dmtree/json/tr181.json)), The same json file need to be defined in dm_json_files list.
+> Note: To add more description about the vendor extended DM objects/parameters, it is required to add the definition of the required/related DM objects/parameters in a json file (The json structure should follow same format as given in [tr181.json](https://dev.iopsys.eu/iopsys/bbf/-/tree/devel/libbbfdm/dmtree/json/tr181.json)), The same json file need to be defined in dm_json_files list.
 
 The input json file should be defined as follow:
 
@@ -168,8 +168,8 @@ The input json file should be defined as follow:
 		"test"
 	],
 	"dm_json_files": [
-		"../libbbf_dm/dmtree/json/tr181.json",
-		"../libbbf_dm/dmtree/json/tr104.json"
+		"../libbbfdm/dmtree/json/tr181.json",
+		"../libbbfdm/dmtree/json/tr104.json"
 	]
 	"vendor_prefix": "X_IOPSYS_EU_",
 	"plugins": [

docs/guide/vendor.md

@@ -28,13 +28,13 @@ The **DM_MAP_OBJ** structure contains three arguments:
 
 Each entry in the exclude table is a string which could be a path of object or parameter that need to be excluded from the tree
 
-The following [link](https://dev.iopsys.eu/iopsys/bbf/-/blob/devel/libbbf_dm/dmtree/vendor/test/tr181/vendor.c) contains example of Extend, Overwrite and Exclude table.
+The following [link](https://dev.iopsys.eu/iopsys/bbf/-/blob/devel/libbbfdm/dmtree/vendor/test/tr181/vendor.c) contains example of Extend, Overwrite and Exclude table.
 
 ### 3. Adding vendor and standard objects/Parameters
 
 Implement the new vendor/standard objects and parameters as defined above in the first section.
 
-Example: [Custom Vendor Object Dropbear](https://dev.iopsys.eu/iopsys/bbf/-/blob/devel/libbbf_dm/dmtree/vendor/test/tr181/x_test_com_dropbear.c)
+Example: [Custom Vendor Object Dropbear](https://dev.iopsys.eu/iopsys/bbf/-/blob/devel/libbbfdm/dmtree/vendor/test/tr181/x_test_com_dropbear.c)
 
 ### 4. link vendor tables to the main tree
 
@@ -48,7 +48,7 @@ To register the new vendor tables, you need to link them in the main three table
 
 These tables are defined in the file **'dmtree/vendor/vendor.c'**.
 
-Example: [Link vendor tables to the main tree](https://dev.iopsys.eu/iopsys/bbf/-/blob/devel/libbbf_dm/dmtree/vendor/vendor.c)
+Example: [Link vendor tables to the main tree](https://dev.iopsys.eu/iopsys/bbf/-/blob/devel/libbbfdm/dmtree/vendor/vendor.c)
 
 ### 5. Enable vendor
 
@@ -68,7 +68,7 @@ BBF_VENDOR_LIST="iopsys,test"
 BBF_VENDOR_PREFIX="X_TEST_COM_"
 ```
 
-> Note1: The `libbbf_dm` vendor list can support multi-vendor with comma seperated.
+> Note1: The `libbbfdm` vendor list can support multi-vendor with comma seperated.
 
 > Note2: If multi vendors are supported and there is a object/parameter that is implmented by multi customers in different way, the implemented object/parameter of the first vendor name in the **BBF_VENDOR_LIST** will be considered.
 

gitlab-ci/shared.sh

@@ -109,7 +109,7 @@ function install_libcwmpdm()
 {
 	# clone and compile libcwmpdm
 	rm -rf /opt/dev/icwmp
-	exec_cmd git clone --depth 1 https://dev.iopsys.eu/bbf/icwmp.git /opt/dev/icwmp
+	exec_cmd git clone -b devel --depth 1 https://dev.iopsys.eu/bbf/icwmp.git /opt/dev/icwmp
 
 	echo "Compiling libcwmpdm"
 	cd /opt/dev/icwmp

gitlab-ci/tools-test.sh

@@ -18,11 +18,11 @@ exec_cmd_verbose pylint -d R,C,W0603 tools/*.py
 echo "********* Validate JSON Plugin *********"
 
 echo "Validate BBF TR-181 JSON Plugin"
-./tools/validate_json_plugin.py libbbf_dm/dmtree/json/tr181.json
+./tools/validate_json_plugin.py libbbfdm/dmtree/json/tr181.json
 check_ret $?
 
 echo "Validate BBF TR-104 JSON Plugin"
-./tools/validate_json_plugin.py libbbf_dm/dmtree/json/tr104.json
+./tools/validate_json_plugin.py libbbfdm/dmtree/json/tr104.json
 check_ret $?
 
 echo "Validate X_IOPSYS_EU_Dropbear JSON Plugin"

libbbfdm-api/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.0)
 
-PROJECT(libbbf_api)
+PROJECT(libbbfdm-api)
 
 ADD_DEFINITIONS(-Wall -Werror)
 ADD_DEFINITIONS(-D_GNU_SOURCE)
@@ -34,19 +34,19 @@ ENDIF(BBF_VENDOR_EXTENSION)
 
 FILE(GLOB BBF_API_SOURCES *.c)
 
-ADD_LIBRARY(bbf_api SHARED ${BBF_API_SOURCES} ${BBF_DOTSO_PLUGIN_SOURCES} ${BBF_JSON_PLUGIN_SOURCES} ${BBF_VENDOR_EXTENSION_SOURCES})
+ADD_LIBRARY(bbfdm-api SHARED ${BBF_API_SOURCES} ${BBF_DOTSO_PLUGIN_SOURCES} ${BBF_JSON_PLUGIN_SOURCES} ${BBF_VENDOR_EXTENSION_SOURCES})
 
-TARGET_LINK_LIBRARIES(bbf_api uci ubus ubox json-c blobmsg_json dl)
+TARGET_LINK_LIBRARIES(bbfdm-api uci ubus ubox json-c blobmsg_json dl)
 
-INSTALL(TARGETS bbf_api
+INSTALL(TARGETS bbfdm-api
 		LIBRARY DESTINATION usr/lib)
 
-FILE(GLOB libbbf_api_headers *.h)
-INSTALL(FILES ${libbbf_api_headers}
-	DESTINATION usr/include/libbbf_api
+FILE(GLOB libbbfdm-api_headers *.h)
+INSTALL(FILES ${libbbfdm-api_headers}
+	DESTINATION usr/include/libbbfdm-api
 )
 
-FILE(GLOB libbbf_api_include_headers include/*.h)
-INSTALL(FILES ${libbbf_api_include_headers}
+FILE(GLOB libbbfdm-api_include_headers include/*.h)
+INSTALL(FILES ${libbbfdm-api_include_headers}
 	DESTINATION usr/include
 )

libbbfdm-api/include/libbbfdm_api.h

@@ -19,19 +19,19 @@
  */
 
 /**
- * \file libbbf_api.h
+ * \file libbbfdm_api.h
  *
  * This Library provides APIs, structures and macros for UCI, UBUS, JSON and memory management to interface with data model from dmtree.
  */
 
-#ifndef __LIBBBF_API_H__
-#define __LIBBBF_API_H__
+#ifndef __LIBBBFDM_API_H__
+#define __LIBBBFDM_API_H__
 
 #include <uci.h>
 #include <libubox/list.h>
 #include <json-c/json.h>
 
-#include <libbbf_api/dmapi.h>
+#include <libbbfdm-api/dmapi.h>
 
 /*******************
  *
@@ -750,4 +750,4 @@ int bbf_validate_long_list(char *value, int min_item, int max_item, int max_size
 **************************************************************************/
 int bbf_validate_hexBinary_list(char *value, int min_item, int max_item, int max_size, struct range_args r_args[], int r_args_size);
 
-#endif //__LIBBBF_API_H__
+#endif //__LIBBBFDM_API_H__

libbbfdm/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.0)
 
-PROJECT(libbbf_dm)
+PROJECT(libbbfdm)
 
 ADD_DEFINITIONS(-Wall -Werror)
 ADD_DEFINITIONS(-D_GNU_SOURCE)
@@ -84,11 +84,11 @@ IF(BBF_VENDOR_EXTENSION)
 	endforeach()
 ENDIF(BBF_VENDOR_EXTENSION)
 
-ADD_LIBRARY(bbf_dm SHARED ${BBF_DM_SOURCES} ${BBF_TR181_SOURCES} ${BBF_TR104_SOURCES} ${BBF_TR143_SOURCES} ${BBF_TR471_SOURCES} ${BBF_VENDOR_EXTENSION_SOURCES})
+ADD_LIBRARY(bbfdm SHARED ${BBF_DM_SOURCES} ${BBF_TR181_SOURCES} ${BBF_TR104_SOURCES} ${BBF_TR143_SOURCES} ${BBF_TR471_SOURCES} ${BBF_VENDOR_EXTENSION_SOURCES})
 
-TARGET_LINK_LIBRARIES(bbf_dm uci ubus ubox json-c blobmsg_json curl bbf_api ${SSL_LIBS})
+TARGET_LINK_LIBRARIES(bbfdm uci ubus ubox json-c blobmsg_json curl bbfdm-api ${SSL_LIBS})
 
-INSTALL(TARGETS bbf_dm
+INSTALL(TARGETS bbfdm
 		LIBRARY DESTINATION usr/lib)
 
 INSTALL(DIRECTORY DESTINATION etc/bbfdm)
@@ -98,7 +98,7 @@ INSTALL(DIRECTORY DESTINATION usr/lib/bbfdm)
 
 FILE(GLOB root_device dmtree/tr181/device.h dmtree/vendor/vendor.h)
 INSTALL(FILES ${root_device}
-	DESTINATION usr/include/libbbf_dm
+	DESTINATION usr/include/libbbfdm
 )
 
 IF(BBF_TR143)

libbbfdm/dmdiagnostics.h

@@ -12,7 +12,7 @@
 #ifndef __DMDIAGNOSTICS_H__
 #define __DMDIAGNOSTICS_H__
 
-#include "libbbf_api/dmcommon.h"
+#include "libbbfdm-api/dmcommon.h"
 #include <libubox/uloop.h>
 
 #define HTTP_URI "http"

libbbfdm/dmtree/tr104/common.h

@@ -8,7 +8,7 @@
  *	Author: Yalu Zhang, yalu.zhang@iopsys.eu
  */
 
-#include "libbbf_api/dmcommon.h"
+#include "libbbfdm-api/dmcommon.h"
 
 #define TR104_UCI_PACKAGE "asterisk"
 #define DEFAULT_SIP_PORT_STR "5060"

libbbfdm/dmtree/tr104/servicesvoiceservice.h

@@ -11,7 +11,7 @@
 #ifndef __SERVICESVOICESERVICE_H
 #define __SERVICESVOICESERVICE_H
 
-#include "libbbf_api/dmcommon.h"
+#include "libbbfdm-api/dmcommon.h"
 
 extern DMOBJ tServicesObj[];
 extern DMOBJ tServicesVoiceServiceObj[];

libbbfdm/dmtree/tr104/servicesvoiceservicecallcontrol.h

@@ -11,7 +11,7 @@
 #ifndef __SERVICESVOICESERVICECALLCONTROL_H
 #define __SERVICESVOICESERVICECALLCONTROL_H
 
-#include "libbbf_api/dmcommon.h"
+#include "libbbfdm-api/dmcommon.h"
 
 extern DMOBJ tServicesVoiceServiceCallControlObj[];
 extern DMLEAF tServicesVoiceServiceCallControlLineParams[];

libbbfdm/dmtree/tr104/servicesvoiceservicecalllog.h

@@ -11,7 +11,7 @@
 #ifndef __SERVICESVOICESERVICECALLLOG_H
 #define __SERVICESVOICESERVICECALLLOG_H
 
-#include "libbbf_api/dmcommon.h"
+#include "libbbfdm-api/dmcommon.h"
 
 extern DMOBJ tServicesVoiceServiceCallLogObj[];
 extern DMLEAF tServicesVoiceServiceCallLogParams[];

libbbfdm/dmtree/tr104/servicesvoiceservicecapabilities.h

@@ -11,7 +11,7 @@
 #ifndef __SERVICESVOICESERVICECAPABILITIES_H
 #define __SERVICESVOICESERVICECAPABILITIES_H
 
-#include "libbbf_api/dmcommon.h"
+#include "libbbfdm-api/dmcommon.h"
 
 extern DMOBJ tServicesVoiceServiceCapabilitiesObj[];
 extern DMLEAF tServicesVoiceServiceCapabilitiesParams[];

libbbfdm/dmtree/tr104/servicesvoiceservicecodecprofile.h

@@ -11,7 +11,7 @@
 #ifndef __SERVICESVOICESERVICECODECPROFILE_H
 #define __SERVICESVOICESERVICECODECPROFILE_H
 
-#include "libbbf_api/dmcommon.h"
+#include "libbbfdm-api/dmcommon.h"
 
 extern DMLEAF tServicesVoiceServiceCodecProfileParams[];
 

libbbfdm/dmtree/tr104/servicesvoiceservicedect.h

@@ -11,7 +11,7 @@
 #ifndef __SERVICESVOICESERVICEDECT_H
 #define __SERVICESVOICESERVICEDECT_H
 
-#include "libbbf_api/dmcommon.h"
+#include "libbbfdm-api/dmcommon.h"
 
 extern DMOBJ tServicesVoiceServiceDECTObj[];
 extern DMLEAF tServicesVoiceServiceDECTParams[];

libbbfdm/dmtree/tr104/servicesvoiceservicepots.h

@@ -11,7 +11,7 @@
 #ifndef __SERVICESVOICESERVICEPOTS_H
 #define __SERVICESVOICESERVICEPOTS_H
 
-#include "libbbf_api/dmcommon.h"
+#include "libbbfdm-api/dmcommon.h"
 
 extern DMOBJ tServicesVoiceServicePOTSObj[];
 extern DMLEAF tServicesVoiceServicePOTSParams[];

libbbfdm/dmtree/tr104/servicesvoiceservicereservedports.h

@@ -11,7 +11,7 @@
 #ifndef __SERVICESVOICESERVICERESERVEDPORTS_H
 #define __SERVICESVOICESERVICERESERVEDPORTS_H
 
-#include "libbbf_api/dmcommon.h"
+#include "libbbfdm-api/dmcommon.h"
 
 extern DMLEAF tServicesVoiceServiceReservedPortsParams[];
 

libbbfdm/dmtree/tr104/servicesvoiceservicesip.h

@@ -11,7 +11,7 @@
 #ifndef __SERVICESVOICESERVICESIP_H
 #define __SERVICESVOICESERVICESIP_H
 
-#include "libbbf_api/dmcommon.h"
+#include "libbbfdm-api/dmcommon.h"
 
 extern DMOBJ tServicesVoiceServiceSIPObj[];
 extern DMOBJ tServicesVoiceServiceSIPClientObj[];

libbbfdm/dmtree/tr104/servicesvoiceservicevoipprofile.h

@@ -11,7 +11,7 @@
 #ifndef __SERVICESVOICESERVICEVOIPPROFILE_H
 #define __SERVICESVOICESERVICEVOIPPROFILE_H
 
-#include "libbbf_api/dmcommon.h"
+#include "libbbfdm-api/dmcommon.h"
 
 extern DMOBJ tServicesVoiceServiceVoIPProfileObj[];
 extern DMLEAF tServicesVoiceServiceVoIPProfileParams[];

libbbfdm/dmtree/tr143/diagnostics.h

@@ -12,7 +12,7 @@
 #ifndef __DIAGNOSTICS_H
 #define __DIAGNOSTICS_H
 
-#include "libbbf_api/dmcommon.h"
+#include "libbbfdm-api/dmcommon.h"
 
 #if defined(BBF_TR143) || defined(BBF_TR471)
 extern DMOBJ tIPDiagnosticsObj[];

libbbfdm/dmtree/tr181/atm.h

@@ -12,7 +12,7 @@
 #ifndef __ATM_H
 #define __ATM_H
 
-#include "libbbf_api/dmcommon.h"
+#include "libbbfdm-api/dmcommon.h"
 
 extern DMOBJ tATMObj[];
 extern DMOBJ tATMLinkObj[];

libbbfdm/dmtree/tr181/bridging.h

@@ -13,7 +13,7 @@
 #ifndef __BRIDGING_H
 #define __BRIDGING_H
 
-#include "libbbf_api/dmcommon.h"
+#include "libbbfdm-api/dmcommon.h"
 
 struct bridge_port_args
 {

libbbfdm/dmtree/tr181/device.h

@@ -13,7 +13,7 @@
 #ifndef __DEVICE_H
 #define __DEVICE_H
 
-#include "libbbf_api/dmcommon.h"
+#include "libbbfdm-api/dmcommon.h"
 
 extern DMOBJ tEntry181Obj[];
 extern DMOBJ tDeviceObj[];

libbbfdm/dmtree/tr181/deviceinfo.h

@@ -13,7 +13,7 @@
 #ifndef __DEVICE_INFO_H
 #define __DEVICE_INFO_H
 
-#include "libbbf_api/dmcommon.h"
+#include "libbbfdm-api/dmcommon.h"
 
 extern DMLEAF tDeviceInfoParams[];
 extern DMLEAF tDeviceInfoVendorConfigFileParams[];

libbbfdm/dmtree/tr181/dhcpv4.h

@@ -12,7 +12,7 @@
 #ifndef __DHCP_H
 #define __DHCP_H
 
-#include "libbbf_api/dmcommon.h"
+#include "libbbfdm-api/dmcommon.h"
 
 extern DMOBJ tDHCPv4Obj[];
 extern DMOBJ tDHCPv4ServerObj[];

libbbfdm/dmtree/tr181/dhcpv6.h

@@ -11,7 +11,7 @@
 #ifndef __DHCPV6_H
 #define __DHCPV6_H
 
-#include "libbbf_api/dmcommon.h"
+#include "libbbfdm-api/dmcommon.h"
 
 extern DMOBJ tDHCPv6Obj[];
 extern DMLEAF tDHCPv6Params[];

libbbfdm/dmtree/tr181/dns.h

@@ -11,7 +11,7 @@
 #ifndef _DNS_H
 #define _DNS_H
 
-#include "libbbf_api/dmcommon.h"
+#include "libbbfdm-api/dmcommon.h"
 
 extern DMOBJ tDNSObj[];
 extern DMLEAF tDNSParams[];

libbbfdm/dmtree/tr181/dsl.h

@@ -11,7 +11,7 @@
 #ifndef __DSL_H
 #define __DSL_H
 
-#include "libbbf_api/dmcommon.h"
+#include "libbbfdm-api/dmcommon.h"
 
 extern DMOBJ tDSLObj[];
 extern DMLEAF tDSLParams[];

libbbfdm/dmtree/tr181/dynamicdns.h

@@ -11,7 +11,7 @@
 #ifndef __DYNAMICDNS_H
 #define __DYNAMICDNS_H
 
-#include "libbbf_api/dmcommon.h"
+#include "libbbfdm-api/dmcommon.h"
 
 extern DMOBJ tDynamicDNSObj[];
 extern DMLEAF tDynamicDNSParams[];

libbbfdm/dmtree/tr181/ethernet.h

@@ -13,7 +13,7 @@
 #ifndef __ETHERNET_H
 #define __ETHERNET_H
 
-#include "libbbf_api/dmcommon.h"
+#include "libbbfdm-api/dmcommon.h"
 
 extern DMOBJ tEthernetObj[];
 extern DMLEAF tEthernetParams[];

libbbfdm/dmtree/tr181/fast.h

@@ -11,7 +11,7 @@
 #ifndef __FAST_H
 #define __FAST_H
 
-#include "libbbf_api/dmcommon.h"
+#include "libbbfdm-api/dmcommon.h"
 
 extern DMOBJ tFASTObj[];
 extern DMLEAF tFASTParams[];

libbbfdm/dmtree/tr181/firewall.h

@@ -11,7 +11,7 @@
 #ifndef _FIREWALL_H
 #define _FIREWALL_H
 
-#include "libbbf_api/dmcommon.h"
+#include "libbbfdm-api/dmcommon.h"
 
 extern DMOBJ tFirewallObj[];
 extern DMLEAF tFirewallParams[];

libbbfdm/dmtree/tr181/gatewayinfo.h

@@ -12,7 +12,7 @@
 #ifndef __GATEWAYINFO_H
 #define __GATEWAYINFO_H
 
-#include "libbbf_api/dmcommon.h"
+#include "libbbfdm-api/dmcommon.h"
 
 extern DMLEAF tGatewayInfoParams[];
 

libbbfdm/dmtree/tr181/gre.h

@@ -11,7 +11,7 @@
 #ifndef __GRE_H
 #define __GRE_H
 
-#include "libbbf_api/dmcommon.h"
+#include "libbbfdm-api/dmcommon.h"
 
 extern DMOBJ tGREObj[];
 extern DMLEAF tGREParams[];

libbbfdm/dmtree/tr181/hosts.h

@@ -11,7 +11,7 @@
 #ifndef __HOSTS_H
 #define __HOSTS_H
 
-#include "libbbf_api/dmcommon.h"
+#include "libbbfdm-api/dmcommon.h"
 
 extern DMOBJ tHostsObj[];
 extern DMLEAF tHostsParams[];