mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-16 09:51:38 +02:00
Code Issues Projects Releases Wiki Activity

Move BandwidthCapacity out of resource pacakge

Browse Source 
Change-Id: I80b4ed484ea505092c45c78f89fbe065c09aab6c
(cherry picked from commit 086af1db475cf9182f8dba83e1b96038301e22fe)
This commit is contained in:
Sho SHIMIZU 2016-05-26 12:07:19 -07:00 committed by Gerrit Code Review
parent bee7bb198f
commit b6c63a3a20
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/newoptical/src/main/java/org/onosproject/newoptical/OpticalPathProvisioner.java
View File

@ -57,7 +57,7 @@ import org.onosproject.net.intent.OpticalConnectivityIntent;
import org.onosproject.net.link.LinkEvent; import org.onosproject.net.link.LinkEvent;
import org.onosproject.net.link.LinkListener; import org.onosproject.net.link.LinkListener;
import org.onosproject.net.link.LinkService; 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.ContinuousResource;
import org.onosproject.net.resource.Resource; import org.onosproject.net.resource.Resource;
import org.onosproject.net.resource.ResourceAllocation; import org.onosproject.net.resource.ResourceAllocation;

2
core/api/src/main/java/org/onosproject/net/resource/BandwidthCapacity.java → core/api/src/main/java/org/onosproject/net/config/basics/BandwidthCapacity.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.onosproject.net.resource; package org.onosproject.net.config.basics;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;

2
core/net/src/main/java/org/onosproject/net/resource/impl/ResourceDeviceListener.java
View File

@ -44,7 +44,7 @@ import org.onosproject.net.driver.DriverHandler;
import org.onosproject.net.driver.DriverService; import org.onosproject.net.driver.DriverService;
import org.onosproject.net.resource.DiscreteResource; import org.onosproject.net.resource.DiscreteResource;
import org.onosproject.net.resource.ResourceAdminService; 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.Resource;
import org.onosproject.net.resource.ResourceQueryService; import org.onosproject.net.resource.ResourceQueryService;
import org.onosproject.net.resource.Resources; import org.onosproject.net.resource.Resources;

2
core/net/src/main/java/org/onosproject/net/resource/impl/ResourceNetworkConfigListener.java
View File

@ -28,7 +28,7 @@ import org.onosproject.net.ConnectPoint;
import org.onosproject.net.config.NetworkConfigEvent; import org.onosproject.net.config.NetworkConfigEvent;
import org.onosproject.net.config.NetworkConfigListener; import org.onosproject.net.config.NetworkConfigListener;
import org.onosproject.net.config.NetworkConfigService; 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.ResourceAdminService;
import org.onosproject.net.resource.Resources; import org.onosproject.net.resource.Resources;
import org.slf4j.Logger; import org.slf4j.Logger;

2
core/net/src/main/java/org/onosproject/net/resource/impl/ResourceRegistrar.java
View File

@ -31,7 +31,7 @@ import org.onosproject.net.config.NetworkConfigRegistry;
import org.onosproject.net.device.DeviceListener; import org.onosproject.net.device.DeviceListener;
import org.onosproject.net.device.DeviceService; import org.onosproject.net.device.DeviceService;
import org.onosproject.net.driver.DriverService; 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.ResourceAdminService;
import org.onosproject.net.resource.ResourceService; import org.onosproject.net.resource.ResourceService;
import org.slf4j.Logger; import org.slf4j.Logger;

2
providers/bgp/topology/src/main/java/org/onosproject/provider/bgp/topology/impl/BgpTopologyProvider.java
View File

@ -74,6 +74,7 @@ import org.onosproject.net.Link;
import org.onosproject.net.MastershipRole; import org.onosproject.net.MastershipRole;
import org.onosproject.net.PortNumber; import org.onosproject.net.PortNumber;
import org.onosproject.net.config.NetworkConfigService; import org.onosproject.net.config.NetworkConfigService;
import org.onosproject.net.config.basics.BandwidthCapacity;
import org.onosproject.net.device.DefaultDeviceDescription; import org.onosproject.net.device.DefaultDeviceDescription;
import org.onosproject.net.device.DefaultPortDescription; import org.onosproject.net.device.DefaultPortDescription;
import org.onosproject.net.device.DeviceDescription; 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.link.LinkService;
import org.onosproject.net.provider.AbstractProvider; import org.onosproject.net.provider.AbstractProvider;
import org.onosproject.net.provider.ProviderId; import org.onosproject.net.provider.ProviderId;
import org.onosproject.net.resource.BandwidthCapacity;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

2
providers/bgp/topology/src/test/java/org/onosproject/provider/bgp/topology/impl/BgpTopologyProviderTest.java
View File

@ -81,6 +81,7 @@ import org.onosproject.net.config.Config;
import org.onosproject.net.config.ConfigApplyDelegate; import org.onosproject.net.config.ConfigApplyDelegate;
import org.onosproject.net.config.ConfigFactory; import org.onosproject.net.config.ConfigFactory;
import org.onosproject.net.config.NetworkConfigRegistryAdapter; import org.onosproject.net.config.NetworkConfigRegistryAdapter;
import org.onosproject.net.config.basics.BandwidthCapacity;
import org.onosproject.net.device.DeviceDescription; import org.onosproject.net.device.DeviceDescription;
import org.onosproject.net.device.DeviceProvider; import org.onosproject.net.device.DeviceProvider;
import org.onosproject.net.device.DeviceProviderRegistry; 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.LinkProviderRegistry;
import org.onosproject.net.link.LinkProviderService; import org.onosproject.net.link.LinkProviderService;
import org.onosproject.net.provider.ProviderId; import org.onosproject.net.provider.ProviderId;
import org.onosproject.net.resource.BandwidthCapacity;
import org.onosproject.net.resource.Resource; import org.onosproject.net.resource.Resource;
import org.onosproject.net.resource.ResourceAdminService; import org.onosproject.net.resource.ResourceAdminService;
import org.onosproject.net.resource.ResourceId; import org.onosproject.net.resource.ResourceId;