Ability to assign instance name when adding object

This commit is contained in:
Zaid Abdulla committed 2013-06-03 10:55:42 +03:00
1 parent 91e9e47a65
commit 44a09a655d
2 files changed
+7 -2

No files matched your search

+4
View File
@@ -77,6 +77,10 @@ updateDevice = (currentRequest, actions, callback) ->
for p in actions.deletedObjects for p in actions.deletedObjects
deletes[p] = 1 deletes[p] = 1
if actions.instanceName?
for i in actions.instanceName
updates["#{i[0]}._name"] = i[1]
if actions.parameterNames? if actions.parameterNames?
for p in actions.parameterNames for p in actions.parameterNames
path = if common.endsWith(p[0], '.') then p[0] else "#{p[0]}." path = if common.endsWith(p[0], '.') then p[0] else "#{p[0]}."
+3 -2
View File
@@ -122,18 +122,19 @@ this.addObject = (task, methodResponse, callback) ->
callback(null, STATUS_FAULT) callback(null, STATUS_FAULT)
return return
allDeviceUpdates = {}
if not task.instanceNumber? if not task.instanceNumber?
if methodResponse.type is 'AddObjectResponse' if methodResponse.type is 'AddObjectResponse'
task.instanceNumber = methodResponse.instanceNumber task.instanceNumber = methodResponse.instanceNumber
task.subtask = {name : 'getParameterNames', parameterPath : "#{task.objectName}#{task.instanceNumber}.", nextLevel : false} task.subtask = {name : 'getParameterNames', parameterPath : "#{task.objectName}#{task.instanceNumber}.", nextLevel : false}
task.appliedParameterValues = [] task.appliedParameterValues = []
task.parameterNames = [] task.parameterNames = []
allDeviceUpdates.instanceName = [["#{task.objectName}#{task.instanceNumber}", task.instanceName]] if task.instanceName?
else else
callback(null, STATUS_STARTED, {methodRequest : {type : 'AddObject', objectName : task.objectName}}) callback(null, STATUS_STARTED, {methodRequest : {type : 'AddObject', objectName : task.objectName}})
return return
allDeviceUpdates = {}
if task.subtask.name is 'getParameterNames' if task.subtask.name is 'getParameterNames'
this.getParameterNames(task.subtask, methodResponse, (err, status, cwmpResponse, deviceUpdates) => this.getParameterNames(task.subtask, methodResponse, (err, status, cwmpResponse, deviceUpdates) =>
common.extend(allDeviceUpdates, deviceUpdates) common.extend(allDeviceUpdates, deviceUpdates)