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/cfg/impl/ComponentConfigManager.java

diff --git a/core/net/src/main/java/org/onosproject/cfg/impl/ComponentConfigManager.java b/core/net/src/main/java/org/onosproject/cfg/impl/ComponentConfigManager.java
index 884d028..1933ee5 100644
--- a/core/net/src/main/java/org/onosproject/cfg/impl/ComponentConfigManager.java
+++ b/core/net/src/main/java/org/onosproject/cfg/impl/ComponentConfigManager.java
@@ -31,7 +31,6 @@
 import org.onosproject.cfg.ComponentConfigStore;
 import org.onosproject.cfg.ComponentConfigStoreDelegate;
 import org.onosproject.cfg.ConfigProperty;
-import org.onosproject.core.Permission;
 import org.osgi.service.cm.Configuration;
 import org.osgi.service.cm.ConfigurationAdmin;
 import org.slf4j.Logger;
@@ -50,6 +49,7 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 import static org.onosproject.security.AppGuard.checkPermission;
 import static org.slf4j.LoggerFactory.getLogger;
+import static org.onosproject.security.AppPermission.Type.*;
 
 
 /**
@@ -99,14 +99,14 @@
 
     @Override
     public Set<String> getComponentNames() {
-        checkPermission(Permission.CONFIG_READ);
+        checkPermission(CONFIG_READ);
 
         return ImmutableSet.copyOf(properties.keySet());
     }
 
     @Override
     public void registerProperties(Class<?> componentClass) {
-        checkPermission(Permission.CONFIG_WRITE);
+        checkPermission(CONFIG_WRITE);
 
         String componentName = componentClass.getName();
         String resourceName = componentClass.getSimpleName() + RESOURCE_EXT;
@@ -130,7 +130,7 @@
 
     @Override
     public void unregisterProperties(Class<?> componentClass, boolean clear) {
-        checkPermission(Permission.CONFIG_WRITE);
+        checkPermission(CONFIG_WRITE);
 
         String componentName = componentClass.getName();
         checkNotNull(componentName, COMPONENT_NULL);
@@ -148,7 +148,7 @@
 
     @Override
     public Set<ConfigProperty> getProperties(String componentName) {
-        checkPermission(Permission.CONFIG_READ);
+        checkPermission(CONFIG_READ);
 
         Map<String, ConfigProperty> map = properties.get(componentName);
         return map != null ? ImmutableSet.copyOf(map.values()) : null;
@@ -156,7 +156,7 @@
 
     @Override
     public void setProperty(String componentName, String name, String value) {
-        checkPermission(Permission.CONFIG_WRITE);
+        checkPermission(CONFIG_WRITE);
 
         checkNotNull(componentName, COMPONENT_NULL);
         checkNotNull(name, PROPERTY_NULL);
@@ -165,7 +165,7 @@
 
     @Override
     public void unsetProperty(String componentName, String name) {
-        checkPermission(Permission.CONFIG_WRITE);
+        checkPermission(CONFIG_WRITE);
 
         checkNotNull(componentName, COMPONENT_NULL);
         checkNotNull(name, PROPERTY_NULL);