Move static factory methods to the utility class
Change-Id: Icf458adf78f51823e4ffa31346595fa9716485bf
diff --git a/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceDeviceListener.java b/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceDeviceListener.java
index 2a85fbb..64691d5 100644
--- a/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceDeviceListener.java
+++ b/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceDeviceListener.java
@@ -40,6 +40,7 @@
import org.onosproject.net.newresource.ResourceAdminService;
import org.onosproject.net.newresource.BandwidthCapacity;
import org.onosproject.net.newresource.Resource;
+import org.onosproject.net.newresource.Resources;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -118,15 +119,15 @@
}
private void registerDeviceResource(Device device) {
- executor.submit(() -> adminService.registerResources(Resource.discrete(device.id()).resource()));
+ executor.submit(() -> adminService.registerResources(Resources.discrete(device.id()).resource()));
}
private void unregisterDeviceResource(Device device) {
- executor.submit(() -> adminService.unregisterResources(Resource.discrete(device.id()).resource()));
+ executor.submit(() -> adminService.unregisterResources(Resources.discrete(device.id()).resource()));
}
private void registerPortResource(Device device, Port port) {
- Resource portPath = Resource.discrete(device.id(), port.number()).resource();
+ Resource portPath = Resources.discrete(device.id(), port.number()).resource();
executor.submit(() -> {
adminService.registerResources(portPath);
@@ -174,7 +175,7 @@
}
private void unregisterPortResource(Device device, Port port) {
- Resource resource = Resource.discrete(device.id(), port.number()).resource();
+ Resource resource = Resources.discrete(device.id(), port.number()).resource();
executor.submit(() -> adminService.unregisterResources(resource));
}
diff --git a/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceNetworkConfigListener.java b/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceNetworkConfigListener.java
index b8d373b..e98a3c3 100644
--- a/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceNetworkConfigListener.java
+++ b/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceNetworkConfigListener.java
@@ -17,7 +17,6 @@
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
-import static org.onosproject.net.newresource.Resource.continuous;
import static org.slf4j.LoggerFactory.getLogger;
import java.util.Set;
@@ -30,6 +29,7 @@
import org.onosproject.net.config.NetworkConfigService;
import org.onosproject.net.newresource.BandwidthCapacity;
import org.onosproject.net.newresource.ResourceAdminService;
+import org.onosproject.net.newresource.Resources;
import org.slf4j.Logger;
import com.google.common.annotations.Beta;
@@ -93,8 +93,8 @@
switch (event.type()) {
case CONFIG_ADDED:
- if (!adminService.registerResources(continuous(cp.deviceId(),
- cp.port(), Bandwidth.class)
+ if (!adminService.registerResources(Resources.continuous(cp.deviceId(),
+ cp.port(), Bandwidth.class)
.resource(bwCapacity.capacity().bps()))) {
log.info("Failed to register Bandwidth for {}, attempting update", cp);
@@ -115,9 +115,9 @@
case CONFIG_REMOVED:
// FIXME Following should be an update to the value based on port speed
- if (!adminService.unregisterResources(continuous(cp.deviceId(),
- cp.port(),
- Bandwidth.class).resource(0))) {
+ if (!adminService.unregisterResources(Resources.continuous(cp.deviceId(),
+ cp.port(),
+ Bandwidth.class).resource(0))) {
log.warn("Failed to unregister Bandwidth for {}", cp);
}
break;
@@ -147,12 +147,13 @@
// but both unregisterResources(..) and registerResources(..)
// returns true (success)
- if (!adminService.unregisterResources(continuous(cp.deviceId(), cp.port(), Bandwidth.class).resource(0))) {
+ if (!adminService.unregisterResources(
+ Resources.continuous(cp.deviceId(), cp.port(), Bandwidth.class).resource(0))) {
log.warn("unregisterResources for {} failed", cp);
}
- return adminService.registerResources(continuous(cp.deviceId(),
- cp.port(),
- Bandwidth.class).resource(bwCapacity.capacity().bps()));
+ return adminService.registerResources(Resources.continuous(cp.deviceId(),
+ cp.port(),
+ Bandwidth.class).resource(bwCapacity.capacity().bps()));
}
}