Adding flow info to error messages
Change-Id: Iadddc9a7f12dcebdb775bdcc9922259fc654693d
diff --git a/rw_core/core/device/logical_agent_flow.go b/rw_core/core/device/logical_agent_flow.go
index ff0f6e1..92ba4a2 100644
--- a/rw_core/core/device/logical_agent_flow.go
+++ b/rw_core/core/device/logical_agent_flow.go
@@ -208,13 +208,17 @@
}
// Update the devices
- respChnls := agent.deleteFlowsAndGroupsFromDevices(deviceRules, metadata)
+ respChnls := agent.deleteFlowsAndGroupsFromDevices(deviceRules, metadata, mod)
// Wait for the responses
go func() {
// Since this action is taken following an add failure, we may also receive a failure for the revert
if res := coreutils.WaitForNilOrErrorResponses(agent.defaultTimeout, respChnls...); res != nil {
- logger.Warnw("failure-reverting-added-flows", log.Fields{"logicalDeviceId": agent.logicalDeviceID, "errors": res})
+ logger.Warnw("failure-reverting-added-flows", log.Fields{
+ "logical-device-id": agent.logicalDeviceID,
+ "flow-cookie": mod.Cookie,
+ "errors": res,
+ })
}
}()
@@ -306,9 +310,9 @@
// Update the devices
if partialRoute {
- respChnls = agent.deleteFlowsFromParentDevice(toDelete, toMetadata(metersConfig))
+ respChnls = agent.deleteFlowsFromParentDevice(toDelete, toMetadata(metersConfig), mod)
} else {
- respChnls = agent.deleteFlowsAndGroupsFromDevices(deviceRules, toMetadata(metersConfig))
+ respChnls = agent.deleteFlowsAndGroupsFromDevices(deviceRules, toMetadata(metersConfig), mod)
}
// Wait for the responses
@@ -381,15 +385,19 @@
}
// Update the devices
if partialRoute {
- respChnls = agent.deleteFlowsFromParentDevice(flowsToDelete, toMetadata(flowMetadata))
+ respChnls = agent.deleteFlowsFromParentDevice(flowsToDelete, toMetadata(flowMetadata), mod)
} else {
- respChnls = agent.deleteFlowsAndGroupsFromDevices(deviceRules, toMetadata(flowMetadata))
+ respChnls = agent.deleteFlowsAndGroupsFromDevices(deviceRules, toMetadata(flowMetadata), mod)
}
// Wait for completion
go func() {
if res := coreutils.WaitForNilOrErrorResponses(agent.defaultTimeout, respChnls...); res != nil {
- logger.Warnw("failure-deleting-device-flows", log.Fields{"logicalDeviceId": agent.logicalDeviceID, "errors": res})
+ logger.Warnw("failure-deleting-device-flows", log.Fields{
+ "flow-cookie": mod.Cookie,
+ "logical-device-id": agent.logicalDeviceID,
+ "errors": res,
+ })
//TODO: Revert flow changes
}
}()