Generalize the methods in ResourceAdminService
Change-Id: Ib78d2ec441651c3215c422ba4b46d726158de4a9
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 114c4c7..4fb0d7b 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
@@ -15,6 +15,7 @@
*/
package org.onosproject.net.newresource.impl;
+import com.google.common.collect.Lists;
import org.onosproject.net.Device;
import org.onosproject.net.Port;
import org.onosproject.net.OchPort;
@@ -82,39 +83,36 @@
}
private void registerDeviceResource(Device device) {
- executor.submit(() -> adminService.registerResources(ResourcePath.ROOT, device.id()));
+ executor.submit(() -> adminService.registerResources(ResourcePath.discrete(device.id())));
}
private void unregisterDeviceResource(Device device) {
- executor.submit(() -> adminService.unregisterResources(ResourcePath.ROOT, device.id()));
+ executor.submit(() -> adminService.unregisterResources(ResourcePath.discrete(device.id())));
}
private void registerPortResource(Device device, Port port) {
- ResourcePath parent = ResourcePath.discrete(device.id());
- executor.submit(() -> registerPortResource(device, port, parent));
- }
-
- private void registerPortResource(Device device, Port port, ResourcePath parent) {
- adminService.registerResources(parent, port.number());
ResourcePath portPath = ResourcePath.discrete(device.id(), port.number());
+ executor.submit(() -> {
+ adminService.registerResources(portPath);
- switch (port.type()) {
- case OCH:
- // register ODU TributarySlots against the OCH port
- registerTributarySlotsResources(((OchPort) port).signalType(), portPath);
- break;
- default:
- break;
- }
+ switch (port.type()) {
+ case OCH:
+ // register ODU TributarySlots against the OCH port
+ registerTributarySlotsResources(((OchPort) port).signalType(), portPath);
+ break;
+ default:
+ break;
+ }
+ });
}
private void registerTributarySlotsResources(OduSignalType oduSignalType, ResourcePath portPath) {
switch (oduSignalType) {
case ODU2:
- adminService.registerResources(portPath, ENTIRE_ODU2_TRIBUTARY_SLOTS);
+ adminService.registerResources(Lists.transform(ENTIRE_ODU2_TRIBUTARY_SLOTS, portPath::child));
break;
case ODU4:
- adminService.registerResources(portPath, ENTIRE_ODU4_TRIBUTARY_SLOTS);
+ adminService.registerResources(Lists.transform(ENTIRE_ODU4_TRIBUTARY_SLOTS, portPath::child));
break;
default:
break;
@@ -122,8 +120,8 @@
}
private void unregisterPortResource(Device device, Port port) {
- ResourcePath parent = ResourcePath.discrete(device.id());
- executor.submit(() -> adminService.unregisterResources(parent, port.number()));
+ ResourcePath resource = ResourcePath.discrete(device.id(), port.number());
+ executor.submit(() -> adminService.unregisterResources(resource));
}
private static List<TributarySlot> getEntireOdu2TributarySlots() {
diff --git a/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceLinkListener.java b/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceLinkListener.java
index 68fd661..9d2e06f 100644
--- a/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceLinkListener.java
+++ b/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceLinkListener.java
@@ -15,6 +15,7 @@
*/
package org.onosproject.net.newresource.impl;
+import com.google.common.collect.Lists;
import org.onlab.packet.MplsLabel;
import org.onlab.packet.VlanId;
import org.onlab.util.ItemNotFoundException;
@@ -85,24 +86,24 @@
executor.submit(() -> {
// register the link
LinkKey linkKey = LinkKey.linkKey(link);
- adminService.registerResources(ResourcePath.ROOT, linkKey);
+ adminService.registerResources(ResourcePath.discrete(linkKey));
ResourcePath linkPath = ResourcePath.discrete(linkKey);
// register VLAN IDs against the link
if (isEnabled(link, this::isVlanEnabled)) {
- adminService.registerResources(linkPath, ENTIRE_VLAN_IDS);
+ adminService.registerResources(Lists.transform(ENTIRE_VLAN_IDS, linkPath::child));
}
// register MPLS labels against the link
if (isEnabled(link, this::isMplsEnabled)) {
- adminService.registerResources(linkPath, ENTIRE_MPLS_LABELS);
+ adminService.registerResources(Lists.transform(ENTIRE_MPLS_LABELS, linkPath::child));
}
});
}
private void unregisterLinkResource(Link link) {
LinkKey linkKey = LinkKey.linkKey(link);
- executor.submit(() -> adminService.unregisterResources(ResourcePath.ROOT, linkKey));
+ executor.submit(() -> adminService.unregisterResources(ResourcePath.discrete(linkKey)));
}
private boolean isEnabled(Link link, Predicate<ConnectPoint> predicate) {
diff --git a/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceManager.java b/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceManager.java
index 1c6930b..3014951 100644
--- a/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceManager.java
+++ b/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceManager.java
@@ -17,7 +17,6 @@
import com.google.common.annotations.Beta;
import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
@@ -41,7 +40,6 @@
import java.util.Optional;
import java.util.stream.Collectors;
-import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
/**
@@ -164,23 +162,17 @@
}
@Override
- public <T> boolean registerResources(ResourcePath parent, List<T> children) {
- checkNotNull(parent);
- checkNotNull(children);
- checkArgument(!children.isEmpty());
+ public boolean registerResources(List<ResourcePath> resources) {
+ checkNotNull(resources);
- List<ResourcePath> resources = Lists.transform(children, parent::child);
return store.register(resources);
}
@Override
- public <T> boolean unregisterResources(ResourcePath parent, List<T> children) {
- checkNotNull(parent);
- checkNotNull(children);
- checkArgument(!children.isEmpty());
+ public boolean unregisterResources(List<ResourcePath> resources) {
+ checkNotNull(resources);
- List<ResourcePath> resources = Lists.transform(children, parent::child);
- return store.unregister(resources);
+ return store.register(resources);
}
private class InternalStoreDelegate implements ResourceStoreDelegate {