VOL-1900 lint warning fixes ro_core
Change-Id: I5ce82f2d188d215ba9620d0923a1101ed4e5e4a8
diff --git a/ro_core/core/device_manager_test.go b/ro_core/core/device_manager_test.go
index cef848c..da58e67 100644
--- a/ro_core/core/device_manager_test.go
+++ b/ro_core/core/device_manager_test.go
@@ -16,17 +16,18 @@
package core
import (
+ "testing"
+
"github.com/opencord/voltha-go/db/model"
"github.com/opencord/voltha-go/ro_core/config"
"github.com/opencord/voltha-lib-go/v2/pkg/db"
"github.com/opencord/voltha-protos/v2/go/voltha"
"github.com/stretchr/testify/assert"
- "testing"
)
func MakeTestDevManagerConfig() (*Core, error) {
var core Core
- core.instanceId = "ro_core"
+ core.instanceID = "ro_core"
core.config = config.NewROCoreFlags()
backend := db.Backend{
Client: core.kvClient,
@@ -44,7 +45,7 @@
core, _ := MakeTestDevManagerConfig()
- core.deviceMgr = newDeviceManager(core.clusterDataProxy, core.instanceId)
+ core.deviceMgr = newDeviceManager(core.clusterDataProxy, core.instanceID)
assert.NotNil(t, core.deviceMgr)
}
@@ -52,10 +53,10 @@
core, _ := MakeTestDevManagerConfig()
- core.deviceMgr = newDeviceManager(core.clusterDataProxy, core.instanceId)
+ core.deviceMgr = newDeviceManager(core.clusterDataProxy, core.instanceID)
assert.NotNil(t, core.deviceMgr)
- myIds, _ := core.deviceMgr.ListDeviceIds()
+ myIds, _ := core.deviceMgr.ListDeviceIDs()
assert.NotNil(t, myIds)
}
@@ -67,7 +68,7 @@
core, _ := MakeTestDevManagerConfig()
- core.deviceMgr = newDeviceManager(core.clusterDataProxy, core.instanceId)
+ core.deviceMgr = newDeviceManager(core.clusterDataProxy, core.instanceID)
assert.NotNil(t, core.deviceMgr)
devAgent := newDeviceAgent(&voltha.Device{Id: "new_device"}, core.deviceMgr, core.clusterDataProxy)
@@ -77,11 +78,11 @@
core.deviceMgr.addDeviceAgentToMap(devAgent)
// listDeviceIdsFromMap
- myIDs := core.deviceMgr.listDeviceIdsFromMap()
+ myIDs := core.deviceMgr.listDeviceIDsFromMap()
assert.NotNil(t, myIDs)
// getDeviceAgent
- myDevAgent := core.deviceMgr.getDeviceAgent(devAgent.deviceId)
+ myDevAgent := core.deviceMgr.getDeviceAgent(devAgent.deviceID)
assert.NotNil(t, myDevAgent)
// deleteDeviceAgentToMap
@@ -92,7 +93,7 @@
core, _ := MakeTestDevManagerConfig()
- core.deviceMgr = newDeviceManager(core.clusterDataProxy, core.instanceId)
+ core.deviceMgr = newDeviceManager(core.clusterDataProxy, core.instanceID)
assert.NotNil(t, core.deviceMgr)
devAgent := newDeviceAgent(&voltha.Device{Id: "new_device"}, core.deviceMgr, core.clusterDataProxy)
@@ -114,7 +115,7 @@
core, _ := MakeTestDevManagerConfig()
- core.deviceMgr = newDeviceManager(core.clusterDataProxy, core.instanceId)
+ core.deviceMgr = newDeviceManager(core.clusterDataProxy, core.instanceID)
assert.NotNil(t, core.deviceMgr)
devAgent := newDeviceAgent(&voltha.Device{Id: "new_device"}, core.deviceMgr, core.clusterDataProxy)
@@ -123,13 +124,13 @@
// addDeviceAgentToMap
core.deviceMgr.addDeviceAgentToMap(devAgent)
- isInCache := core.deviceMgr.IsDeviceInCache(devAgent.deviceId)
+ isInCache := core.deviceMgr.IsDeviceInCache(devAgent.deviceID)
assert.True(t, isInCache)
// deleteDeviceAgentToMap
core.deviceMgr.deleteDeviceAgentToMap(devAgent)
- isInCacheDel := core.deviceMgr.IsDeviceInCache(devAgent.deviceId)
+ isInCacheDel := core.deviceMgr.IsDeviceInCache(devAgent.deviceID)
assert.False(t, isInCacheDel)
}
@@ -137,7 +138,7 @@
core, _ := MakeTestDevManagerConfig()
- core.deviceMgr = newDeviceManager(core.clusterDataProxy, core.instanceId)
+ core.deviceMgr = newDeviceManager(core.clusterDataProxy, core.instanceID)
assert.NotNil(t, core.deviceMgr)
devAgent := newDeviceAgent(&voltha.Device{Id: "new_device"}, core.deviceMgr, core.clusterDataProxy)
@@ -154,7 +155,7 @@
core, _ := MakeTestDevManagerConfig()
- core.deviceMgr = newDeviceManager(core.clusterDataProxy, core.instanceId)
+ core.deviceMgr = newDeviceManager(core.clusterDataProxy, core.instanceID)
assert.NotNil(t, core.deviceMgr)
devAgent := newDeviceAgent(&voltha.Device{Id: "new_device"}, core.deviceMgr, core.clusterDataProxy)
@@ -171,7 +172,7 @@
core, _ := MakeTestDevManagerConfig()
- core.deviceMgr = newDeviceManager(core.clusterDataProxy, core.instanceId)
+ core.deviceMgr = newDeviceManager(core.clusterDataProxy, core.instanceID)
assert.NotNil(t, core.deviceMgr)
devAgent := newDeviceAgent(&voltha.Device{Id: "new_device"}, core.deviceMgr, core.clusterDataProxy)
@@ -180,7 +181,7 @@
// addDeviceAgentToMap
core.deviceMgr.addDeviceAgentToMap(devAgent)
- myIds, err := core.deviceMgr.getAllChildDeviceIds(devAgent.lastData)
+ myIds, err := core.deviceMgr.getAllChildDeviceIDs(devAgent.lastData)
assert.NotNil(t, myIds)
assert.Nil(t, err)
}