commit d175194107bed35d91155349ffd5efd898390db6
author Ray Milkey <ray@opennetworking.org> Tue Nov 13 13:32:10 2018 -0800
committer Ray Milkey <ray@opennetworking.org> Tue Nov 13 22:03:24 2018 +0000
tree ec7cb1b426cf3535696bc4666866a3f5581b729d
parent a0c5dc1aabf8a3be5664f33ad1376af415c93fe5

Fix for ONOS-7840 - Flows stuck in PENDING_ADD state

Revert change to how app IDs are handled in the packet manager.
The change cause the HostLocationManager and the NeighbourResolutionManager
to fight over ARP packets

Change-Id: Ie7a276775d86c95a3f8be94ce5857e3d0058bb49

core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java

diff --git a/core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java b/core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java
index 78dd986..ff63efe 100644
--- a/core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java
+++ b/core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java
@@ -345,7 +345,6 @@
     }
 
     private DefaultForwardingObjective.Builder createBuilder(PacketRequest request) {
-        ApplicationId requestedAppId = coreService.getAppId(request.appId().name()); // Validate app id
         TrafficTreatment treatment = DefaultTrafficTreatment.builder()
                 .punt()
                 .wipeDeferred()
@@ -354,7 +353,7 @@
         return DefaultForwardingObjective.builder()
                 .withPriority(request.priority().priorityValue())
                 .withSelector(request.selector())
-                .fromApp(requestedAppId == null ? appId : requestedAppId)
+                .fromApp(appId)
                 .withFlag(ForwardingObjective.Flag.VERSATILE)
                 .withTreatment(treatment)
                 .makePermanent();