Fix for BAD-ACTION ONOS-4688 , BAD-MATCH ONOS-4755 and other flow-mod errors.

Change-Id: Icf1a4883da50354bcebdad4c1a9693285d4cf8b4

Fix for BAD-ACTION ONOS-4688 , BAD-MATCH ONOS-4755 and other flow-mod errors.
Change-Id: Icf1a4883da50354bcebdad4c1a9693285d4cf8b4
Prince Pereira
Commit aaff2927f0c4d67406d4694ca9ddc26c10df71d8 aaff2927 1 parent 272534a7
Showing 1 changed file with 41 additions and 11 deletions
providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/OpenFlowRuleProvider.java
--- a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/OpenFlowRuleProvider.java
View file @aaff292
+++ b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/OpenFlowRuleProvider.java
View file @aaff292
@@ -61,7 +61,6 @@ import org.osgi.service.component.ComponentContext;
 import org.projectfloodlight.openflow.protocol.OFBadRequestCode;
 import org.projectfloodlight.openflow.protocol.OFBarrierRequest;
 import org.projectfloodlight.openflow.protocol.OFErrorMsg;
-import org.projectfloodlight.openflow.protocol.OFErrorType;
 import org.projectfloodlight.openflow.protocol.OFFlowMod;
 import org.projectfloodlight.openflow.protocol.OFFlowRemoved;
 import org.projectfloodlight.openflow.protocol.OFFlowStatsReply;
@@ -71,6 +70,9 @@ import org.projectfloodlight.openflow.protocol.OFStatsReply;
 import org.projectfloodlight.openflow.protocol.OFStatsType;
 import org.projectfloodlight.openflow.protocol.OFTableStatsEntry;
 import org.projectfloodlight.openflow.protocol.OFTableStatsReply;
+import org.projectfloodlight.openflow.protocol.errormsg.OFBadActionErrorMsg;
+import org.projectfloodlight.openflow.protocol.errormsg.OFBadInstructionErrorMsg;
+import org.projectfloodlight.openflow.protocol.errormsg.OFBadMatchErrorMsg;
 import org.projectfloodlight.openflow.protocol.errormsg.OFBadRequestErrorMsg;
 import org.projectfloodlight.openflow.protocol.errormsg.OFFlowModFailedErrorMsg;
 import org.slf4j.Logger;
@@ -488,31 +490,59 @@ public class OpenFlowRuleProvider extends AbstractProvider
                     } else {
                         log.warn("Received error message {} from {}", msg, dpid);
                     }
+                    handleErrorMsg(deviceId, msg);
+                    break;
+                default:
+                    log.debug("Unhandled message type: {}", msg.getType());
+            }
+        }
+        private void handleErrorMsg(DeviceId deviceId, OFMessage msg) {
             OFErrorMsg error = (OFErrorMsg) msg;
-                    if (error.getErrType() == OFErrorType.FLOW_MOD_FAILED) {
+            OFMessage ofMessage = null;
+            switch (error.getErrType()) {
+                case BAD_ACTION:
+                    OFBadActionErrorMsg baErrorMsg = (OFBadActionErrorMsg) error;
+                    if (baErrorMsg.getData().getParsedMessage().isPresent()) {
+                        ofMessage = baErrorMsg.getData().getParsedMessage().get();
+                    }
+                    break;
+                case BAD_INSTRUCTION:
+                    OFBadInstructionErrorMsg biErrorMsg = (OFBadInstructionErrorMsg) error;
+                    if (biErrorMsg.getData().getParsedMessage().isPresent()) {
+                        ofMessage = biErrorMsg.getData().getParsedMessage().get();
+                    }
+                    break;
+                case BAD_MATCH:
+                    OFBadMatchErrorMsg bmErrorMsg = (OFBadMatchErrorMsg) error;
+                    if (bmErrorMsg.getData().getParsedMessage().isPresent()) {
+                        ofMessage = bmErrorMsg.getData().getParsedMessage().get();
+                    }
+                    break;
+                case FLOW_MOD_FAILED:
                     OFFlowModFailedErrorMsg fmFailed = (OFFlowModFailedErrorMsg) error;
                     if (fmFailed.getData().getParsedMessage().isPresent()) {
-                            OFMessage m = fmFailed.getData().getParsedMessage().get();
+                        ofMessage = fmFailed.getData().getParsedMessage().get();
-                            OFFlowMod fm = (OFFlowMod) m;
+                    }
+                    break;
+                default:
+                    // Do nothing.
+                    return;
+                }
+                if (ofMessage != null) {
                     InternalCacheEntry entry =
                         pendingBatches.getIfPresent(msg.getXid());
                     if (entry != null)  {
-                                entry.appendFailure(new FlowEntryBuilder(deviceId, fm, driverService).build());
+                        OFFlowMod ofFlowMod = (OFFlowMod) ofMessage;
+                        entry.appendFailure(new FlowEntryBuilder(deviceId, ofFlowMod, driverService).build());
                     } else {
                       log.error("No matching batch for this error: {}", error);
                     }
                 } else {
-                            // FIXME: Potentially add flowtracking to avoid this message.
                     log.error("Flow installation failed but switch didn't"
                                 + " tell us which one.");
                 }
         }
-                    break;
-                default:
-                    log.debug("Unhandled message type: {}", msg.getType());
-            }
-        }
         @Override
         public void receivedRoleReply(Dpid dpid, RoleState requested,