홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Sho SHIMIZU
Committed by Gerrit Code Review
b6c63a3a 1 parent bee7bb19

Move BandwidthCapacity out of resource pacakge 

Change-Id: I80b4ed484ea505092c45c78f89fbe065c09aab6c
(cherry picked from commit 086af1db)
Inline Side-by-side
Showing 7 changed files with 7 additions and 7 deletions
...@@ -57,7 +57,7 @@ import org.onosproject.net.intent.OpticalConnectivityIntent; ...@@ -57,7 +57,7 @@ import org.onosproject.net.intent.OpticalConnectivityIntent;
57 import org.onosproject.net.link.LinkEvent; 57 import org.onosproject.net.link.LinkEvent;
58 import org.onosproject.net.link.LinkListener; 58 import org.onosproject.net.link.LinkListener;
59 import org.onosproject.net.link.LinkService; 59 import org.onosproject.net.link.LinkService;
60 -import org.onosproject.net.resource.BandwidthCapacity; 60 +import org.onosproject.net.config.basics.BandwidthCapacity;
61 import org.onosproject.net.resource.ContinuousResource; 61 import org.onosproject.net.resource.ContinuousResource;
62 import org.onosproject.net.resource.Resource; 62 import org.onosproject.net.resource.Resource;
63 import org.onosproject.net.resource.ResourceAllocation; 63 import org.onosproject.net.resource.ResourceAllocation;
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onosproject.net.resource; 16 +package org.onosproject.net.config.basics;
17 17
18 import static com.google.common.base.Preconditions.checkNotNull; 18 import static com.google.common.base.Preconditions.checkNotNull;
19 19
......
...@@ -44,7 +44,7 @@ import org.onosproject.net.driver.DriverHandler; ...@@ -44,7 +44,7 @@ import org.onosproject.net.driver.DriverHandler;
44 import org.onosproject.net.driver.DriverService; 44 import org.onosproject.net.driver.DriverService;
45 import org.onosproject.net.resource.DiscreteResource; 45 import org.onosproject.net.resource.DiscreteResource;
46 import org.onosproject.net.resource.ResourceAdminService; 46 import org.onosproject.net.resource.ResourceAdminService;
47 -import org.onosproject.net.resource.BandwidthCapacity; 47 +import org.onosproject.net.config.basics.BandwidthCapacity;
48 import org.onosproject.net.resource.Resource; 48 import org.onosproject.net.resource.Resource;
49 import org.onosproject.net.resource.ResourceQueryService; 49 import org.onosproject.net.resource.ResourceQueryService;
50 import org.onosproject.net.resource.Resources; 50 import org.onosproject.net.resource.Resources;
......
...@@ -28,7 +28,7 @@ import org.onosproject.net.ConnectPoint; ...@@ -28,7 +28,7 @@ import org.onosproject.net.ConnectPoint;
28 import org.onosproject.net.config.NetworkConfigEvent; 28 import org.onosproject.net.config.NetworkConfigEvent;
29 import org.onosproject.net.config.NetworkConfigListener; 29 import org.onosproject.net.config.NetworkConfigListener;
30 import org.onosproject.net.config.NetworkConfigService; 30 import org.onosproject.net.config.NetworkConfigService;
31 -import org.onosproject.net.resource.BandwidthCapacity; 31 +import org.onosproject.net.config.basics.BandwidthCapacity;
32 import org.onosproject.net.resource.ResourceAdminService; 32 import org.onosproject.net.resource.ResourceAdminService;
33 import org.onosproject.net.resource.Resources; 33 import org.onosproject.net.resource.Resources;
34 import org.slf4j.Logger; 34 import org.slf4j.Logger;
......
...@@ -31,7 +31,7 @@ import org.onosproject.net.config.NetworkConfigRegistry; ...@@ -31,7 +31,7 @@ import org.onosproject.net.config.NetworkConfigRegistry;
31 import org.onosproject.net.device.DeviceListener; 31 import org.onosproject.net.device.DeviceListener;
32 import org.onosproject.net.device.DeviceService; 32 import org.onosproject.net.device.DeviceService;
33 import org.onosproject.net.driver.DriverService; 33 import org.onosproject.net.driver.DriverService;
34 -import org.onosproject.net.resource.BandwidthCapacity; 34 +import org.onosproject.net.config.basics.BandwidthCapacity;
35 import org.onosproject.net.resource.ResourceAdminService; 35 import org.onosproject.net.resource.ResourceAdminService;
36 import org.onosproject.net.resource.ResourceService; 36 import org.onosproject.net.resource.ResourceService;
37 import org.slf4j.Logger; 37 import org.slf4j.Logger;
......
...@@ -74,6 +74,7 @@ import org.onosproject.net.Link; ...@@ -74,6 +74,7 @@ import org.onosproject.net.Link;
74 import org.onosproject.net.MastershipRole; 74 import org.onosproject.net.MastershipRole;
75 import org.onosproject.net.PortNumber; 75 import org.onosproject.net.PortNumber;
76 import org.onosproject.net.config.NetworkConfigService; 76 import org.onosproject.net.config.NetworkConfigService;
77 +import org.onosproject.net.config.basics.BandwidthCapacity;
77 import org.onosproject.net.device.DefaultDeviceDescription; 78 import org.onosproject.net.device.DefaultDeviceDescription;
78 import org.onosproject.net.device.DefaultPortDescription; 79 import org.onosproject.net.device.DefaultPortDescription;
79 import org.onosproject.net.device.DeviceDescription; 80 import org.onosproject.net.device.DeviceDescription;
...@@ -90,7 +91,6 @@ import org.onosproject.net.link.LinkProviderService; ...@@ -90,7 +91,6 @@ import org.onosproject.net.link.LinkProviderService;
90 import org.onosproject.net.link.LinkService; 91 import org.onosproject.net.link.LinkService;
91 import org.onosproject.net.provider.AbstractProvider; 92 import org.onosproject.net.provider.AbstractProvider;
92 import org.onosproject.net.provider.ProviderId; 93 import org.onosproject.net.provider.ProviderId;
93 -import org.onosproject.net.resource.BandwidthCapacity;
94 import org.slf4j.Logger; 94 import org.slf4j.Logger;
95 import org.slf4j.LoggerFactory; 95 import org.slf4j.LoggerFactory;
96 96
......
...@@ -81,6 +81,7 @@ import org.onosproject.net.config.Config; ...@@ -81,6 +81,7 @@ import org.onosproject.net.config.Config;
81 import org.onosproject.net.config.ConfigApplyDelegate; 81 import org.onosproject.net.config.ConfigApplyDelegate;
82 import org.onosproject.net.config.ConfigFactory; 82 import org.onosproject.net.config.ConfigFactory;
83 import org.onosproject.net.config.NetworkConfigRegistryAdapter; 83 import org.onosproject.net.config.NetworkConfigRegistryAdapter;
84 +import org.onosproject.net.config.basics.BandwidthCapacity;
84 import org.onosproject.net.device.DeviceDescription; 85 import org.onosproject.net.device.DeviceDescription;
85 import org.onosproject.net.device.DeviceProvider; 86 import org.onosproject.net.device.DeviceProvider;
86 import org.onosproject.net.device.DeviceProviderRegistry; 87 import org.onosproject.net.device.DeviceProviderRegistry;
...@@ -93,7 +94,6 @@ import org.onosproject.net.link.LinkProvider; ...@@ -93,7 +94,6 @@ import org.onosproject.net.link.LinkProvider;
93 import org.onosproject.net.link.LinkProviderRegistry; 94 import org.onosproject.net.link.LinkProviderRegistry;
94 import org.onosproject.net.link.LinkProviderService; 95 import org.onosproject.net.link.LinkProviderService;
95 import org.onosproject.net.provider.ProviderId; 96 import org.onosproject.net.provider.ProviderId;
96 -import org.onosproject.net.resource.BandwidthCapacity;
97 import org.onosproject.net.resource.Resource; 97 import org.onosproject.net.resource.Resource;
98 import org.onosproject.net.resource.ResourceAdminService; 98 import org.onosproject.net.resource.ResourceAdminService;
99 import org.onosproject.net.resource.ResourceId; 99 import org.onosproject.net.resource.ResourceId;
......