[VOL-2866] Removing NNI port before ofagent disconnection
Change-Id: Icb34e1ae0fdebb3495331134e1ed3f456f3cc9f5
diff --git a/rw_core/core/logical_device_manager.go b/rw_core/core/logical_device_manager.go
index af76258..f2554d6 100644
--- a/rw_core/core/logical_device_manager.go
+++ b/rw_core/core/logical_device_manager.go
@@ -98,6 +98,7 @@
// getLogicalDeviceAgent returns the logical device agent. If the device is not in memory then the device will
// be loaded from dB and a logical device agent created to managed it.
func (ldMgr *LogicalDeviceManager) getLogicalDeviceAgent(ctx context.Context, logicalDeviceID string) *LogicalDeviceAgent {
+ logger.Debugw("get-logical-device-agent", log.Fields{"logical-device-id": logicalDeviceID})
agent, ok := ldMgr.logicalDeviceAgents.Load(logicalDeviceID)
if ok {
lda := agent.(*LogicalDeviceAgent)
@@ -427,7 +428,7 @@
// deleteLogicalPort removes the logical port associated with a child device
func (ldMgr *LogicalDeviceManager) deleteLogicalPorts(ctx context.Context, deviceID string) error {
- logger.Debugw("deleting-logical-ports", log.Fields{"deviceId": deviceID})
+ logger.Debugw("deleting-logical-ports", log.Fields{"device-id": deviceID})
// Get logical port
ldID, err := ldMgr.getLogicalDeviceIDFromDeviceID(ctx, deviceID)
if err != nil {
@@ -435,11 +436,11 @@
}
if agent := ldMgr.getLogicalDeviceAgent(ctx, *ldID); agent != nil {
if err = agent.deleteLogicalPorts(ctx, deviceID); err != nil {
- logger.Warnw("deleteLogicalPorts-failed", log.Fields{"ldeviceId": *ldID})
+ logger.Warnw("delete-logical-ports-failed", log.Fields{"logical-device-id": *ldID})
return err
}
}
- logger.Debug("deleting-logical-port-ends")
+ logger.Debug("deleting-logical-ports-ends")
return nil
}