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/net/src/main/java/org/onlab/onos/net/intent/impl/LinkCollectionIntentInstaller.java b/core/net/src/main/java/org/onlab/onos/net/intent/impl/LinkCollectionIntentInstaller.java index 2983a68..93c6345 100644 --- a/core/net/src/main/java/org/onlab/onos/net/intent/impl/LinkCollectionIntentInstaller.java +++ b/core/net/src/main/java/org/onlab/onos/net/intent/impl/LinkCollectionIntentInstaller.java
@@ -9,8 +9,8 @@ import org.apache.felix.scr.annotations.Deactivate; import org.apache.felix.scr.annotations.Reference; import org.apache.felix.scr.annotations.ReferenceCardinality; -import org.onlab.onos.ApplicationId; -import org.onlab.onos.CoreService; +import org.onlab.onos.core.ApplicationId; +import org.onlab.onos.core.CoreService; import org.onlab.onos.net.DeviceId; import org.onlab.onos.net.Link; import org.onlab.onos.net.PortNumber;
diff --git a/core/net/src/main/java/org/onlab/onos/net/intent/impl/OpticalConnectivityIntentCompiler.java b/core/net/src/main/java/org/onlab/onos/net/intent/impl/OpticalConnectivityIntentCompiler.java index 8fcf75b..c19bba0 100644 --- a/core/net/src/main/java/org/onlab/onos/net/intent/impl/OpticalConnectivityIntentCompiler.java +++ b/core/net/src/main/java/org/onlab/onos/net/intent/impl/OpticalConnectivityIntentCompiler.java
@@ -12,7 +12,7 @@ import org.apache.felix.scr.annotations.Deactivate; import org.apache.felix.scr.annotations.Reference; import org.apache.felix.scr.annotations.ReferenceCardinality; -import org.onlab.onos.CoreService; +import org.onlab.onos.core.CoreService; import org.onlab.onos.net.ConnectPoint; import org.onlab.onos.net.Link; import org.onlab.onos.net.Path;
diff --git a/core/net/src/main/java/org/onlab/onos/net/intent/impl/OpticalPathIntentInstaller.java b/core/net/src/main/java/org/onlab/onos/net/intent/impl/OpticalPathIntentInstaller.java index 5557b05..a504992 100644 --- a/core/net/src/main/java/org/onlab/onos/net/intent/impl/OpticalPathIntentInstaller.java +++ b/core/net/src/main/java/org/onlab/onos/net/intent/impl/OpticalPathIntentInstaller.java
@@ -10,8 +10,8 @@ import org.apache.felix.scr.annotations.Deactivate; import org.apache.felix.scr.annotations.Reference; import org.apache.felix.scr.annotations.ReferenceCardinality; -import org.onlab.onos.ApplicationId; -import org.onlab.onos.CoreService; +import org.onlab.onos.core.ApplicationId; +import org.onlab.onos.core.CoreService; import org.onlab.onos.net.ConnectPoint; import org.onlab.onos.net.Link; import org.onlab.onos.net.flow.DefaultFlowRule;
diff --git a/core/net/src/main/java/org/onlab/onos/net/intent/impl/PathIntentInstaller.java b/core/net/src/main/java/org/onlab/onos/net/intent/impl/PathIntentInstaller.java index a7381b7..84e2c7c 100644 --- a/core/net/src/main/java/org/onlab/onos/net/intent/impl/PathIntentInstaller.java +++ b/core/net/src/main/java/org/onlab/onos/net/intent/impl/PathIntentInstaller.java
@@ -11,8 +11,8 @@ import org.apache.felix.scr.annotations.Deactivate; import org.apache.felix.scr.annotations.Reference; import org.apache.felix.scr.annotations.ReferenceCardinality; -import org.onlab.onos.ApplicationId; -import org.onlab.onos.CoreService; +import org.onlab.onos.core.ApplicationId; +import org.onlab.onos.core.CoreService; import org.onlab.onos.net.ConnectPoint; import org.onlab.onos.net.Link; import org.onlab.onos.net.flow.DefaultFlowRule;