[VOL-1950] Fixed exception on Disable of Invalid Logical Device port
Change-Id: I3e3aa4cd402de6152cb7f5f0104e2a9feef2bf51
diff --git a/rw_core/core/logical_device_manager.go b/rw_core/core/logical_device_manager.go
index ac4a5e2..b3ccd11 100644
--- a/rw_core/core/logical_device_manager.go
+++ b/rw_core/core/logical_device_manager.go
@@ -550,15 +550,9 @@
func (ldMgr *LogicalDeviceManager) enableLogicalPort(ctx context.Context, id *voltha.LogicalPortId, ch chan interface{}) {
log.Debugw("enableLogicalPort", log.Fields{"logicalDeviceId": id})
var res interface{}
- // Get logical port
- var logicalPort *voltha.LogicalPort
- var err error
- if logicalPort, err = ldMgr.getLogicalPort(id); err != nil {
- log.Debugw("no-logical-device-port-present", log.Fields{"logicalPortId": id.PortId})
- res = err
- }
+
if agent := ldMgr.getLogicalDeviceAgent(id.Id); agent != nil {
- res = agent.enableLogicalPort(logicalPort)
+ res = agent.enableLogicalPort(id.PortId)
log.Debugw("enableLogicalPort-result", log.Fields{"result": res})
} else {
res = status.Errorf(codes.NotFound, "%s", id.Id)
@@ -569,15 +563,9 @@
func (ldMgr *LogicalDeviceManager) disableLogicalPort(ctx context.Context, id *voltha.LogicalPortId, ch chan interface{}) {
log.Debugw("disableLogicalPort", log.Fields{"logicalDeviceId": id})
var res interface{}
- // Get logical port
- var logicalPort *voltha.LogicalPort
- var err error
- if logicalPort, err = ldMgr.getLogicalPort(id); err != nil {
- log.Debugw("no-logical-device-port-present", log.Fields{"logicalPortId": id.PortId})
- res = err
- }
+
if agent := ldMgr.getLogicalDeviceAgent(id.Id); agent != nil {
- res = agent.disableLogicalPort(logicalPort)
+ res = agent.disableLogicalPort(id.PortId)
log.Debugw("disableLogicalPort-result", log.Fields{"result": res})
} else {
res = status.Errorf(codes.NotFound, "%s", id.Id)