commit | b6c63a3a20dd71946f450fca08d1ab4d300823cc | [log] [tgz] |
---|---|---|
author | Sho SHIMIZU <sshimizu@us.fujitsu.com> | Thu May 26 12:07:19 2016 -0700 |
committer | Gerrit Code Review <gerrit@onlab.us> | Sat Jun 04 20:31:47 2016 +0000 |
tree | 7f5034b5ce11f0097117b62a69bea8da9480e1f0 | |
parent | bee7bb198f239342d291e886279b8847b6b3fbcb [diff] |
Move BandwidthCapacity out of resource pacakge Change-Id: I80b4ed484ea505092c45c78f89fbe065c09aab6c (cherry picked from commit 086af1db475cf9182f8dba83e1b96038301e22fe)
diff --git a/core/api/src/main/java/org/onosproject/net/resource/BandwidthCapacity.java b/core/api/src/main/java/org/onosproject/net/config/basics/BandwidthCapacity.java similarity index 98% rename from core/api/src/main/java/org/onosproject/net/resource/BandwidthCapacity.java rename to core/api/src/main/java/org/onosproject/net/config/basics/BandwidthCapacity.java index 97bdea4..f9f7b3c 100644 --- a/core/api/src/main/java/org/onosproject/net/resource/BandwidthCapacity.java +++ b/core/api/src/main/java/org/onosproject/net/config/basics/BandwidthCapacity.java
@@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.onosproject.net.resource; +package org.onosproject.net.config.basics; import static com.google.common.base.Preconditions.checkNotNull;
diff --git a/core/net/src/main/java/org/onosproject/net/resource/impl/ResourceDeviceListener.java b/core/net/src/main/java/org/onosproject/net/resource/impl/ResourceDeviceListener.java index a15083e..4cd5245 100644 --- a/core/net/src/main/java/org/onosproject/net/resource/impl/ResourceDeviceListener.java +++ b/core/net/src/main/java/org/onosproject/net/resource/impl/ResourceDeviceListener.java
@@ -44,7 +44,7 @@ import org.onosproject.net.driver.DriverService; import org.onosproject.net.resource.DiscreteResource; import org.onosproject.net.resource.ResourceAdminService; -import org.onosproject.net.resource.BandwidthCapacity; +import org.onosproject.net.config.basics.BandwidthCapacity; import org.onosproject.net.resource.Resource; import org.onosproject.net.resource.ResourceQueryService; import org.onosproject.net.resource.Resources;
diff --git a/core/net/src/main/java/org/onosproject/net/resource/impl/ResourceNetworkConfigListener.java b/core/net/src/main/java/org/onosproject/net/resource/impl/ResourceNetworkConfigListener.java index a75da25..93ce320 100644 --- a/core/net/src/main/java/org/onosproject/net/resource/impl/ResourceNetworkConfigListener.java +++ b/core/net/src/main/java/org/onosproject/net/resource/impl/ResourceNetworkConfigListener.java
@@ -28,7 +28,7 @@ import org.onosproject.net.config.NetworkConfigEvent; import org.onosproject.net.config.NetworkConfigListener; import org.onosproject.net.config.NetworkConfigService; -import org.onosproject.net.resource.BandwidthCapacity; +import org.onosproject.net.config.basics.BandwidthCapacity; import org.onosproject.net.resource.ResourceAdminService; import org.onosproject.net.resource.Resources; import org.slf4j.Logger;
diff --git a/core/net/src/main/java/org/onosproject/net/resource/impl/ResourceRegistrar.java b/core/net/src/main/java/org/onosproject/net/resource/impl/ResourceRegistrar.java index 11cfdcc..d82bb0f 100644 --- a/core/net/src/main/java/org/onosproject/net/resource/impl/ResourceRegistrar.java +++ b/core/net/src/main/java/org/onosproject/net/resource/impl/ResourceRegistrar.java
@@ -31,7 +31,7 @@ import org.onosproject.net.device.DeviceListener; import org.onosproject.net.device.DeviceService; import org.onosproject.net.driver.DriverService; -import org.onosproject.net.resource.BandwidthCapacity; +import org.onosproject.net.config.basics.BandwidthCapacity; import org.onosproject.net.resource.ResourceAdminService; import org.onosproject.net.resource.ResourceService; import org.slf4j.Logger;