diff options
author | Ashlee Young <ashlee@wildernessvoice.com> | 2015-11-13 17:25:44 -0800 |
---|---|---|
committer | Ashlee Young <ashlee@wildernessvoice.com> | 2015-11-13 17:25:44 -0800 |
commit | 55d4a1b251e1b2e36b9036b3d0b033abc38acbec (patch) | |
tree | 6a30cb799a042a1a93d834f74b758f4c41a94ab4 /framework/src/onos/apps/optical | |
parent | e5df26295703f2f8f5f9b9ee406407a5684b8122 (diff) |
ONOS commit d9df7bd278935c3d72ac6eeb0ff44efe1edde567
Change-Id: I319f3a3765db55034b894238fb9391eee56c6dd4
Signed-off-by: Ashlee Young <ashlee@wildernessvoice.com>
Diffstat (limited to 'framework/src/onos/apps/optical')
-rw-r--r-- | framework/src/onos/apps/optical/src/main/java/org/onosproject/optical/testapp/MplsForwarding.java (renamed from framework/src/onos/apps/optical/src/main/java/org/onosproject/optical/testapp/MPLSForwarding.java) | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/framework/src/onos/apps/optical/src/main/java/org/onosproject/optical/testapp/MPLSForwarding.java b/framework/src/onos/apps/optical/src/main/java/org/onosproject/optical/testapp/MplsForwarding.java index c784c82f..b9a4b0ca 100644 --- a/framework/src/onos/apps/optical/src/main/java/org/onosproject/optical/testapp/MPLSForwarding.java +++ b/framework/src/onos/apps/optical/src/main/java/org/onosproject/optical/testapp/MplsForwarding.java @@ -15,15 +15,12 @@ */ package org.onosproject.optical.testapp; -import static org.slf4j.LoggerFactory.getLogger; - -import java.util.HashMap; -import java.util.Map; - import org.apache.felix.scr.annotations.Activate; import org.apache.felix.scr.annotations.Deactivate; import org.apache.felix.scr.annotations.Reference; import org.apache.felix.scr.annotations.ReferenceCardinality; +import org.onlab.packet.Ethernet; +import org.onlab.packet.MplsLabel; import org.onosproject.core.ApplicationId; import org.onosproject.core.CoreService; import org.onosproject.net.Device; @@ -39,15 +36,18 @@ import org.onosproject.net.flow.FlowRule; import org.onosproject.net.flow.FlowRuleService; import org.onosproject.net.flow.TrafficSelector; import org.onosproject.net.flow.TrafficTreatment; -import org.onlab.packet.Ethernet; -import org.onlab.packet.MplsLabel; import org.slf4j.Logger; +import java.util.HashMap; +import java.util.Map; + +import static org.slf4j.LoggerFactory.getLogger; + /** * Sample reactive forwarding application. */ //@Component(immediate = true) -public class MPLSForwarding { +public class MplsForwarding { private final Logger log = getLogger(getClass()); |