[VOL-4371] Voltha protos cleanup
Change-Id: I9ee6ef8c48e7287c3b546c59d5190a8311f1b3ac
diff --git a/rw_core/test/core_nbi_handler_multi_test.go b/rw_core/test/core_nbi_handler_multi_test.go
index 9a76069..8dbbbfc 100755
--- a/rw_core/test/core_nbi_handler_multi_test.go
+++ b/rw_core/test/core_nbi_handler_multi_test.go
@@ -31,6 +31,7 @@
"github.com/opencord/voltha-lib-go/v7/pkg/kafka"
mock_kafka "github.com/opencord/voltha-lib-go/v7/pkg/mocks/kafka"
"github.com/opencord/voltha-lib-go/v7/pkg/probe"
+ "github.com/opencord/voltha-protos/v5/go/omci"
ofp "github.com/opencord/voltha-protos/v5/go/openflow_13"
"github.com/opencord/voltha-protos/v5/go/voltha"
"google.golang.org/grpc"
@@ -1222,7 +1223,7 @@
// -----------------------------------------------------------------------
// SubTest 1: Omci test action should fail due to nonexistent device id
- request := &voltha.OmciTestRequest{Id: "123", Uuid: "456"}
+ request := &omci.OmciTestRequest{Id: "123", Uuid: "456"}
_, err := nbi.StartOmciTestAction(getContext(), request)
assert.NotNil(t, err)
assert.Equal(t, "rpc error: code = NotFound desc = 123", err.Error())
@@ -1236,7 +1237,7 @@
assert.NotNil(t, deviceNoAdapter)
// Omci test action should fail due to nonexistent adapter
- request = &voltha.OmciTestRequest{Id: deviceNoAdapter.Id, Uuid: "456"}
+ request = &omci.OmciTestRequest{Id: deviceNoAdapter.Id, Uuid: "456"}
_, err = nbi.StartOmciTestAction(getContext(), request)
assert.NotNil(t, err)
assert.True(t, strings.Contains(err.Error(), "noAdapterRegisteredOmciTest"))
@@ -1283,10 +1284,10 @@
onuDevice := onuDevices.Items[0]
// Omci test action should succeed
- request = &voltha.OmciTestRequest{Id: onuDevice.Id, Uuid: "456"}
+ request = &omci.OmciTestRequest{Id: onuDevice.Id, Uuid: "456"}
resp, err := nbi.StartOmciTestAction(getContext(), request)
assert.Nil(t, err)
- assert.Equal(t, resp.Result, voltha.TestResponse_SUCCESS)
+ assert.Equal(t, resp.Result, omci.TestResponse_SUCCESS)
//Remove the device
err = cleanUpDevices(nb.maxTimeout, nbi, oltDevice.Id, false)
diff --git a/rw_core/test/utils.go b/rw_core/test/utils.go
index 8890295..d86ecff 100644
--- a/rw_core/test/utils.go
+++ b/rw_core/test/utils.go
@@ -28,7 +28,7 @@
"testing"
"time"
- ic "github.com/opencord/voltha-protos/v5/go/inter_container"
+ ca "github.com/opencord/voltha-protos/v5/go/core_adapter"
"math/rand"
@@ -226,7 +226,7 @@
coreClient, err := onuAdapter.GetCoreClient()
assert.Nil(t, err)
assert.NotNil(t, coreClient)
- if _, err := coreClient.RegisterAdapter(ctx, &ic.AdapterRegistration{
+ if _, err := coreClient.RegisterAdapter(ctx, &ca.AdapterRegistration{
Adapter: adapterToRegister,
DTypes: deviceTypes}); err != nil {
logger.Errorw(ctx, "failed-to-register-adapter", log.Fields{"error": err, "adapter": adapterToRegister.Id})
@@ -266,7 +266,7 @@
assert.Nil(t, err)
assert.NotNil(t, coreClient)
- if _, err := coreClient.RegisterAdapter(ctx, &ic.AdapterRegistration{
+ if _, err := coreClient.RegisterAdapter(ctx, &ca.AdapterRegistration{
Adapter: adapterToRegister,
DTypes: deviceTypes}); err != nil {
logger.Errorw(ctx, "failed-to-register-adapter", log.Fields{"error": err, "adapter": adapterToRegister.Id})