commit b856b813b5a42f07fc1092781cf0f13e24ea41c0
author Changhoon Yoon <chyoon87@kaist.ac.kr> Mon Aug 10 03:47:19 2015 +0900
committer Gerrit Code Review <gerrit@onlab.us> Fri Sep 04 18:09:49 2015 +0000
tree f0cb556690b04cc5c6d3a21c6b51a8fab76608c4
parent f28207bddfbdfbce2cd775a6361b18c3612ba565

ONOS-1767 SM-ONOS implementation

22a363e ONOS-17767 SM-ONOS impl

Change-Id: Ifca8129f2266bada68af735cf81a1d39f1ec8506

core/net/src/main/java/org/onosproject/net/statistic/impl/StatisticManager.java

diff --git a/core/net/src/main/java/org/onosproject/net/statistic/impl/StatisticManager.java b/core/net/src/main/java/org/onosproject/net/statistic/impl/StatisticManager.java
index a07f196..996ad14e 100644
--- a/core/net/src/main/java/org/onosproject/net/statistic/impl/StatisticManager.java
+++ b/core/net/src/main/java/org/onosproject/net/statistic/impl/StatisticManager.java
@@ -27,7 +27,6 @@
 import org.apache.felix.scr.annotations.Service;
 import org.onosproject.core.ApplicationId;
 import org.onosproject.core.GroupId;
-import org.onosproject.core.Permission;
 import org.onosproject.net.ConnectPoint;
 import org.onosproject.net.Link;
 import org.onosproject.net.Path;
@@ -51,6 +50,7 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 import static org.slf4j.LoggerFactory.getLogger;
 import static org.onosproject.security.AppGuard.checkPermission;
+import static org.onosproject.security.AppPermission.Type.*;
 
 
 /**
@@ -86,14 +86,14 @@
 
     @Override
     public Load load(Link link) {
-        checkPermission(Permission.STATISTIC_READ);
+        checkPermission(STATISTIC_READ);
 
         return load(link.src());
     }
 
     @Override
     public Load load(Link link, ApplicationId appId, Optional<GroupId> groupId) {
-        checkPermission(Permission.STATISTIC_READ);
+        checkPermission(STATISTIC_READ);
 
         Statistics stats = getStatistics(link.src());
         if (!stats.isValid()) {
@@ -114,14 +114,14 @@
 
     @Override
     public Load load(ConnectPoint connectPoint) {
-        checkPermission(Permission.STATISTIC_READ);
+        checkPermission(STATISTIC_READ);
 
         return loadInternal(connectPoint);
     }
 
     @Override
     public Link max(Path path) {
-        checkPermission(Permission.STATISTIC_READ);
+        checkPermission(STATISTIC_READ);
 
         if (path.links().isEmpty()) {
             return null;
@@ -140,7 +140,7 @@
 
     @Override
     public Link min(Path path) {
-        checkPermission(Permission.STATISTIC_READ);
+        checkPermission(STATISTIC_READ);
 
         if (path.links().isEmpty()) {
             return null;
@@ -159,7 +159,7 @@
 
     @Override
     public FlowRule highestHitter(ConnectPoint connectPoint) {
-        checkPermission(Permission.STATISTIC_READ);
+        checkPermission(STATISTIC_READ);
 
         Set<FlowEntry> hitters = statisticStore.getCurrentStatistic(connectPoint);
         if (hitters.isEmpty()) {