VOL-1900 lint warning fixes ro_core
Change-Id: I5ce82f2d188d215ba9620d0923a1101ed4e5e4a8
diff --git a/ro_core/core/logical_device_manager_test.go b/ro_core/core/logical_device_manager_test.go
index b9fb2a1..e7b33bc 100644
--- a/ro_core/core/logical_device_manager_test.go
+++ b/ro_core/core/logical_device_manager_test.go
@@ -17,23 +17,24 @@
import (
"context"
+ "reflect"
+ "testing"
+
"github.com/opencord/voltha-go/db/model"
"github.com/opencord/voltha-go/ro_core/config"
"github.com/opencord/voltha-protos/v2/go/openflow_13"
"github.com/opencord/voltha-protos/v2/go/voltha"
"github.com/stretchr/testify/assert"
- "reflect"
- "testing"
)
func MakeTestNewCoreConfig() *Core {
var core Core
- core.instanceId = "ro_core"
+ core.instanceID = "ro_core"
core.config = config.NewROCoreFlags()
core.clusterDataRoot = model.NewRoot(&voltha.Voltha{}, nil)
core.clusterDataProxy = core.clusterDataRoot.CreateProxy(context.Background(), "/", false)
core.genericMgr = newModelProxyManager(core.clusterDataProxy)
- core.deviceMgr = newDeviceManager(core.clusterDataProxy, core.instanceId)
+ core.deviceMgr = newDeviceManager(core.clusterDataProxy, core.instanceID)
return &core
}
@@ -62,7 +63,7 @@
// Verify ADD is successful
ldAgentNotNil := ldMgr.getLogicalDeviceAgent("id")
assert.NotNil(t, ldAgentNotNil)
- assert.Equal(t, "id", ldAgentNotNil.logicalDeviceId)
+ assert.Equal(t, "id", ldAgentNotNil.logicalDeviceID)
}
func TestGetLogicalDeviceAgent(t *testing.T) {
@@ -80,7 +81,7 @@
ldMgr.addLogicalDeviceAgentToMap(ldAgent)
ldAgentNotNil := ldMgr.getLogicalDeviceAgent("id")
assert.NotNil(t, ldAgentNotNil)
- assert.Equal(t, "id", ldAgentNotNil.logicalDeviceId)
+ assert.Equal(t, "id", ldAgentNotNil.logicalDeviceID)
}
func TestDeleteLogicalDeviceAgent(t *testing.T) {
@@ -102,7 +103,7 @@
// Verify ADD is successful
ldAgentNotNil := ldMgr.getLogicalDeviceAgent("id")
assert.NotNil(t, ldAgentNotNil)
- assert.Equal(t, "id", ldAgentNotNil.logicalDeviceId)
+ assert.Equal(t, "id", ldAgentNotNil.logicalDeviceID)
// Method under Test
ldMgr.deleteLogicalDeviceAgent("id")
@@ -142,7 +143,7 @@
// Verify Add is successful
ldAgentNotNil := ldMgr.getLogicalDeviceAgent("id")
assert.NotNil(t, ldAgentNotNil)
- assert.Equal(t, "id", ldAgentNotNil.logicalDeviceId)
+ assert.Equal(t, "id", ldAgentNotNil.logicalDeviceID)
// Verify getLogicalDevice() is NOT NIL
logicalDevNotNil, errNil := ldMgr.getLogicalDevice("id")
@@ -187,12 +188,12 @@
assert.NotNil(t, ldMgr)
/*** Case: Logical Device Id Found ***/
- result0, error0 := ldMgr.getLogicalDeviceId(&voltha.Device{Id: "id", Root: true, ParentId: "parent_id"})
+ result0, error0 := ldMgr.getLogicalDeviceID(&voltha.Device{Id: "id", Root: true, ParentId: "parent_id"})
assert.NotNil(t, result0)
assert.Nil(t, error0)
/*** Case: Logical Device Id Not Found ***/
- result1, error1 := ldMgr.getLogicalDeviceId(&voltha.Device{Id: "id", ParentId: "parent_id"})
+ result1, error1 := ldMgr.getLogicalDeviceID(&voltha.Device{Id: "id", ParentId: "parent_id"})
assert.Nil(t, result1)
assert.NotNil(t, error1)
}
@@ -205,12 +206,12 @@
assert.NotNil(t, ldMgr)
/*** Case: Logical Port Id Not Found: getLogicalDeviceId() Error ***/
- result0, error0 := ldMgr.getLogicalPortId(&voltha.Device{Id: "id", ParentId: "parent_id"})
+ result0, error0 := ldMgr.getLogicalPortID(&voltha.Device{Id: "id", ParentId: "parent_id"})
assert.Nil(t, result0)
assert.NotNil(t, error0)
/*** Case: Logical Port Id Not Found: getLogicalDevice() Error ***/
- result1, error1 := ldMgr.getLogicalPortId(&voltha.Device{Id: "id", Root: true, ParentId: "parent_id"})
+ result1, error1 := ldMgr.getLogicalPortID(&voltha.Device{Id: "id", Root: true, ParentId: "parent_id"})
assert.Nil(t, result1)
assert.NotNil(t, error1)
@@ -240,10 +241,10 @@
// Verify Add is successful
ldAgentNotNil := ldMgr.getLogicalDeviceAgent("parent_id")
assert.NotNil(t, ldAgentNotNil)
- assert.Equal(t, "parent_id", ldAgentNotNil.logicalDeviceId)
+ assert.Equal(t, "parent_id", ldAgentNotNil.logicalDeviceID)
// Verify getLogicalPortId() is Success
- result2, error2 := ldMgr.getLogicalPortId(device)
+ result2, error2 := ldMgr.getLogicalPortID(device)
assert.NotNil(t, result2)
assert.Nil(t, error2)
if reflect.TypeOf(result2) != reflect.TypeOf(wantResult) {
@@ -292,7 +293,7 @@
// Verify Add is successful
ldAgentNotNil := ldMgr.getLogicalDeviceAgent("id")
assert.NotNil(t, ldAgentNotNil)
- assert.Equal(t, "id", ldAgentNotNil.logicalDeviceId)
+ assert.Equal(t, "id", ldAgentNotNil.logicalDeviceID)
// Verify ListLogicalDevicePorts() is Success
result1, error1 := ldMgr.ListLogicalDevicePorts(context.Background(), "id")
@@ -340,7 +341,7 @@
// Verify Add is successful
ldAgentNotNil := ldMgr.getLogicalDeviceAgent("id")
assert.NotNil(t, ldAgentNotNil)
- assert.Equal(t, "id", ldAgentNotNil.logicalDeviceId)
+ assert.Equal(t, "id", ldAgentNotNil.logicalDeviceID)
// Verify ListLogicalDeviceFlows() is Success
result1, error1 := ldMgr.ListLogicalDeviceFlows(context.Background(), "id")
@@ -390,7 +391,7 @@
// Verify Add is successful
ldAgentNotNil := ldMgr.getLogicalDeviceAgent("id")
assert.NotNil(t, ldAgentNotNil)
- assert.Equal(t, "id", ldAgentNotNil.logicalDeviceId)
+ assert.Equal(t, "id", ldAgentNotNil.logicalDeviceID)
// Verify ListLogicalDeviceFlowGroups() is Success
result1, error1 := ldMgr.ListLogicalDeviceFlowGroups(context.Background(), "id")
@@ -436,7 +437,7 @@
// Verify Add is successful
ldAgentNotNil := ldMgr.getLogicalDeviceAgent("id")
assert.NotNil(t, ldAgentNotNil)
- assert.Equal(t, "id", ldAgentNotNil.logicalDeviceId)
+ assert.Equal(t, "id", ldAgentNotNil.logicalDeviceID)
// Verify getLogicalPort() is Success
result1, error1 := ldMgr.getLogicalPort(&voltha.LogicalPortId{Id: "id", PortId: "123"})