commit | e0f804aa3fd47d6a0ac9839cc8a4a2ccbbf38789 | [log] [tgz] |
---|---|---|
author | Thomas Vachuska <tom@onlab.us> | Mon Oct 27 23:40:48 2014 -0700 |
committer | Thomas Vachuska <tom@onlab.us> | Mon Oct 27 23:40:48 2014 -0700 |
tree | 9b8030d7c91af6a2fefed0758367e23234a1ec8a | |
parent | 92891d1c2094d86d55b83cf704d49b806c27ba9c [diff] |
Added application ID store; both trivial and distributed variants.
diff --git a/core/api/src/test/java/org/onlab/onos/TestApplicationId.java b/core/api/src/test/java/org/onlab/onos/TestApplicationId.java index e8c0304..cb16219 100644 --- a/core/api/src/test/java/org/onlab/onos/TestApplicationId.java +++ b/core/api/src/test/java/org/onlab/onos/TestApplicationId.java
@@ -1,5 +1,7 @@ package org.onlab.onos; +import org.onlab.onos.core.ApplicationId; + import java.util.Objects; /**
diff --git a/core/api/src/test/java/org/onlab/onos/VersionTest.java b/core/api/src/test/java/org/onlab/onos/VersionTest.java index e357f9d..14b69d7 100644 --- a/core/api/src/test/java/org/onlab/onos/VersionTest.java +++ b/core/api/src/test/java/org/onlab/onos/VersionTest.java
@@ -2,9 +2,10 @@ import com.google.common.testing.EqualsTester; import org.junit.Test; +import org.onlab.onos.core.Version; import static org.junit.Assert.*; -import static org.onlab.onos.Version.version; +import static org.onlab.onos.core.Version.version; /** * Tests of the version descriptor.
diff --git a/core/api/src/test/java/org/onlab/onos/net/intent/ConnectivityIntentTest.java b/core/api/src/test/java/org/onlab/onos/net/intent/ConnectivityIntentTest.java index 03b101a..3d92e87 100644 --- a/core/api/src/test/java/org/onlab/onos/net/intent/ConnectivityIntentTest.java +++ b/core/api/src/test/java/org/onlab/onos/net/intent/ConnectivityIntentTest.java
@@ -2,7 +2,7 @@ import java.util.Set; -import org.onlab.onos.ApplicationId; +import org.onlab.onos.core.ApplicationId; import org.onlab.onos.TestApplicationId; import org.onlab.onos.net.ConnectPoint; import org.onlab.onos.net.DeviceId;