[VOL-4119] voltha-core incorrect args for Get-Onu-Image
Change-Id: Ibe99ab3956c1427584d5ba4f77693458342ad111
diff --git a/go.mod b/go.mod
index 4568788..d5e22f1 100644
--- a/go.mod
+++ b/go.mod
@@ -8,7 +8,7 @@
github.com/golang/mock v1.5.0
github.com/golang/protobuf v1.3.2
github.com/google/uuid v1.1.1
- github.com/opencord/voltha-lib-go/v4 v4.3.3
+ github.com/opencord/voltha-lib-go/v4 v4.3.4
github.com/opencord/voltha-protos/v4 v4.1.2
github.com/opentracing/opentracing-go v1.1.0
github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2
diff --git a/go.sum b/go.sum
index 018d27f..3a6e568 100644
--- a/go.sum
+++ b/go.sum
@@ -143,8 +143,8 @@
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/gomega v1.4.2 h1:3mYCb7aPxS/RU7TI1y4rkEn1oKmPRjNJLNEXgw7MH2I=
github.com/onsi/gomega v1.4.2/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/opencord/voltha-lib-go/v4 v4.3.3 h1:21r8Oh825Oqg8ud/3qiVSfVD2ylRr2aDrdwDkJFI21k=
-github.com/opencord/voltha-lib-go/v4 v4.3.3/go.mod h1:x0a7TxyzxPFaiewkbFiuy0+ftX5w4zeCRlFyyGZ4hhw=
+github.com/opencord/voltha-lib-go/v4 v4.3.4 h1:+v+d1EfvtUjtotnA7ONuHJpG3Dnwqf5HA1caQPHCCGs=
+github.com/opencord/voltha-lib-go/v4 v4.3.4/go.mod h1:x0a7TxyzxPFaiewkbFiuy0+ftX5w4zeCRlFyyGZ4hhw=
github.com/opencord/voltha-protos/v4 v4.1.2 h1:iK7rhQXBtd6H2UWqdCPLQchcoGn8XV8XcVI3CBzGDfg=
github.com/opencord/voltha-protos/v4 v4.1.2/go.mod h1:W/OIFIyvFh/C0vchRUuarIsMylEhzCRM9pNxLvkPtKc=
github.com/opentracing/opentracing-go v1.1.0 h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsqf19k25Ur8rU=
diff --git a/rw_core/core/device/agent_image.go b/rw_core/core/device/agent_image.go
index 94a8706..74a60c7 100644
--- a/rw_core/core/device/agent_image.go
+++ b/rw_core/core/device/agent_image.go
@@ -545,7 +545,7 @@
subCtx, cancel := context.WithTimeout(log.WithSpanFromContext(context.Background(), ctx), agent.defaultTimeout)
defer cancel()
subCtx = coreutils.WithRPCMetadataFromContext(subCtx, ctx)
- logger.Debugw(ctx, "get-onu-images", log.Fields{"device-id": agent.deviceID})
+ logger.Debug(ctx, "get-onu-images")
// Send the request to the adapter
ch, err := agent.adapterProxy.GetOnuImages(subCtx, cloned, id)
diff --git a/rw_core/core/device/remote/adapter_proxy.go b/rw_core/core/device/remote/adapter_proxy.go
index 1a187f8..71dedb3 100755
--- a/rw_core/core/device/remote/adapter_proxy.go
+++ b/rw_core/core/device/remote/adapter_proxy.go
@@ -590,14 +590,14 @@
}
func (ap *AdapterProxy) GetOnuImages(ctx context.Context, device *voltha.Device, id *common.ID) (chan *kafka.RpcResponse, error) {
- logger.Debugw(ctx, "get-onu-images", log.Fields{"device-id": device.Id})
+ logger.Debug(ctx, "get-onu-images")
rpc := "Get_onu_images"
toTopic, err := ap.getAdapterTopic(ctx, device.Id, device.Adapter)
if err != nil {
return nil, err
}
args := []*kafka.KVArg{
- {Key: "deviceId", Value: id},
+ {Key: "deviceId", Value: &ic.StrType{Val: id.Id}},
}
replyToTopic := ap.getCoreTopic()
return ap.sendRPC(ctx, rpc, toTopic, &replyToTopic, true, device.Id, args...)
diff --git a/vendor/github.com/opencord/voltha-lib-go/v4/pkg/adapters/common/request_handler.go b/vendor/github.com/opencord/voltha-lib-go/v4/pkg/adapters/common/request_handler.go
index 020e799..b6cf1c0 100644
--- a/vendor/github.com/opencord/voltha-lib-go/v4/pkg/adapters/common/request_handler.go
+++ b/vendor/github.com/opencord/voltha-lib-go/v4/pkg/adapters/common/request_handler.go
@@ -852,8 +852,6 @@
logger.Warnw(ctx, "cannot-unmarshal-device", log.Fields{"error": err})
return nil, err
}
- default:
- return nil, errors.New("invalid argument")
}
}
return &deviceDownloadImageReq, nil
@@ -875,8 +873,6 @@
logger.Warnw(ctx, "cannot-unmarshal-device", log.Fields{"error": err})
return nil, err
}
- default:
- return nil, errors.New("invalid argument")
}
}
return &deviceImageReq, nil
@@ -894,10 +890,13 @@
logger.Warnw(ctx, "cannot-unmarshal-device", log.Fields{"error": err})
return "", err
}
- default:
- return "", errors.New("invalid argument")
}
}
+
+ if deviceId.Val == "" {
+ return "", errors.New("invalid argument")
+ }
+
return deviceId.Val, nil
}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index fb81c26..3a56990 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -93,7 +93,7 @@
github.com/modern-go/concurrent
# github.com/modern-go/reflect2 v1.0.1
github.com/modern-go/reflect2
-# github.com/opencord/voltha-lib-go/v4 v4.3.3
+# github.com/opencord/voltha-lib-go/v4 v4.3.4
## explicit
github.com/opencord/voltha-lib-go/v4/pkg/adapters
github.com/opencord/voltha-lib-go/v4/pkg/adapters/adapterif