mirror/iopsys-feed
1
0
Fork 0
mirror of https://dev.iopsys.eu/feed/iopsys.git synced 2026-03-08 02:07:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

icwmp: align with datamodel microservice

Browse source
This commit is contained in:
Vivek Kumar Dutta 2024-03-12 18:55:52 +05:30
parent 1e4c3cec94
commit 3f0f5ba019
4 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
icwmp/Makefile
View file

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=icwmp
PKG_VERSION:=9.7.2
PKG_VERSION:=9.7.3
LOCAL_DEV:=0
ifneq ($(LOCAL_DEV),1)
@ -56,13 +56,12 @@ define Package/icwmp/install
$(INSTALL_BIN) ./files/etc/uci-defaults/85-cwmp-set-userid $(1)/etc/uci-defaults/
$(INSTALL_BIN) ./files/etc/uci-defaults/90-cwmpfirewall $(1)/etc/uci-defaults/
$(INSTALL_BIN) ./files/etc/uci-defaults/95-set-random-inform-time $(1)/etc/uci-defaults/
$(INSTALL_BIN) ./files/etc/uci-defaults/50_add_icwmp_dm_microservice $(1)/etc/uci-defaults/
$(INSTALL_DATA) ./files/lib/upgrade/keep.d/icwmp $(1)/lib/upgrade/keep.d/icwmp
$(INSTALL_BIN) ./files/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user
$(INSTALL_BIN) ./files/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user
$(INSTALL_BIN) ./files/etc/icwmpd/input.json $(1)/etc/icwmpd/
$(INSTALL_BIN) $(PKG_BUILD_DIR)/libcwmpdm.so $(1)/etc/icwmpd/
$(call BbfdmInstallPlugin,$(1),./files/etc/bbfdm/json/CWMPManagementServer.json)
$(call BbfdmInstallPluginInMicroservice,$(1)/etc/icwmpd,$(PKG_BUILD_DIR)/libcwmpdm.so)
$(call BbfdmInstallPluginInMicroservice,$(1)/etc/icwmpd/plugins,./files/etc/bbfdm/json/CWMPManagementServer.json)
$(call BbfdmInstallMicroServiceInputFile,$(1),./files/etc/icwmpd/input.json)
endef
$(eval $(call BuildPackage,icwmp))

4
icwmp/files/etc/bbfdm/json/CWMPManagementServer.json
View file

@ -1,8 +1,7 @@
{
"json_plugin_version": 1,
"json_plugin_version": 2,
"Device.CWMPManagementServer.": {
"type": "object",
"version": "2.15",
"protocols": [
"usp"
],
@ -11,7 +10,6 @@
"dependency": "file:/etc/config/cwmp",
"EnableCWMP": {
"type": "boolean",
"version": "2.15",
"read": true,
"write": true,
"protocols": [

6
icwmp/files/etc/icwmpd/input.json
View file

@ -1,5 +1,8 @@
{
"daemon": {
"config": {
"loglevel": "1"
},
"input": {
"type": "DotSo",
"name": "/etc/icwmpd/libcwmpdm.so",
@ -7,9 +10,8 @@
},
"output": {
"type": "UBUS",
"name": "bbfdm.cwmp",
"parent_dm": "Device.",
"multiple_objects": [ "ManagementServer", "XMPP" ],
"multiple_objects": [ "ManagementServer", "XMPP" , "CWMPManagementServer"],
"root_obj": "bbfdm"
}
}

8
icwmp/files/etc/uci-defaults/50_add_icwmp_dm_microservice
View file

@ -1,8 +0,0 @@
#!/bin/sh
if ! uci -q get bbfdm.icwmpd >/dev/null; then
uci set bbfdm.icwmpd=micro_service
uci set bbfdm.icwmpd.enable=1
uci set bbfdm.icwmpd.input_json="/etc/icwmpd/input.json"
uci set bbfdm.icwmpd.loglevel=1
fi