commit c78b8f6379c7b3ec7aeed40046201be9ac491c38
author Jonathan Hart <jono@onlab.us> Thu Aug 07 22:31:09 2014 -0700
committer Jonathan Hart <jono@onlab.us> Fri Aug 08 16:26:56 2014 -0700
tree e604691da9706aa3b6afc4695df05426600c1a28
parent c67f9fa0dd67f9476bcae810fac71f7f6de5619b

Removed the old openflowj protocol library

Change-Id: I4fcd0399c6eb0d9089116e365b55505042ded1fc

src/test/java/net/onrc/onos/core/registry/StandaloneRegistryTest.java

diff --git a/src/test/java/net/onrc/onos/core/registry/StandaloneRegistryTest.java b/src/test/java/net/onrc/onos/core/registry/StandaloneRegistryTest.java
index 88a1177..79cc0e8 100644
--- a/src/test/java/net/onrc/onos/core/registry/StandaloneRegistryTest.java
+++ b/src/test/java/net/onrc/onos/core/registry/StandaloneRegistryTest.java
@@ -24,7 +24,7 @@
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.openflow.util.HexString;
+import org.projectfloodlight.openflow.util.HexString;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/test/java/net/onrc/onos/core/registry/ZookeeperRegistryTest.java

diff --git a/src/test/java/net/onrc/onos/core/registry/ZookeeperRegistryTest.java b/src/test/java/net/onrc/onos/core/registry/ZookeeperRegistryTest.java
index 5490162..3ac2c96 100644
--- a/src/test/java/net/onrc/onos/core/registry/ZookeeperRegistryTest.java
+++ b/src/test/java/net/onrc/onos/core/registry/ZookeeperRegistryTest.java
@@ -35,10 +35,10 @@
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.openflow.util.HexString;
 import org.powermock.api.easymock.PowerMock;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
+import org.projectfloodlight.openflow.util.HexString;
 
 /**
  * Unit test for {@link ZookeeperRegistry}.

src/test/java/net/onrc/onos/core/util/FlowEntryActionTest.java

diff --git a/src/test/java/net/onrc/onos/core/util/FlowEntryActionTest.java b/src/test/java/net/onrc/onos/core/util/FlowEntryActionTest.java
index 7048697..fbba92c 100644
--- a/src/test/java/net/onrc/onos/core/util/FlowEntryActionTest.java
+++ b/src/test/java/net/onrc/onos/core/util/FlowEntryActionTest.java
@@ -13,7 +13,7 @@
 import net.onrc.onos.core.util.FlowEntryAction.ActionStripVlan;
 
 import org.junit.Test;
-import org.openflow.protocol.OFPort;
+import org.projectfloodlight.openflow.types.OFPort;
 
 public class FlowEntryActionTest {
 
@@ -56,7 +56,7 @@
         act.setActionOutputToController((short) 0);
 
         FlowEntryAction actCopy = new FlowEntryAction();
-        actCopy.setActionOutput(new PortNumber(OFPort.OFPP_CONTROLLER.getValue()));
+        actCopy.setActionOutput(new PortNumber(OFPort.CONTROLLER.getShortPortNumber()));
 
         FlowEntryAction actCopy2 = new FlowEntryAction(act.toString());