diff --git a/apps/newoptical/src/main/java/org/onosproject/newoptical/OpticalPathProvisioner.java b/apps/newoptical/src/main/java/org/onosproject/newoptical/OpticalPathProvisioner.java index a2c5bf38ab..775eb511ab 100644 --- a/apps/newoptical/src/main/java/org/onosproject/newoptical/OpticalPathProvisioner.java +++ b/apps/newoptical/src/main/java/org/onosproject/newoptical/OpticalPathProvisioner.java @@ -57,7 +57,7 @@ import org.onosproject.net.intent.OpticalConnectivityIntent; import org.onosproject.net.link.LinkEvent; import org.onosproject.net.link.LinkListener; import org.onosproject.net.link.LinkService; -import org.onosproject.net.resource.BandwidthCapacity; +import org.onosproject.net.config.basics.BandwidthCapacity; import org.onosproject.net.resource.ContinuousResource; import org.onosproject.net.resource.Resource; import org.onosproject.net.resource.ResourceAllocation; 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 97bdea46fa..f9f7b3cdeb 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 a15083e56d..4cd524563e 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.DriverHandler; 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 a75da25745..93ce320b43 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.ConnectPoint; 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 11cfdcca28..d82bb0fad9 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.config.NetworkConfigRegistry; 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; diff --git a/providers/bgp/topology/src/main/java/org/onosproject/provider/bgp/topology/impl/BgpTopologyProvider.java b/providers/bgp/topology/src/main/java/org/onosproject/provider/bgp/topology/impl/BgpTopologyProvider.java index 0d1d1ea13c..118bfe36e0 100644 --- a/providers/bgp/topology/src/main/java/org/onosproject/provider/bgp/topology/impl/BgpTopologyProvider.java +++ b/providers/bgp/topology/src/main/java/org/onosproject/provider/bgp/topology/impl/BgpTopologyProvider.java @@ -74,6 +74,7 @@ import org.onosproject.net.Link; import org.onosproject.net.MastershipRole; import org.onosproject.net.PortNumber; import org.onosproject.net.config.NetworkConfigService; +import org.onosproject.net.config.basics.BandwidthCapacity; import org.onosproject.net.device.DefaultDeviceDescription; import org.onosproject.net.device.DefaultPortDescription; import org.onosproject.net.device.DeviceDescription; @@ -90,7 +91,6 @@ import org.onosproject.net.link.LinkProviderService; import org.onosproject.net.link.LinkService; import org.onosproject.net.provider.AbstractProvider; import org.onosproject.net.provider.ProviderId; -import org.onosproject.net.resource.BandwidthCapacity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/providers/bgp/topology/src/test/java/org/onosproject/provider/bgp/topology/impl/BgpTopologyProviderTest.java b/providers/bgp/topology/src/test/java/org/onosproject/provider/bgp/topology/impl/BgpTopologyProviderTest.java index 6206ac1666..276bfb56d2 100644 --- a/providers/bgp/topology/src/test/java/org/onosproject/provider/bgp/topology/impl/BgpTopologyProviderTest.java +++ b/providers/bgp/topology/src/test/java/org/onosproject/provider/bgp/topology/impl/BgpTopologyProviderTest.java @@ -81,6 +81,7 @@ import org.onosproject.net.config.Config; import org.onosproject.net.config.ConfigApplyDelegate; import org.onosproject.net.config.ConfigFactory; import org.onosproject.net.config.NetworkConfigRegistryAdapter; +import org.onosproject.net.config.basics.BandwidthCapacity; import org.onosproject.net.device.DeviceDescription; import org.onosproject.net.device.DeviceProvider; import org.onosproject.net.device.DeviceProviderRegistry; @@ -93,7 +94,6 @@ import org.onosproject.net.link.LinkProvider; import org.onosproject.net.link.LinkProviderRegistry; import org.onosproject.net.link.LinkProviderService; import org.onosproject.net.provider.ProviderId; -import org.onosproject.net.resource.BandwidthCapacity; import org.onosproject.net.resource.Resource; import org.onosproject.net.resource.ResourceAdminService; import org.onosproject.net.resource.ResourceId;