Use the correct app ID in the SoftRouterPipeline.
Change-Id: I9788aab39059792d1d64a9b59d46758f9742eed3
Showing
1 changed file
with
9 additions
and
9 deletions
| ... | @@ -15,13 +15,6 @@ | ... | @@ -15,13 +15,6 @@ |
| 15 | */ | 15 | */ |
| 16 | package org.onosproject.driver.pipeline; | 16 | package org.onosproject.driver.pipeline; |
| 17 | 17 | ||
| 18 | -import static org.slf4j.LoggerFactory.getLogger; | ||
| 19 | - | ||
| 20 | -import java.util.ArrayList; | ||
| 21 | -import java.util.Collection; | ||
| 22 | -import java.util.Collections; | ||
| 23 | -import java.util.concurrent.ConcurrentHashMap; | ||
| 24 | - | ||
| 25 | import org.onlab.osgi.ServiceDirectory; | 18 | import org.onlab.osgi.ServiceDirectory; |
| 26 | import org.onlab.packet.Ethernet; | 19 | import org.onlab.packet.Ethernet; |
| 27 | import org.onlab.packet.MacAddress; | 20 | import org.onlab.packet.MacAddress; |
| ... | @@ -57,8 +50,15 @@ import org.onosproject.net.flowobjective.ForwardingObjective; | ... | @@ -57,8 +50,15 @@ import org.onosproject.net.flowobjective.ForwardingObjective; |
| 57 | import org.onosproject.net.flowobjective.NextObjective; | 50 | import org.onosproject.net.flowobjective.NextObjective; |
| 58 | import org.onosproject.net.flowobjective.Objective; | 51 | import org.onosproject.net.flowobjective.Objective; |
| 59 | import org.onosproject.net.flowobjective.ObjectiveError; | 52 | import org.onosproject.net.flowobjective.ObjectiveError; |
| 60 | -import org.slf4j.Logger; | ||
| 61 | import org.onosproject.store.serializers.KryoNamespaces; | 53 | import org.onosproject.store.serializers.KryoNamespaces; |
| 54 | +import org.slf4j.Logger; | ||
| 55 | + | ||
| 56 | +import java.util.ArrayList; | ||
| 57 | +import java.util.Collection; | ||
| 58 | +import java.util.Collections; | ||
| 59 | +import java.util.concurrent.ConcurrentHashMap; | ||
| 60 | + | ||
| 61 | +import static org.slf4j.LoggerFactory.getLogger; | ||
| 62 | 62 | ||
| 63 | /** | 63 | /** |
| 64 | * Simple 2-Table Pipeline for Software/NPU based routers. This pipeline | 64 | * Simple 2-Table Pipeline for Software/NPU based routers. This pipeline |
| ... | @@ -100,7 +100,7 @@ public class SoftRouterPipeline extends AbstractHandlerBehaviour implements Pipe | ... | @@ -100,7 +100,7 @@ public class SoftRouterPipeline extends AbstractHandlerBehaviour implements Pipe |
| 100 | flowRuleService = serviceDirectory.get(FlowRuleService.class); | 100 | flowRuleService = serviceDirectory.get(FlowRuleService.class); |
| 101 | flowObjectiveStore = context.store(); | 101 | flowObjectiveStore = context.store(); |
| 102 | driverId = coreService.registerApplication( | 102 | driverId = coreService.registerApplication( |
| 103 | - "org.onosproject.driver.OVSCorsaPipeline"); | 103 | + "org.onosproject.driver.SoftRouterPipeline"); |
| 104 | filters = Collections.newSetFromMap(new ConcurrentHashMap<Filter, Boolean>()); | 104 | filters = Collections.newSetFromMap(new ConcurrentHashMap<Filter, Boolean>()); |
| 105 | pendingVersatiles = Collections.newSetFromMap( | 105 | pendingVersatiles = Collections.newSetFromMap( |
| 106 | new ConcurrentHashMap<ForwardingObjective, Boolean>()); | 106 | new ConcurrentHashMap<ForwardingObjective, Boolean>()); | ... | ... |
-
Please register or login to post a comment