mirror of
https://dev.iopsys.eu/bbf/bbfdm.git
synced 2025-12-10 07:44:39 +01:00
Get_schema: add the missing unique keys for TR181 and TR104
- Update JSON files for tr181 and tr104 - Update the generator
This commit is contained in:
Amin Ben Ramdhane
parent
e6bef090e9
commit
a07102c32b
25 changed files with 1197 additions and 637 deletions
|
|
@ -271,9 +271,9 @@ DMOBJ tServicesVoiceServiceObj[] = {
|
|||
{"POTS", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, NULL, tServicesVoiceServicePOTSObj, tServicesVoiceServicePOTSParams, NULL, BBFDM_BOTH},
|
||||
{"SIP", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, NULL, tServicesVoiceServiceSIPObj, NULL, NULL, BBFDM_BOTH},
|
||||
{"CallControl", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, NULL, tServicesVoiceServiceCallControlObj, NULL, NULL, BBFDM_BOTH},
|
||||
{"CallLog", &DMREAD, NULL, NULL, NULL, browseServicesVoiceServiceCallLogInst, NULL, NULL, NULL, NULL, tServicesVoiceServiceCallLogParams, NULL, BBFDM_BOTH},
|
||||
{"VoIPProfile", &DMWRITE, addObjServicesVoiceServiceVoIPProfile, delObjServicesVoiceServiceVoIPProfile, NULL, browseServicesVoiceServiceVoIPProfileInst, NULL, NULL, NULL, tServicesVoiceServiceVoIPProfileObj, tServicesVoiceServiceVoIPProfileParams, NULL, BBFDM_BOTH},
|
||||
{"CodecProfile", &DMWRITE, addObjServicesVoiceServiceCodecProfile, delObjServicesVoiceServiceCodecProfile, NULL, browseServicesVoiceServiceCodecProfileInst, NULL, NULL, NULL, NULL, tServicesVoiceServiceCodecProfileParams, NULL, BBFDM_BOTH},
|
||||
{"CallLog", &DMREAD, NULL, NULL, NULL, browseServicesVoiceServiceCallLogInst, NULL, NULL, NULL, NULL, tServicesVoiceServiceCallLogParams, NULL, BBFDM_BOTH, (const char *[]){"Alias", NULL}},
|
||||
{"VoIPProfile", &DMWRITE, addObjServicesVoiceServiceVoIPProfile, delObjServicesVoiceServiceVoIPProfile, NULL, browseServicesVoiceServiceVoIPProfileInst, NULL, NULL, NULL, tServicesVoiceServiceVoIPProfileObj, tServicesVoiceServiceVoIPProfileParams, NULL, BBFDM_BOTH, (const char *[]){"Alias", NULL}},
|
||||
{"CodecProfile", &DMWRITE, addObjServicesVoiceServiceCodecProfile, delObjServicesVoiceServiceCodecProfile, NULL, browseServicesVoiceServiceCodecProfileInst, NULL, NULL, NULL, NULL, tServicesVoiceServiceCodecProfileParams, NULL, BBFDM_BOTH, (const char *[]){"Alias", NULL}},
|
||||
{0}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -552,10 +552,10 @@ static int set_ServicesVoiceServiceCallControlCallingFeaturesSetSCREJ_CallingNum
|
|||
/* *** Device.Services.VoiceService.{i}.CallControl. *** */
|
||||
DMOBJ tServicesVoiceServiceCallControlObj[] = {
|
||||
/* OBJ, permission, addobj, delobj, checkobj, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type*/
|
||||
{"Line", &DMWRITE, addObjServicesVoiceServiceCallControlLine, delObjServicesVoiceServiceCallControlLine, NULL, browseServicesVoiceServiceCallControlLineInst, NULL, NULL, NULL, NULL, tServicesVoiceServiceCallControlLineParams, get_voice_service_line_linker, BBFDM_BOTH},
|
||||
{"IncomingMap", &DMWRITE, addObjServicesVoiceServiceCallControlIncomingMap, delObjServicesVoiceServiceCallControlIncomingMap, NULL, browseServicesVoiceServiceCallControlIncomingMapInst, NULL, NULL, NULL, NULL, tServicesVoiceServiceCallControlIncomingMapParams, NULL, BBFDM_BOTH},
|
||||
{"OutgoingMap", &DMWRITE, addObjServicesVoiceServiceCallControlOutgoingMap, delObjServicesVoiceServiceCallControlOutgoingMap, NULL, browseServicesVoiceServiceCallControlOutgoingMapInst, NULL, NULL, NULL, NULL, tServicesVoiceServiceCallControlOutgoingMapParams, NULL, BBFDM_BOTH},
|
||||
{"NumberingPlan", &DMWRITE, addObjServicesVoiceServiceCallControlNumberingPlan, delObjServicesVoiceServiceCallControlNumberingPlan, NULL, browseServicesVoiceServiceCallControlNumberingPlanInst, NULL, NULL, NULL, NULL, tServicesVoiceServiceCallControlNumberingPlanParams, NULL, BBFDM_BOTH},
|
||||
{"Line", &DMWRITE, addObjServicesVoiceServiceCallControlLine, delObjServicesVoiceServiceCallControlLine, NULL, browseServicesVoiceServiceCallControlLineInst, NULL, NULL, NULL, NULL, tServicesVoiceServiceCallControlLineParams, get_voice_service_line_linker, BBFDM_BOTH, (const char *[]){"DirectoryNumber", "Alias", NULL}},
|
||||
{"IncomingMap", &DMWRITE, addObjServicesVoiceServiceCallControlIncomingMap, delObjServicesVoiceServiceCallControlIncomingMap, NULL, browseServicesVoiceServiceCallControlIncomingMapInst, NULL, NULL, NULL, NULL, tServicesVoiceServiceCallControlIncomingMapParams, NULL, BBFDM_BOTH, (const char *[]){"Line", "Extension", "Alias", NULL}},
|
||||
{"OutgoingMap", &DMWRITE, addObjServicesVoiceServiceCallControlOutgoingMap, delObjServicesVoiceServiceCallControlOutgoingMap, NULL, browseServicesVoiceServiceCallControlOutgoingMapInst, NULL, NULL, NULL, NULL, tServicesVoiceServiceCallControlOutgoingMapParams, NULL, BBFDM_BOTH, (const char *[]){"Extension", "Line", "Alias", NULL}},
|
||||
{"NumberingPlan", &DMWRITE, addObjServicesVoiceServiceCallControlNumberingPlan, delObjServicesVoiceServiceCallControlNumberingPlan, NULL, browseServicesVoiceServiceCallControlNumberingPlanInst, NULL, NULL, NULL, NULL, tServicesVoiceServiceCallControlNumberingPlanParams, NULL, BBFDM_BOTH, (const char *[]){"Alias", NULL}},
|
||||
{"CallingFeatures", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, NULL, tServicesVoiceServiceCallControlCallingFeaturesObj, NULL, NULL, BBFDM_BOTH},
|
||||
{0}
|
||||
};
|
||||
|
|
@ -595,14 +595,14 @@ DMLEAF tServicesVoiceServiceCallControlNumberingPlanParams[] = {
|
|||
/* *** Device.Services.VoiceService.{i}.CallControl.CallingFeatures. *** */
|
||||
DMOBJ tServicesVoiceServiceCallControlCallingFeaturesObj[] = {
|
||||
/* OBJ, permission, addobj, delobj, checkobj, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type*/
|
||||
{"Set", &DMWRITE, addObjServicesVoiceServiceCallControlCallingFeaturesSet, delObjServicesVoiceServiceCallControlCallingFeaturesSet, NULL, browseServicesVoiceServiceCallControlCallingFeaturesSetInst, NULL, NULL, NULL, tServicesVoiceServiceCallControlCallingFeaturesSetObj, tServicesVoiceServiceCallControlCallingFeaturesSetParams, NULL, BBFDM_BOTH},
|
||||
{"Set", &DMWRITE, addObjServicesVoiceServiceCallControlCallingFeaturesSet, delObjServicesVoiceServiceCallControlCallingFeaturesSet, NULL, browseServicesVoiceServiceCallControlCallingFeaturesSetInst, NULL, NULL, NULL, tServicesVoiceServiceCallControlCallingFeaturesSetObj, tServicesVoiceServiceCallControlCallingFeaturesSetParams, NULL, BBFDM_BOTH, (const char *[]){"Alias", NULL}},
|
||||
{0}
|
||||
};
|
||||
|
||||
/* *** Device.Services.VoiceService.{i}.CallControl.CallingFeatures.Set.{i}. *** */
|
||||
DMOBJ tServicesVoiceServiceCallControlCallingFeaturesSetObj[] = {
|
||||
/* OBJ, permission, addobj, delobj, checkobj, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type*/
|
||||
{"SCREJ", &DMWRITE, addObjServicesVoiceServiceCallControlCallingFeaturesSetSCREJ, delObjServicesVoiceServiceCallControlCallingFeaturesSetSCREJ, NULL, browseServicesVoiceServiceCallControlCallingFeaturesSetSCREJInst, NULL, NULL, NULL, NULL, tServicesVoiceServiceCallControlCallingFeaturesSetSCREJParams, NULL, BBFDM_BOTH},
|
||||
{"SCREJ", &DMWRITE, addObjServicesVoiceServiceCallControlCallingFeaturesSetSCREJ, delObjServicesVoiceServiceCallControlCallingFeaturesSetSCREJ, NULL, browseServicesVoiceServiceCallControlCallingFeaturesSetSCREJInst, NULL, NULL, NULL, NULL, tServicesVoiceServiceCallControlCallingFeaturesSetSCREJParams, NULL, BBFDM_BOTH, (const char *[]){"CallingNumber", "Alias", NULL}},
|
||||
{0}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -167,7 +167,7 @@ DMOBJ tServicesVoiceServiceCapabilitiesObj[] = {
|
|||
/* OBJ, permission, addobj, delobj, checkobj, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type*/
|
||||
{"SIP", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, NULL, tServicesVoiceServiceCapabilitiesSIPObj, NULL, NULL, BBFDM_BOTH},
|
||||
{"POTS", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, tServicesVoiceServiceCapabilitiesPOTSParams, NULL, BBFDM_BOTH},
|
||||
{"Codec", &DMREAD, NULL, NULL, NULL, browseServicesVoiceServiceCapabilitiesCodecInst, NULL, NULL, NULL, NULL, tServicesVoiceServiceCapabilitiesCodecParams, NULL, BBFDM_BOTH},
|
||||
{"Codec", &DMREAD, NULL, NULL, NULL, browseServicesVoiceServiceCapabilitiesCodecInst, NULL, NULL, NULL, NULL, tServicesVoiceServiceCapabilitiesCodecParams, NULL, BBFDM_BOTH, (const char *[]){"Alias", "Codec", "BitRate", NULL}},
|
||||
{0}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -193,7 +193,7 @@ static int set_ServicesVoiceServicePOTSFXSVoiceProcessing_EchoCancellationEnable
|
|||
/* *** Device.Services.VoiceService.{i}.POTS. *** */
|
||||
DMOBJ tServicesVoiceServicePOTSObj[] = {
|
||||
/* OBJ, permission, addobj, delobj, checkobj, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type*/
|
||||
{"FXS", &DMREAD, NULL, NULL, NULL, browseServicesVoiceServicePOTSFXSInst, NULL, NULL, NULL, tServicesVoiceServicePOTSFXSObj, tServicesVoiceServicePOTSFXSParams, NULL, BBFDM_BOTH},
|
||||
{"FXS", &DMREAD, NULL, NULL, NULL, browseServicesVoiceServicePOTSFXSInst, NULL, NULL, NULL, tServicesVoiceServicePOTSFXSObj, tServicesVoiceServicePOTSFXSParams, NULL, BBFDM_BOTH, (const char *[]){"Name", "Alias", NULL}},
|
||||
{0}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1045,15 +1045,15 @@ static int set_ServicesVoiceServiceSIPNetworkFQDNServer_Port(char *refparam, str
|
|||
/* *** Device.Services.VoiceService.{i}.SIP. *** */
|
||||
DMOBJ tServicesVoiceServiceSIPObj[] = {
|
||||
/* OBJ, permission, addobj, delobj, checkobj, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type*/
|
||||
{"Client", &DMWRITE, addObjServicesVoiceServiceSIPClient, delObjServicesVoiceServiceSIPClient, NULL, browseServicesVoiceServiceSIPClientInst, NULL, NULL, NULL, tServicesVoiceServiceSIPClientObj, tServicesVoiceServiceSIPClientParams, get_voice_service_sip_client_linker, BBFDM_BOTH},
|
||||
{"Network", &DMWRITE, addObjServicesVoiceServiceSIPNetwork, delObjServicesVoiceServiceSIPNetwork, NULL, browseServicesVoiceServiceSIPNetworkInst, NULL, NULL, NULL, tServicesVoiceServiceSIPNetworkObj, tServicesVoiceServiceSIPNetworkParams, NULL, BBFDM_BOTH},
|
||||
{"Client", &DMWRITE, addObjServicesVoiceServiceSIPClient, delObjServicesVoiceServiceSIPClient, NULL, browseServicesVoiceServiceSIPClientInst, NULL, NULL, NULL, tServicesVoiceServiceSIPClientObj, tServicesVoiceServiceSIPClientParams, get_voice_service_sip_client_linker, BBFDM_BOTH, (const char *[]){"Alias", NULL}},
|
||||
{"Network", &DMWRITE, addObjServicesVoiceServiceSIPNetwork, delObjServicesVoiceServiceSIPNetwork, NULL, browseServicesVoiceServiceSIPNetworkInst, NULL, NULL, NULL, tServicesVoiceServiceSIPNetworkObj, tServicesVoiceServiceSIPNetworkParams, NULL, BBFDM_BOTH, (const char *[]){"Alias", NULL}},
|
||||
{0}
|
||||
};
|
||||
|
||||
/* *** Device.Services.VoiceService.{i}.SIP.Client.{i}. *** */
|
||||
DMOBJ tServicesVoiceServiceSIPClientObj[] = {
|
||||
/* OBJ, permission, addobj, delobj, checkobj, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type*/
|
||||
{"Contact", &DMWRITE, addObjServicesVoiceServiceSIPClientContact, delObjServicesVoiceServiceSIPClientContact, NULL, browseServicesVoiceServiceSIPClientContactInst, NULL, NULL, NULL, NULL, tServicesVoiceServiceSIPClientContactParams, NULL, BBFDM_BOTH},
|
||||
{"Contact", &DMWRITE, addObjServicesVoiceServiceSIPClientContact, delObjServicesVoiceServiceSIPClientContact, NULL, browseServicesVoiceServiceSIPClientContactInst, NULL, NULL, NULL, NULL, tServicesVoiceServiceSIPClientContactParams, NULL, BBFDM_BOTH, (const char *[]){"Alias", NULL}},
|
||||
{0}
|
||||
};
|
||||
|
||||
|
|
@ -1081,7 +1081,7 @@ DMLEAF tServicesVoiceServiceSIPClientContactParams[] = {
|
|||
/* *** Device.Services.VoiceService.{i}.SIP.Network.{i}. *** */
|
||||
DMOBJ tServicesVoiceServiceSIPNetworkObj[] = {
|
||||
/* OBJ, permission, addobj, delobj, checkobj, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type*/
|
||||
{"FQDNServer", &DMWRITE, addObjServicesVoiceServiceSIPNetworkFQDNServer, delObjServicesVoiceServiceSIPNetworkFQDNServer, NULL, browseServicesVoiceServiceSIPNetworkFQDNServerInst, NULL, NULL, NULL, NULL, tServicesVoiceServiceSIPNetworkFQDNServerParams, NULL, BBFDM_BOTH},
|
||||
{"FQDNServer", &DMWRITE, addObjServicesVoiceServiceSIPNetworkFQDNServer, delObjServicesVoiceServiceSIPNetworkFQDNServer, NULL, browseServicesVoiceServiceSIPNetworkFQDNServerInst, NULL, NULL, NULL, NULL, tServicesVoiceServiceSIPNetworkFQDNServerParams, NULL, BBFDM_BOTH, (const char *[]){"Alias", "Domain", NULL}},
|
||||
{0}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -794,9 +794,9 @@ char *get_softwaremodules_url(char *uuid)
|
|||
/* *** Device.SoftwareModules. *** */
|
||||
DMOBJ tSoftwareModulesObj[] = {
|
||||
/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type*/
|
||||
{"ExecEnv", &DMREAD, NULL, NULL, NULL, browseSoftwareModulesExecEnvInst, NULL, NULL, NULL, NULL, tSoftwareModulesExecEnvParams, get_exe_cenv_linker, BBFDM_BOTH},
|
||||
{"DeploymentUnit", &DMREAD, NULL, NULL, NULL, browseSoftwareModulesDeploymentUnitInst, NULL, NULL, NULL, NULL, tSoftwareModulesDeploymentUnitParams, get_du_linker, BBFDM_BOTH},
|
||||
{"ExecutionUnit", &DMREAD, NULL, NULL, NULL, browseSoftwareModulesExecutionUnitInst, NULL, NULL, NULL, tSoftwareModulesExecutionUnitObj, tSoftwareModulesExecutionUnitParams, NULL, BBFDM_BOTH},
|
||||
{"ExecEnv", &DMREAD, NULL, NULL, NULL, browseSoftwareModulesExecEnvInst, NULL, NULL, NULL, NULL, tSoftwareModulesExecEnvParams, get_exe_cenv_linker, BBFDM_BOTH, (const char *[]){"Alias", "Name", NULL}},
|
||||
{"DeploymentUnit", &DMREAD, NULL, NULL, NULL, browseSoftwareModulesDeploymentUnitInst, NULL, NULL, NULL, NULL, tSoftwareModulesDeploymentUnitParams, get_du_linker, BBFDM_BOTH, (const char *[]){"UUID", "Version", "ExecutionEnvRef", "Alias", NULL}},
|
||||
{"ExecutionUnit", &DMREAD, NULL, NULL, NULL, browseSoftwareModulesExecutionUnitInst, NULL, NULL, NULL, tSoftwareModulesExecutionUnitObj, tSoftwareModulesExecutionUnitParams, NULL, BBFDM_BOTH, (const char *[]){"EUID", "Alias", NULL}},
|
||||
{0}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2345,7 +2345,7 @@ static int browseBridgingBridgeVLANPortInst(struct dmctx *dmctx, DMNODE *parent_
|
|||
/* *** Device.Bridging. *** */
|
||||
DMOBJ tBridgingObj[] = {
|
||||
/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type*/
|
||||
{"Bridge", &DMWRITE, addObjBridgingBridge, delObjBridgingBridge, NULL, browseBridgingBridgeInst, NULL, NULL, NULL, tBridgingBridgeObj, tBridgingBridgeParams, NULL, BBFDM_BOTH},
|
||||
{"Bridge", &DMWRITE, addObjBridgingBridge, delObjBridgingBridge, NULL, browseBridgingBridgeInst, NULL, NULL, NULL, tBridgingBridgeObj, tBridgingBridgeParams, NULL, BBFDM_BOTH, (const char *[]){"Alias", NULL}},
|
||||
{0}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -588,10 +588,10 @@ DMOBJ tDeviceInfoObj[] = {
|
|||
{"VendorConfigFile", &DMREAD, NULL, NULL, NULL, browseVcfInst, NULL, NULL, NULL, NULL, tDeviceInfoVendorConfigFileParams, NULL, BBFDM_BOTH, (const char *[]){"Name", "Alias", NULL}},
|
||||
{"MemoryStatus", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, tDeviceInfoMemoryStatusParams, NULL, BBFDM_BOTH},
|
||||
{"ProcessStatus", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, NULL, tDeviceInfoProcessStatusObj, tDeviceInfoProcessStatusParams, NULL, BBFDM_BOTH},
|
||||
{"Processor", &DMREAD, NULL, NULL, NULL, browseDeviceInfoProcessorInst, NULL, NULL, NULL, NULL, tDeviceInfoProcessorParams, NULL, BBFDM_BOTH},
|
||||
{"Processor", &DMREAD, NULL, NULL, NULL, browseDeviceInfoProcessorInst, NULL, NULL, NULL, NULL, tDeviceInfoProcessorParams, NULL, BBFDM_BOTH, (const char *[]){"Alias", NULL}},
|
||||
{"VendorLogFile", &DMREAD, NULL, NULL, NULL, browseVlfInst, NULL, NULL, NULL, NULL, tDeviceInfoVendorLogFileParams, NULL, BBFDM_BOTH, (const char *[]){"Name", "Alias", NULL}},
|
||||
{"SupportedDataModel", &DMREAD, NULL, NULL, NULL, browseDeviceInfoSupportedDataModelInst, NULL, NULL, NULL, NULL, tDeviceInfoSupportedDataModelParams, NULL, BBFDM_CWMP},
|
||||
{"FirmwareImage", &DMREAD, NULL, NULL, NULL, browseDeviceInfoFirmwareImageInst, NULL, NULL, NULL, NULL, tDeviceInfoFirmwareImageParams, NULL, BBFDM_BOTH, (const char *[]){"Name", NULL}},
|
||||
{"SupportedDataModel", &DMREAD, NULL, NULL, NULL, browseDeviceInfoSupportedDataModelInst, NULL, NULL, NULL, NULL, tDeviceInfoSupportedDataModelParams, NULL, BBFDM_CWMP, (const char *[]){"URL", "Alias", "UUID", NULL}},
|
||||
{"FirmwareImage", &DMREAD, NULL, NULL, NULL, browseDeviceInfoFirmwareImageInst, NULL, NULL, NULL, NULL, tDeviceInfoFirmwareImageParams, NULL, BBFDM_BOTH, (const char *[]){"Alias", NULL}},
|
||||
{0}
|
||||
};
|
||||
|
||||
|
|
@ -641,7 +641,7 @@ DMLEAF tDeviceInfoMemoryStatusParams[] = {
|
|||
/* *** Device.DeviceInfo.ProcessStatus. *** */
|
||||
DMOBJ tDeviceInfoProcessStatusObj[] = {
|
||||
/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type*/
|
||||
{"Process", &DMREAD, NULL, NULL, NULL, os__browseProcessEntriesInst, NULL, NULL, NULL, NULL, tDeviceInfoProcessStatusProcessParams, NULL, BBFDM_BOTH,(const char *[]){"PID", NULL}},
|
||||
{"Process", &DMREAD, NULL, NULL, NULL, os__browseProcessEntriesInst, NULL, NULL, NULL, NULL, tDeviceInfoProcessStatusProcessParams, NULL, BBFDM_BOTH, (const char *[]){"PID", NULL}},
|
||||
{0}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -3075,7 +3075,7 @@ DMLEAF tDHCPv4ServerParams[] = {
|
|||
/*** DHCPv4.Server. ***/
|
||||
DMOBJ tDHCPv4ServerObj[] = {
|
||||
/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type*/
|
||||
{"Pool", &DMWRITE, add_dhcp_server, delete_dhcp_server, NULL, browseDhcpInst, NULL, NULL, NULL, tDHCPv4ServerPoolObj, tDHCPv4ServerPoolParams, NULL, BBFDM_BOTH},
|
||||
{"Pool", &DMWRITE, add_dhcp_server, delete_dhcp_server, NULL, browseDhcpInst, NULL, NULL, NULL, tDHCPv4ServerPoolObj, tDHCPv4ServerPoolParams, NULL, BBFDM_BOTH, (const char *[]){"Alias", NULL}},
|
||||
{0}
|
||||
};
|
||||
|
||||
|
|
@ -3165,7 +3165,7 @@ DMLEAF tDHCPv4ServerPoolClientOptionParams[] = {
|
|||
/* *** Device.DHCPv4.Relay. *** */
|
||||
DMOBJ tDHCPv4RelayObj[] = {
|
||||
/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type*/
|
||||
{"Forwarding", &DMWRITE, addObjDHCPv4RelayForwarding, delObjDHCPv4RelayForwarding, NULL, browseDHCPv4RelayForwardingInst, NULL, NULL, NULL, NULL, tDHCPv4RelayForwardingParams, NULL, BBFDM_BOTH},
|
||||
{"Forwarding", &DMWRITE, addObjDHCPv4RelayForwarding, delObjDHCPv4RelayForwarding, NULL, browseDHCPv4RelayForwardingInst, NULL, NULL, NULL, NULL, tDHCPv4RelayForwardingParams, NULL, BBFDM_BOTH, (const char *[]){"Alias", NULL}},
|
||||
{0}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1454,7 +1454,7 @@ DMOBJ tDHCPv6ClientObj[] = {
|
|||
/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type*/
|
||||
//{"Server", &DMREAD, NULL, NULL, NULL, browseDHCPv6ClientServerInst, NULL, NULL, NULL, NULL, tDHCPv6ClientServerParams, NULL, BBFDM_BOTH, (const char *[]){"SourceAddress", NULL}},
|
||||
//{"SentOption", &DMWRITE, addObjDHCPv6ClientSentOption, delObjDHCPv6ClientSentOption, NULL, browseDHCPv6ClientSentOptionInst, NULL, NULL, NULL, NULL, tDHCPv6ClientSentOptionParams, NULL, BBFDM_BOTH, (const char *[]){"Tag", "Alias", NULL}},
|
||||
//{"ReceivedOption", &DMREAD, NULL, NULL, NULL, browseDHCPv6ClientReceivedOptionInst, NULL, NULL, NULL, NULL, tDHCPv6ClientReceivedOptionParams, NULL, BBFDM_BOTH, (const char *[]){"Tag", NULL}},
|
||||
//{"ReceivedOption", &DMREAD, NULL, NULL, NULL, browseDHCPv6ClientReceivedOptionInst, NULL, NULL, NULL, NULL, tDHCPv6ClientReceivedOptionParams, NULL, BBFDM_BOTH},
|
||||
{0}
|
||||
};
|
||||
|
||||
|
|
@ -1561,8 +1561,8 @@ DMLEAF tDHCPv6ServerPoolParams[] = {
|
|||
DMOBJ tDHCPv6ServerPoolClientObj[] = {
|
||||
/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type*/
|
||||
{"IPv6Address", &DMREAD, NULL, NULL, NULL, browseDHCPv6ServerPoolClientIPv6AddressInst, NULL, NULL, NULL, NULL, tDHCPv6ServerPoolClientIPv6AddressParams, NULL, BBFDM_BOTH, (const char *[]){"IPAddress", NULL}},
|
||||
{"IPv6Prefix", &DMREAD, NULL, NULL, NULL, browseDHCPv6ServerPoolClientIPv6PrefixInst, NULL, NULL, NULL, NULL, tDHCPv6ServerPoolClientIPv6PrefixParams, NULL, BBFDM_BOTH, (const char *[]){"Prefix", "Alias", NULL}},
|
||||
//{"Option", &DMREAD, NULL, NULL, NULL, browseDHCPv6ServerPoolClientOptionInst, NULL, NULL, NULL, NULL, tDHCPv6ServerPoolClientOptionParams, NULL, BBFDM_BOTH, (const char *[]){"Tag", NULL}},
|
||||
{"IPv6Prefix", &DMREAD, NULL, NULL, NULL, browseDHCPv6ServerPoolClientIPv6PrefixInst, NULL, NULL, NULL, NULL, tDHCPv6ServerPoolClientIPv6PrefixParams, NULL, BBFDM_BOTH, (const char *[]){"Prefix", NULL}},
|
||||
//{"Option", &DMREAD, NULL, NULL, NULL, browseDHCPv6ServerPoolClientOptionInst, NULL, NULL, NULL, NULL, tDHCPv6ServerPoolClientOptionParams, NULL, BBFDM_BOTH},
|
||||
{0}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1320,7 +1320,7 @@ DMLEAF tFirewallLevelParams[] = {
|
|||
/* *** Device.Firewall.Chain.{i}. *** */
|
||||
DMOBJ tFirewallChainObj[] = {
|
||||
/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type*/
|
||||
{"Rule", &DMWRITE, add_firewall_rule, delete_firewall_rule, NULL, browseRuleInst, NULL, NULL, NULL, tFirewallChainRuleObj, tFirewallChainRuleParams, NULL, BBFDM_BOTH},
|
||||
{"Rule", &DMWRITE, add_firewall_rule, delete_firewall_rule, NULL, browseRuleInst, NULL, NULL, NULL, tFirewallChainRuleObj, tFirewallChainRuleParams, NULL, BBFDM_BOTH, (const char *[]){"Alias", NULL}},
|
||||
{0}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -420,8 +420,8 @@ static int get_GRETunnelInterfaceStats_ErrorsReceived(char *refparam, struct dmc
|
|||
/* *** Device.GRE. *** */
|
||||
DMOBJ tGREObj[] = {
|
||||
/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type*/
|
||||
{"Tunnel", &DMWRITE, addObjGRETunnel, delObjGRETunnel, NULL, browseGRETunnelInst, NULL, NULL, NULL, tGRETunnelObj, tGRETunnelParams, NULL, BBFDM_BOTH},
|
||||
//{"Filter", &DMWRITE, addObjGREFilter, delObjGREFilter, NULL, browseGREFilterInst, NULL, NULL, NULL, NULL, tGREFilterParams, NULL, BBFDM_BOTH},
|
||||
{"Tunnel", &DMWRITE, addObjGRETunnel, delObjGRETunnel, NULL, browseGRETunnelInst, NULL, NULL, NULL, tGRETunnelObj, tGRETunnelParams, NULL, BBFDM_BOTH, (const char *[]){"Alias", NULL}},
|
||||
//{"Filter", &DMWRITE, addObjGREFilter, delObjGREFilter, NULL, browseGREFilterInst, NULL, NULL, NULL, NULL, tGREFilterParams, NULL, BBFDM_BOTH, (const char *[]){"Alias", NULL}},
|
||||
{0}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1480,7 +1480,7 @@ static int get_IEEE1905ALNetworkTopologyIEEE1905DeviceBridgingTuple_InterfaceLis
|
|||
return 0;
|
||||
}
|
||||
|
||||
/*#Device.IEEE1905.AL.Security.SetupMethod!UCI:ieee1905/security,security/None*/
|
||||
/*#Device.IEEE1905.AL.Security.SetupMethod!UCI:ieee1905/security,security/method*/
|
||||
static int get_IEEE1905ALSecurity_SetupMethod(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
|
||||
{
|
||||
dmuci_get_option_value_string("ieee1905", "security", "method", value);
|
||||
|
|
|
|||
|
|
@ -1888,7 +1888,7 @@ DMOBJ tIPInterfaceObj[] = {
|
|||
/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type*/
|
||||
{"IPv4Address", &DMWRITE, add_ipv4, delete_ipv4, NULL, browseIfaceIPv4Inst, NULL, NULL, NULL, NULL, tIPInterfaceIPv4AddressParams, NULL, BBFDM_BOTH, (const char *[]){"IPAddress", "SubnetMast", "Alias", NULL}},
|
||||
{"IPv6Address", &DMWRITE, add_ipv6, delete_ipv6, NULL, browseIfaceIPv6Inst, NULL, NULL, NULL, NULL, tIPInterfaceIPv6AddressParams, NULL, BBFDM_BOTH, (const char *[]){"IPAddress", "Alias", NULL}},
|
||||
{"IPv6Prefix", &DMWRITE, add_ipv6_prefix, delete_ipv6_prefix, NULL, browseIfaceIPv6PrefixInst, NULL, NULL, NULL, NULL, tIPInterfaceIPv6PrefixParams, get_linker_ipv6_prefix, BBFDM_BOTH,(const char *[]){"Prefix", "Alias", NULL}},
|
||||
{"IPv6Prefix", &DMWRITE, add_ipv6_prefix, delete_ipv6_prefix, NULL, browseIfaceIPv6PrefixInst, NULL, NULL, NULL, NULL, tIPInterfaceIPv6PrefixParams, get_linker_ipv6_prefix, BBFDM_BOTH, (const char *[]){"Prefix", "Alias", NULL}},
|
||||
{"Stats", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, tIPInterfaceStatsParams, NULL, BBFDM_BOTH},
|
||||
{0}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -14,12 +14,12 @@
|
|||
/* *** Device.QoS. *** */
|
||||
DMOBJ tQoSObj[] = {
|
||||
/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type*/
|
||||
{"Classification", &DMWRITE, os_addObjQoSClassification, os_delObjQoSClassification, NULL, os_browseQoSClassificationInst, NULL, NULL, NULL, NULL, tQoSClassificationParams, NULL, BBFDM_BOTH},
|
||||
{"QueueStats", &DMWRITE, os_addObjQoSQueueStats, os_delObjQoSQueueStats, NULL, os_browseQoSQueueStatsInst, NULL, NULL, NULL, NULL, tQoSQueueStatsParams, NULL, BBFDM_BOTH},
|
||||
//{"App", &DMWRITE, addObjQoSApp, delObjQoSApp, NULL, browseQoSAppInst, NULL, NULL, NULL, NULL, tQoSAppParams, NULL, BBFDM_BOTH},
|
||||
//{"Flow", &DMWRITE, addObjQoSFlow, delObjQoSFlow, NULL, browseQoSFlowInst, NULL, NULL, NULL, NULL, tQoSFlowParams, NULL, BBFDM_BOTH},
|
||||
{"Policer", &DMWRITE, os_addObjQoSPolicer, os_delObjQoSPolicer, NULL, os_browseQoSPolicerInst, NULL, NULL, NULL, NULL, tQoSPolicerParams, NULL, BBFDM_BOTH},
|
||||
{"Queue", &DMWRITE, os_addObjQoSQueue, os_delObjQoSQueue, NULL, os_browseQoSQueueInst, NULL, NULL, NULL, NULL, tQoSQueueParams, os_get_linker_qos_queue, BBFDM_BOTH},
|
||||
{"Classification", &DMWRITE, os_addObjQoSClassification, os_delObjQoSClassification, NULL, os_browseQoSClassificationInst, NULL, NULL, NULL, NULL, tQoSClassificationParams, NULL, BBFDM_BOTH, (const char *[]){"Alias", NULL}},
|
||||
{"QueueStats", &DMWRITE, os_addObjQoSQueueStats, os_delObjQoSQueueStats, NULL, os_browseQoSQueueStatsInst, NULL, NULL, NULL, NULL, tQoSQueueStatsParams, NULL, BBFDM_BOTH, (const char *[]){"Alias", "Queue", "Interface", NULL}},
|
||||
//{"App", &DMWRITE, addObjQoSApp, delObjQoSApp, NULL, browseQoSAppInst, NULL, NULL, NULL, NULL, tQoSAppParams, NULL, BBFDM_BOTH, (const char *[]){"Alias", NULL}},
|
||||
//{"Flow", &DMWRITE, addObjQoSFlow, delObjQoSFlow, NULL, browseQoSFlowInst, NULL, NULL, NULL, NULL, tQoSFlowParams, NULL, BBFDM_BOTH, (const char *[]){"Alias", NULL}},
|
||||
{"Policer", &DMWRITE, os_addObjQoSPolicer, os_delObjQoSPolicer, NULL, os_browseQoSPolicerInst, NULL, NULL, NULL, NULL, tQoSPolicerParams, NULL, BBFDM_BOTH, (const char *[]){"Alias", NULL}},
|
||||
{"Queue", &DMWRITE, os_addObjQoSQueue, os_delObjQoSQueue, NULL, os_browseQoSQueueInst, NULL, NULL, NULL, NULL, tQoSQueueParams, os_get_linker_qos_queue, BBFDM_BOTH, (const char *[]){"Alias", NULL}},
|
||||
{"Shaper", &DMWRITE, os_addObjQoSShaper, os_delObjQoSShaper, NULL, os_browseQoSShaperInst, NULL, NULL, NULL, NULL, tQoSShaperParams, NULL, BBFDM_BOTH, (const char *[]){"Interface", "Alias", NULL}},
|
||||
{0}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1302,7 +1302,7 @@ static int browseRoutingRouteInformationInterfaceSettingInst(struct dmctx *dmctx
|
|||
/* *** Device.Routing. *** */
|
||||
DMOBJ tRoutingObj[] = {
|
||||
/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type*/
|
||||
{"Router", &DMREAD, NULL, NULL, NULL, browseRouterInst, NULL, NULL, NULL, tRoutingRouterObj, tRoutingRouterParams, NULL, BBFDM_BOTH},
|
||||
{"Router", &DMREAD, NULL, NULL, NULL, browseRouterInst, NULL, NULL, NULL, tRoutingRouterObj, tRoutingRouterParams, NULL, BBFDM_BOTH, (const char *[]){"Alias", NULL}},
|
||||
{"RouteInformation", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, NULL, tRoutingRouteInformationObj, tRoutingRouteInformationParams, NULL, BBFDM_BOTH},
|
||||
{0}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -431,7 +431,7 @@ static int get_SecurityCertificate_SignatureAlgorithm(char *refparam, struct dmc
|
|||
/* *** Device.Security. *** */
|
||||
DMOBJ tSecurityObj[] = {
|
||||
/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type*/
|
||||
{"Certificate", &DMREAD, NULL, NULL, NULL, browseSecurityCertificateInst, NULL, NULL, NULL, NULL, tSecurityCertificateParams, NULL, BBFDM_BOTH},
|
||||
{"Certificate", &DMREAD, NULL, NULL, NULL, browseSecurityCertificateInst, NULL, NULL, NULL, NULL, tSecurityCertificateParams, NULL, BBFDM_BOTH, (const char *[]){"SerialNumber", "Issuer", NULL}},
|
||||
{0}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -942,7 +942,7 @@ DMLEAF tUPnPDiscoveryServiceParams[] = {
|
|||
DMOBJ tUPnPDescriptionObj[] = {
|
||||
/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type*/
|
||||
{"DeviceDescription", &DMREAD, NULL, NULL, NULL, browseUPnPDescriptionDeviceDescriptionInst, NULL, NULL, NULL, NULL, tUPnPDescriptionDeviceDescriptionParams, NULL, BBFDM_BOTH, (const char *[]){"URLBase", NULL}},
|
||||
{"DeviceInstance", &DMREAD, NULL, NULL, NULL, browseUPnPDescriptionDeviceInstanceInst, NULL, NULL, NULL, NULL, tUPnPDescriptionDeviceInstanceParams, get_device_instance_linker, BBFDM_BOTH,(const char *[]){"UDN", NULL}},
|
||||
{"DeviceInstance", &DMREAD, NULL, NULL, NULL, browseUPnPDescriptionDeviceInstanceInst, NULL, NULL, NULL, NULL, tUPnPDescriptionDeviceInstanceParams, get_device_instance_linker, BBFDM_BOTH, (const char *[]){"UDN", NULL}},
|
||||
{"ServiceInstance", &DMREAD, NULL, NULL, NULL, browseUPnPDescriptionServiceInstanceInst, NULL, NULL, NULL, NULL, tUPnPDescriptionServiceInstanceParams, NULL, BBFDM_BOTH, (const char *[]){"ParentDevice", "ServiceId", NULL}},
|
||||
{0}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -249,8 +249,7 @@ static int set_user_language(char *refparam, struct dmctx *ctx, void *data, char
|
|||
/* *** Device.Users. *** */
|
||||
DMOBJ tUsersObj[] = {
|
||||
/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type*/
|
||||
{"User", &DMWRITE, add_users_user, delete_users_user, NULL, browseUserInst, NULL, NULL, NULL, NULL, tUsersUserParams, NULL, BBFDM_BOTH,
|
||||
(const char *[]){"Username", "Alias", NULL}},
|
||||
{"User", &DMWRITE, add_users_user, delete_users_user, NULL, browseUserInst, NULL, NULL, NULL, NULL, tUsersUserParams, NULL, BBFDM_BOTH, (const char *[]){"Username", "Alias", NULL}},
|
||||
{0}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2201,7 +2201,7 @@ DMOBJ tWiFiObj[] = {
|
|||
{"Radio", &DMREAD, NULL, NULL, NULL, browseWifiRadioInst, NULL, NULL, NULL, tWiFiRadioObj, tWiFiRadioParams, get_linker_Wifi_Radio, BBFDM_BOTH, (const char *[]){"Name", "Alias", NULL}},
|
||||
{"SSID", &DMWRITE, add_wifi_ssid, delete_wifi_ssid, NULL, browseWifiSsidInst, NULL, NULL, NULL, tWiFiSSIDObj, tWiFiSSIDParams, get_linker_Wifi_Ssid, BBFDM_BOTH, (const char *[]){"Name", "Alias", "BSSID", NULL}},
|
||||
{"AccessPoint", &DMWRITE, add_wifi_accesspoint, delete_wifi_accesspoint, NULL, browseWifiAccessPointInst, NULL, NULL, NULL, tWiFiAccessPointObj, tWiFiAccessPointParams, NULL, BBFDM_BOTH, (const char *[]){"SSIDReference", "Alias", NULL}},
|
||||
{"NeighboringWiFiDiagnostic", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, NULL, tWiFiNeighboringWiFiDiagnosticObj, tWiFiNeighboringWiFiDiagnosticParams, NULL, BBFDM_BOTH, },
|
||||
{"NeighboringWiFiDiagnostic", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, NULL, tWiFiNeighboringWiFiDiagnosticObj, tWiFiNeighboringWiFiDiagnosticParams, NULL, BBFDM_BOTH},
|
||||
{"EndPoint", &DMWRITE, addObjWiFiEndPoint, delObjWiFiEndPoint, NULL, browseWiFiEndPointInst, NULL, NULL, NULL, tWiFiEndPointObj, tWiFiEndPointParams, NULL, BBFDM_BOTH, (const char *[]){"SSIDReference", "Alias", NULL}},
|
||||
{0}
|
||||
};
|
||||
|
|
@ -2456,7 +2456,7 @@ DMOBJ tWiFiEndPointObj[] = {
|
|||
/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type*/
|
||||
{"Stats", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, tWiFiEndPointStatsParams, NULL, BBFDM_BOTH},
|
||||
{"Security", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, tWiFiEndPointSecurityParams, NULL, BBFDM_BOTH},
|
||||
{"Profile", &DMREAD, NULL, NULL, NULL, browseWiFiEndPointProfileInst, NULL, NULL, NULL, tWiFiEndPointProfileObj, tWiFiEndPointProfileParams, NULL, BBFDM_BOTH, (const char *[]){"SSID", "Alias", "Profile", NULL}},
|
||||
{"Profile", &DMREAD, NULL, NULL, NULL, browseWiFiEndPointProfileInst, NULL, NULL, NULL, tWiFiEndPointProfileObj, tWiFiEndPointProfileParams, NULL, BBFDM_BOTH, (const char *[]){"Alias", "SSID", "Location", "Priority", NULL}},
|
||||
{"WPS", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, tWiFiEndPointWPSParams, NULL, BBFDM_BOTH},
|
||||
{0}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@ extern DMLEAF tWiFiSSIDParams[];
|
|||
extern DMLEAF tWiFiRadioParams[];
|
||||
extern DMLEAF tWiFiAccessPointSecurityParams[];
|
||||
extern DMLEAF tWiFiAccessPointAssociatedDeviceParams[];
|
||||
extern DMLEAF tWiFiAcessPointIEEE80211rParams[];
|
||||
extern DMOBJ tWiFiAccessPointAssociatedDeviceObj[];
|
||||
extern DMLEAF tWiFiAccessPointAssociatedDeviceStatsParams[];
|
||||
extern DMLEAF tWiFiRadioStatsParams[];
|
||||
|
|
|
|||
|
|
@ -74,16 +74,15 @@ def getprotocolsparam( value, option ):
|
|||
return "BBFDM_CWMP"
|
||||
return "BBFDM_BOTH"
|
||||
|
||||
def getuniquekey( value, option ):
|
||||
def getuniquekeys( value, option ):
|
||||
if isinstance(value, dict):
|
||||
for obj, val in value.items():
|
||||
if obj == option and isinstance(val, list):
|
||||
buf = "(const char *[]){"
|
||||
for key in val:
|
||||
buf = buf + "\"%s\"" % key + ", "
|
||||
buf = buf + "NULL" + "}"
|
||||
#print(buf)
|
||||
return buf
|
||||
buf = "(const char *[]){"
|
||||
for key in val:
|
||||
buf = buf + "\"%s\"" % key + ", "
|
||||
buf = buf + "NULL" + "}"
|
||||
return buf
|
||||
return None
|
||||
|
||||
def getargsparam( value ):
|
||||
|
|
@ -361,7 +360,7 @@ def printheaderObjCommon( objname ):
|
|||
def cprintheaderOBJS( objname ):
|
||||
fp = open('./.objparamarray.c', 'a')
|
||||
print >> fp, "DMOBJ %s[] = {" % ("t" + getname(objname) + "Obj")
|
||||
print >> fp, "/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type, uniqueKey*/"
|
||||
print >> fp, "/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type, uniqueKeys*/"
|
||||
fp.close()
|
||||
|
||||
def hprintheaderOBJS( objname ):
|
||||
|
|
@ -827,7 +826,7 @@ def printOBJline( dmobject, value ):
|
|||
accessobj = getoptionparam(value, "access")
|
||||
mappingobj = getoptionparam(value, "mapping")
|
||||
bbfdm = getprotocolsparam(value, "protocols")
|
||||
uniquekey = getuniquekey(value, "uniqueKey")
|
||||
uniquekeys = getuniquekeys(value, "uniqueKeys")
|
||||
|
||||
if accessobj:
|
||||
access = "&DMWRITE"
|
||||
|
|
@ -856,8 +855,8 @@ def printOBJline( dmobject, value ):
|
|||
paramarray = "NULL"
|
||||
|
||||
fp = open('./.objparamarray.c', 'a')
|
||||
if uniquekey:
|
||||
print >> fp, "{\"%s\", %s, %s, %s, NULL, %s, NULL, NULL, NULL, %s, %s, NULL, %s, %s}," % (getlastname(dmobject), access, faddobj, fdelobj, fbrowse, objchildarray, paramarray, bbfdm, uniquekey)
|
||||
if uniquekeys:
|
||||
print >> fp, "{\"%s\", %s, %s, %s, NULL, %s, NULL, NULL, NULL, %s, %s, NULL, %s, %s}," % (getlastname(dmobject), access, faddobj, fdelobj, fbrowse, objchildarray, paramarray, bbfdm, uniquekeys)
|
||||
else:
|
||||
print >> fp, "{\"%s\", %s, %s, %s, NULL, %s, NULL, NULL, NULL, %s, %s, NULL, %s}," % (getlastname(dmobject), access, faddobj, fdelobj, fbrowse, objchildarray, paramarray, bbfdm)
|
||||
fp.close()
|
||||
|
|
|
|||
200
json/tr104.json
200
json/tr104.json
|
|
@ -5,6 +5,9 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Alias"
|
||||
],
|
||||
"access": false,
|
||||
"array": true,
|
||||
"Alias": {
|
||||
|
|
@ -789,6 +792,11 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Alias",
|
||||
"Codec",
|
||||
"BitRate"
|
||||
],
|
||||
"access": false,
|
||||
"array": true,
|
||||
"Alias": {
|
||||
|
|
@ -1038,6 +1046,10 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Name",
|
||||
"Alias"
|
||||
],
|
||||
"access": false,
|
||||
"array": true,
|
||||
"Enable": {
|
||||
|
|
@ -1315,6 +1327,10 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Name",
|
||||
"Alias"
|
||||
],
|
||||
"access": false,
|
||||
"array": true,
|
||||
"Enable": {
|
||||
|
|
@ -1653,6 +1669,10 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Name",
|
||||
"Alias"
|
||||
],
|
||||
"access": false,
|
||||
"array": true,
|
||||
"Enable": {
|
||||
|
|
@ -1915,6 +1935,10 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Name",
|
||||
"Alias"
|
||||
],
|
||||
"access": false,
|
||||
"array": true,
|
||||
"mapping": {
|
||||
|
|
@ -2307,6 +2331,10 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Alias",
|
||||
"Function"
|
||||
],
|
||||
"access": false,
|
||||
"array": true,
|
||||
"Alias": {
|
||||
|
|
@ -2395,6 +2423,11 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"RFPI",
|
||||
"Name",
|
||||
"Alias"
|
||||
],
|
||||
"access": false,
|
||||
"array": true,
|
||||
"Enable": {
|
||||
|
|
@ -2706,6 +2739,10 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"IPEI",
|
||||
"Alias"
|
||||
],
|
||||
"access": false,
|
||||
"array": true,
|
||||
"Enable": {
|
||||
|
|
@ -3011,6 +3048,9 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Alias"
|
||||
],
|
||||
"access": true,
|
||||
"array": true,
|
||||
"mapping": {
|
||||
|
|
@ -3285,6 +3325,9 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Alias"
|
||||
],
|
||||
"access": true,
|
||||
"array": true,
|
||||
"Enable": {
|
||||
|
|
@ -3466,6 +3509,10 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Alias",
|
||||
"Event"
|
||||
],
|
||||
"access": true,
|
||||
"array": true,
|
||||
"Enable": {
|
||||
|
|
@ -3546,6 +3593,9 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Alias"
|
||||
],
|
||||
"access": true,
|
||||
"array": true,
|
||||
"mapping": {
|
||||
|
|
@ -4707,6 +4757,10 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Alias",
|
||||
"Domain"
|
||||
],
|
||||
"access": true,
|
||||
"array": true,
|
||||
"Enable": {
|
||||
|
|
@ -4865,6 +4919,10 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Alias",
|
||||
"Event"
|
||||
],
|
||||
"access": true,
|
||||
"array": true,
|
||||
"Enable": {
|
||||
|
|
@ -4972,6 +5030,10 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Alias",
|
||||
"SIPResponseNumber"
|
||||
],
|
||||
"access": true,
|
||||
"array": true,
|
||||
"Alias": {
|
||||
|
|
@ -5053,6 +5115,11 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Alias",
|
||||
"ProxyIPAddress",
|
||||
"ProxyPort"
|
||||
],
|
||||
"access": true,
|
||||
"array": true,
|
||||
"Enable": {
|
||||
|
|
@ -5177,6 +5244,11 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Alias",
|
||||
"RegistrarPort",
|
||||
"RegistrarIPAddress"
|
||||
],
|
||||
"access": true,
|
||||
"array": true,
|
||||
"Enable": {
|
||||
|
|
@ -5373,6 +5445,10 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"URI",
|
||||
"Alias"
|
||||
],
|
||||
"access": true,
|
||||
"array": true,
|
||||
"Enable": {
|
||||
|
|
@ -5585,6 +5661,9 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Alias"
|
||||
],
|
||||
"access": true,
|
||||
"array": true,
|
||||
"Enable": {
|
||||
|
|
@ -5750,6 +5829,9 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Alias"
|
||||
],
|
||||
"access": true,
|
||||
"array": true,
|
||||
"Enable": {
|
||||
|
|
@ -5900,6 +5982,9 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Alias"
|
||||
],
|
||||
"access": true,
|
||||
"array": true,
|
||||
"Enable": {
|
||||
|
|
@ -6235,6 +6320,9 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Alias"
|
||||
],
|
||||
"access": true,
|
||||
"array": true,
|
||||
"Enable": {
|
||||
|
|
@ -6370,6 +6458,9 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Alias"
|
||||
],
|
||||
"access": true,
|
||||
"array": true,
|
||||
"Enable": {
|
||||
|
|
@ -6603,6 +6694,9 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Alias"
|
||||
],
|
||||
"access": true,
|
||||
"array": true,
|
||||
"Enable": {
|
||||
|
|
@ -6884,6 +6978,10 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"DirectoryNumber",
|
||||
"Alias"
|
||||
],
|
||||
"access": true,
|
||||
"array": true,
|
||||
"mapping": {
|
||||
|
|
@ -7249,6 +7347,10 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"ExtensionNumber",
|
||||
"Alias"
|
||||
],
|
||||
"access": true,
|
||||
"array": true,
|
||||
"Enable": {
|
||||
|
|
@ -7695,6 +7797,9 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Alias"
|
||||
],
|
||||
"access": true,
|
||||
"array": true,
|
||||
"Alias": {
|
||||
|
|
@ -7757,6 +7862,9 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Alias"
|
||||
],
|
||||
"access": true,
|
||||
"array": true,
|
||||
"Enable": {
|
||||
|
|
@ -7915,6 +8023,11 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Line",
|
||||
"Extension",
|
||||
"Alias"
|
||||
],
|
||||
"access": true,
|
||||
"array": true,
|
||||
"Enable": {
|
||||
|
|
@ -8020,6 +8133,11 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Extension",
|
||||
"Line",
|
||||
"Alias"
|
||||
],
|
||||
"access": true,
|
||||
"array": true,
|
||||
"mapping": {
|
||||
|
|
@ -8139,6 +8257,9 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Alias"
|
||||
],
|
||||
"access": true,
|
||||
"array": true,
|
||||
"mapping": {
|
||||
|
|
@ -8303,6 +8424,9 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Alias"
|
||||
],
|
||||
"access": true,
|
||||
"array": true,
|
||||
"Alias": {
|
||||
|
|
@ -8480,6 +8604,9 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Alias"
|
||||
],
|
||||
"access": true,
|
||||
"array": true,
|
||||
"mapping": {
|
||||
|
|
@ -8830,6 +8957,9 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Alias"
|
||||
],
|
||||
"access": true,
|
||||
"array": true,
|
||||
"Enable": {
|
||||
|
|
@ -8929,6 +9059,10 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"CallingNumber",
|
||||
"Alias"
|
||||
],
|
||||
"access": true,
|
||||
"array": true,
|
||||
"Enable": {
|
||||
|
|
@ -8993,6 +9127,10 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"CallingNumber",
|
||||
"Alias"
|
||||
],
|
||||
"access": true,
|
||||
"array": true,
|
||||
"Enable": {
|
||||
|
|
@ -9042,6 +9180,11 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Alias",
|
||||
"Number",
|
||||
"Order"
|
||||
],
|
||||
"access": true,
|
||||
"array": true,
|
||||
"Enable": {
|
||||
|
|
@ -9175,6 +9318,9 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Alias"
|
||||
],
|
||||
"access": true,
|
||||
"array": true,
|
||||
"Enable": {
|
||||
|
|
@ -9484,6 +9630,10 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Alias",
|
||||
"Registrar"
|
||||
],
|
||||
"access": true,
|
||||
"array": true,
|
||||
"Enable": {
|
||||
|
|
@ -9548,6 +9698,9 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Alias"
|
||||
],
|
||||
"access": true,
|
||||
"array": true,
|
||||
"Enable": {
|
||||
|
|
@ -9706,6 +9859,9 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Alias"
|
||||
],
|
||||
"access": false,
|
||||
"array": true,
|
||||
"Alias": {
|
||||
|
|
@ -9925,6 +10081,9 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Protocol"
|
||||
],
|
||||
"access": false,
|
||||
"array": true,
|
||||
"Protocol": {
|
||||
|
|
@ -9981,6 +10140,9 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"SessionID"
|
||||
],
|
||||
"access": false,
|
||||
"array": true,
|
||||
"StreamType": {
|
||||
|
|
@ -11134,6 +11296,9 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Alias"
|
||||
],
|
||||
"access": true,
|
||||
"array": true,
|
||||
"mapping": {
|
||||
|
|
@ -11869,6 +12034,9 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Alias"
|
||||
],
|
||||
"access": true,
|
||||
"array": true,
|
||||
"mapping": {
|
||||
|
|
@ -12038,6 +12206,9 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Alias"
|
||||
],
|
||||
"access": true,
|
||||
"array": true,
|
||||
"ToneEnable": {
|
||||
|
|
@ -12148,6 +12319,9 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Alias"
|
||||
],
|
||||
"access": true,
|
||||
"array": true,
|
||||
"Enable": {
|
||||
|
|
@ -12358,6 +12532,9 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Alias"
|
||||
],
|
||||
"access": true,
|
||||
"array": true,
|
||||
"Alias": {
|
||||
|
|
@ -12391,6 +12568,9 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Alias"
|
||||
],
|
||||
"access": true,
|
||||
"array": true,
|
||||
"Alias": {
|
||||
|
|
@ -12465,6 +12645,9 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Alias"
|
||||
],
|
||||
"access": false,
|
||||
"array": true,
|
||||
"Enable": {
|
||||
|
|
@ -12553,6 +12736,9 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Alias"
|
||||
],
|
||||
"access": false,
|
||||
"array": true,
|
||||
"Alias": {
|
||||
|
|
@ -12672,6 +12858,9 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Alias"
|
||||
],
|
||||
"access": false,
|
||||
"array": true,
|
||||
"Alias": {
|
||||
|
|
@ -12810,6 +12999,9 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Alias"
|
||||
],
|
||||
"access": true,
|
||||
"array": true,
|
||||
"RingEnable": {
|
||||
|
|
@ -12889,6 +13081,9 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Alias"
|
||||
],
|
||||
"access": true,
|
||||
"array": true,
|
||||
"Enable": {
|
||||
|
|
@ -13068,6 +13263,11 @@
|
|||
"cwmp",
|
||||
"usp"
|
||||
],
|
||||
"uniqueKeys": [
|
||||
"Alias",
|
||||
"Order",
|
||||
"Interface"
|
||||
],
|
||||
"access": false,
|
||||
"array": true,
|
||||
"Enable": {
|
||||
|
|
|
|||
1505
json/tr181.json
1505
json/tr181.json
File diff suppressed because it is too large
Load diff
|
|
@ -292,6 +292,18 @@ def objhasparam (dmobject):
|
|||
|
||||
return hasparam
|
||||
|
||||
def getuniquekeys (dmobject):
|
||||
uniquekeys = None
|
||||
for c in dmobject:
|
||||
if c.tag == "uniqueKey":
|
||||
for s in c:
|
||||
if s.tag == "parameter":
|
||||
if uniquekeys == None:
|
||||
uniquekeys = "\"%s\"" % s.get('ref')
|
||||
else:
|
||||
uniquekeys = uniquekeys + "," + "\"%s\"" % s.get('ref')
|
||||
return uniquekeys
|
||||
|
||||
def printopenobject (obj):
|
||||
fp = open('./.json_tmp', 'a')
|
||||
if "tr-104" in sys.argv[1]:
|
||||
|
|
@ -437,6 +449,7 @@ def removetmpfiles():
|
|||
removefile("./.json_tmp_1")
|
||||
|
||||
def printOBJ( dmobject, hasobj, hasparam, bbfdm_type ):
|
||||
uniquekeys = getuniquekeys(dmobject)
|
||||
hasmapping, mapping = getobjmapping(dmobject)
|
||||
if (dmobject.get('name')).endswith(".{i}."):
|
||||
fbrowse = "true"
|
||||
|
|
@ -446,6 +459,8 @@ def printOBJ( dmobject, hasobj, hasparam, bbfdm_type ):
|
|||
fp = open('./.json_tmp', 'a')
|
||||
print >> fp, "\"type\" : \"object\","
|
||||
print >> fp, "\"protocols\" : [%s]," % bbfdm_type
|
||||
if uniquekeys != None:
|
||||
print >> fp, "\"uniqueKeys\" : [%s]," % uniquekeys
|
||||
if (dmobject.get('access') == "readOnly"):
|
||||
print >> fp, "\"access\" : false,"
|
||||
else:
|
||||
|
|
@ -830,7 +845,6 @@ else:
|
|||
Root = sys.argv[3]
|
||||
objstart = getobjectpointer(Root)
|
||||
|
||||
|
||||
if objstart == None:
|
||||
print "Wrong Object Name! %s" % Root
|
||||
exit(1)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue