From 9160d7d84ef3b545d0353f8080e787b350379dd0 Mon Sep 17 00:00:00 2001 From: Zaid Abdulla Date: Thu, 6 Feb 2014 00:00:26 +0300 Subject: [PATCH] Modified sample file for parameter configuration to make it more generic. --- config/parameters-sample.json | 35 ++++++++++------------------------- 1 file changed, 10 insertions(+), 25 deletions(-) diff --git a/config/parameters-sample.json b/config/parameters-sample.json index 83ee10b..6e7ff69 100644 --- a/config/parameters-sample.json +++ b/config/parameters-sample.json @@ -2,33 +2,18 @@ "_lastInform" : {"alias" : "summary.lastInform", "type" : "date"}, "_lastBoot" : {"alias" : "summary.lastBoot", "type" : "date"}, "_lastBootstrap" : {"alias" : "summary.lastBootstrap", "type" : "date"}, - "InternetGatewayDevice.DeviceInfo.SerialNumber" : {"alias" : "summary.serialNumber"}, - "InternetGatewayDevice.DeviceInfo.Manufacturer" : {"alias" : "summary.manufacturer"}, - "InternetGatewayDevice.DeviceInfo.ProductClass" : {"alias" : "summary.productClass"}, - "InternetGatewayDevice.DeviceInfo.ManufacturerOUI" : {"alias" : "summary.oui"}, + "_deviceId._SerialNumber" : {"alias" : "summary.serialNumber"}, + "_deviceId._ProductClass" : {"alias" : "summary.productClass"}, + "_deviceId._OUI" : {"alias" : "summary.oui"}, + "_deviceId._Manufacturer" : {"alias" : "summary.manufacturer"}, "InternetGatewayDevice.DeviceInfo.HardwareVersion" : {"alias" : "summary.hardwareVersion"}, "InternetGatewayDevice.DeviceInfo.SoftwareVersion" : {"alias" : "summary.softwareVersion"}, - "InternetGatewayDevice.WANDevice.1.WANConnectionDevice.1.WANIPConnection.1.MACAddress" : {"alias" : "summary.mac", "type" : "mac"}, - "InternetGatewayDevice.WANDevice.1.WANConnectionDevice.1.WANIPConnection.1.ExternalIPAddress" : {"alias" : "summary.ip"}, - "InternetGatewayDevice.WiMAX.Status.BSID" : {"alias" : "summary.bsid", "type" : "mac"}, - "InternetGatewayDevice.X_CommunicationsInc_WiMAX_device_metrics.ServingBSID" : {"alias" : "summary.bsid", "type" : "mac"}, - "InternetGatewayDevice.WANDevice.1.WiMAXInterfaceConfig.RadioModule.ServBSID" : {"alias" : "summary.bsid", "type" : "mac"}, + "InternetGatewayDevice.WANDevice./^\\d+$/.WANConnectionDevice./^\\d+$/.WANIPConnection./^\\d+$/.MACAddress" : {"alias" : "summary.mac", "type" : "mac"}, + "InternetGatewayDevice.WANDevice./^\\d+$/.WANConnectionDevice./^\\d+$/.WANIPConnection./^\\d+$/.ExternalIPAddress" : {"alias" : "summary.ip"}, + "InternetGatewayDevice.WANDevice./^\\d+$/.WANConnectionDevice./^\\d+$/.WANPPPConnection./^\\d+$/.MACAddress" : {"alias" : "summary.mac", "type" : "mac"}, + "InternetGatewayDevice.WANDevice./^\\d+$/.WANConnectionDevice./^\\d+$/.WANPPPConnection./^\\d+$/.ExternalIPAddress" : {"alias" : "summary.ip"}, - "InternetGatewayDevice.WiMAX.Status.RSSI" : {"alias" : "summary.rssi", "type" : "float"}, - "InternetGatewayDevice.X_MTK_WiMAX_Param.RSSI_level" : {"alias" : "summary.rssi", "type" : "float"}, - "InternetGatewayDevice.X_CommunicationsInc_WiMAX_device_metrics.Statistics.DownlinkMeanRSSI" : {"alias" : "summary.rssi", "type" : "float"}, - - "InternetGatewayDevice.WiMAX.Status.CINR1" : {"alias" : "summary.cinr", "type" : "float"}, - "InternetGatewayDevice.X_MTK_WiMAX_Param.CINR_level" : {"alias" : "summary.cinr", "type" : "float"}, - "InternetGatewayDevice.X_CommunicationsInc_WiMAX_device_metrics.Statistics.DownlinkMeanCINR" : {"alias" : "summary.cinr", "type" : "float"}, - - "InternetGatewayDevice.WiMAX.Status.DLFEC" : {"alias" : "summary.downlinkModulation"}, - "InternetGatewayDevice.X_CommunicationsInc_WiMAX_device_metrics.Statistics.PHYDLmcs" : {"alias" : "summary.downlinkModulation"}, - - "InternetGatewayDevice.WiMAX.Status.ULFEC" : {"alias" : "summary.uplinkModulation"}, - "InternetGatewayDevice.X_CommunicationsInc_WiMAX_device_metrics.Statistics.PHYULmcs" : {"alias" : "summary.uplinkModulation"}, - - "InternetGatewayDevice.LANDevice.1.WLANConfiguration.1.SSID" : {"alias" : "summary.wlanSsid"}, - "InternetGatewayDevice.LANDevice.1.WLANConfiguration.1.PreSharedKey.1.PreSharedKey" : {"alias" : "summary.wlanPsk"} + "InternetGatewayDevice.LANDevice./^\\d+$/.WLANConfiguration./^\\d+$/.SSID" : {"alias" : "summary.wlanSsid"}, + "InternetGatewayDevice.LANDevice./^\\d+$/.WLANConfiguration./^\\d+$/.PreSharedKey.1.KeyPassphrase" : {"alias" : "summary.wlanPassphrase"} }