commit 96892d1e092a20ccce0f53b2681a329db8ddc7f9
author Jonathan Hart <jono@onlab.us> Wed Mar 26 20:21:29 2014 -0700
committer Jonathan Hart <jono@onlab.us> Thu Mar 27 14:12:29 2014 -0700
tree 2eee51044c0595bad23e76931d5704f9e5c65d76
parent 4a9428b1b1dd6a2786de8c2678db17d9f04b35a2

Pulled packet libraries into the ONOS namespace

Change-Id: Id16d1a8f4cae5de7b6aaa4536f2ba37a878d8d48

src/test/java/net/floodlightcontroller/core/internal/ControllerTest.java

diff --git a/src/test/java/net/floodlightcontroller/core/internal/ControllerTest.java b/src/test/java/net/floodlightcontroller/core/internal/ControllerTest.java
index 9c7b820..a0dc06b 100644
--- a/src/test/java/net/floodlightcontroller/core/internal/ControllerTest.java
+++ b/src/test/java/net/floodlightcontroller/core/internal/ControllerTest.java
@@ -51,10 +51,6 @@
 import net.floodlightcontroller.core.internal.OFChannelState.HandshakeState;
 import net.floodlightcontroller.core.module.FloodlightModuleContext;
 import net.floodlightcontroller.core.test.MockThreadPoolService;
-import net.floodlightcontroller.packet.ARP;
-import net.floodlightcontroller.packet.Ethernet;
-import net.floodlightcontroller.packet.IPacket;
-import net.floodlightcontroller.packet.IPv4;
 import net.floodlightcontroller.restserver.IRestApiService;
 import net.floodlightcontroller.restserver.RestApiServer;
 import net.floodlightcontroller.test.FloodlightTestCase;
@@ -62,6 +58,10 @@
 import net.onrc.onos.ofcontroller.core.IOFSwitchPortListener;
 import net.onrc.onos.ofcontroller.linkdiscovery.ILinkDiscoveryService;
 import net.onrc.onos.ofcontroller.linkdiscovery.internal.LinkDiscoveryManager;
+import net.onrc.onos.packet.ARP;
+import net.onrc.onos.packet.Ethernet;
+import net.onrc.onos.packet.IPacket;
+import net.onrc.onos.packet.IPv4;
 import net.onrc.onos.registry.controller.IControllerRegistryService;
 import net.onrc.onos.registry.controller.StandaloneRegistry;