commit 7b32697856a8dfdd96457424c36421c90907e8f4
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Tue Feb 09 15:53:39 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Wed Feb 10 21:36:33 2016 +0000
tree 6bbf2a7f246bd6b279fd70d30456596fdde47f37
parent 69420fe49cec9ba4d0f1f641dc616c5f7332a9ae

Simplify method names by removing redundancy

Change-Id: I36df7e23792f7004dfae823a8700f6c887ea1efd

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

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 39ab964..ae2b406 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
@@ -93,7 +93,7 @@
 
         switch (event.type()) {
         case CONFIG_ADDED:
-            if (!adminService.registerResources(Resources.continuous(cp.deviceId(),
+            if (!adminService.register(Resources.continuous(cp.deviceId(),
                     cp.port(), Bandwidth.class)
                     .resource(bwCapacity.capacity().bps()))) {
                 log.info("Failed to register Bandwidth for {}, attempting update", cp);
@@ -115,7 +115,7 @@
 
         case CONFIG_REMOVED:
             // FIXME Following should be an update to the value based on port speed
-            if (!adminService.unregisterResources(Resources.continuous(cp.deviceId(),
+            if (!adminService.unregister(Resources.continuous(cp.deviceId(),
                     cp.port(),
                     Bandwidth.class).id())) {
                 log.warn("Failed to unregister Bandwidth for {}", cp);
@@ -147,11 +147,11 @@
         // but both unregisterResources(..) and  registerResources(..)
         // returns true (success)
 
-        if (!adminService.unregisterResources(
+        if (!adminService.unregister(
                 Resources.continuous(cp.deviceId(), cp.port(), Bandwidth.class).id())) {
             log.warn("unregisterResources for {} failed", cp);
         }
-        return adminService.registerResources(Resources.continuous(cp.deviceId(),
+        return adminService.register(Resources.continuous(cp.deviceId(),
                 cp.port(),
                 Bandwidth.class).resource(bwCapacity.capacity().bps()));
     }