commit 2c7cecfa9068ff6acf7f122ed8e0ff0ddad01c33
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Wed Nov 11 14:16:14 2015 -0800
committer Gerrit Code Review <gerrit@onlab.us> Wed Nov 25 03:18:13 2015 +0000
tree 6b2c543042651357d81e9dd79765388f91dff0ac
parent 46297d2c92be5d2db4bd95f5f55fac17ddc05c26

Generalize the methods in ResourceAdminService

Change-Id: Ib78d2ec441651c3215c422ba4b46d726158de4a9

core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceDeviceListener.java

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() {