diff --git a/core/net/src/main/java/org/onosproject/net/link/impl/LinkManager.java b/core/net/src/main/java/org/onosproject/net/link/impl/LinkManager.java
index b4cc17c..157288a 100644
--- a/core/net/src/main/java/org/onosproject/net/link/impl/LinkManager.java
+++ b/core/net/src/main/java/org/onosproject/net/link/impl/LinkManager.java
@@ -25,7 +25,6 @@
 import org.apache.felix.scr.annotations.ReferenceCardinality;
 import org.apache.felix.scr.annotations.Service;
 import org.onosproject.net.provider.AbstractListenerProviderRegistry;
-import org.onosproject.core.Permission;
 import org.onosproject.net.config.NetworkConfigEvent;
 import org.onosproject.net.config.NetworkConfigListener;
 import org.onosproject.net.config.NetworkConfigService;
@@ -59,6 +58,7 @@
 import static org.onosproject.net.LinkKey.linkKey;
 import static org.onosproject.security.AppGuard.checkPermission;
 import static org.slf4j.LoggerFactory.getLogger;
+import static org.onosproject.security.AppPermission.Type.*;
 
 
 /**
@@ -111,19 +111,19 @@
 
     @Override
     public int getLinkCount() {
-        checkPermission(Permission.LINK_READ);
+        checkPermission(LINK_READ);
         return store.getLinkCount();
     }
 
     @Override
     public Iterable<Link> getLinks() {
-        checkPermission(Permission.LINK_READ);
+        checkPermission(LINK_READ);
         return store.getLinks();
     }
 
     @Override
     public Iterable<Link> getActiveLinks() {
-        checkPermission(Permission.LINK_READ);
+        checkPermission(LINK_READ);
         return FluentIterable.from(getLinks())
                 .filter(new Predicate<Link>() {
 
@@ -136,7 +136,7 @@
 
     @Override
     public Set<Link> getDeviceLinks(DeviceId deviceId) {
-        checkPermission(Permission.LINK_READ);
+        checkPermission(LINK_READ);
         checkNotNull(deviceId, DEVICE_ID_NULL);
         return Sets.union(store.getDeviceEgressLinks(deviceId),
                           store.getDeviceIngressLinks(deviceId));
@@ -144,21 +144,21 @@
 
     @Override
     public Set<Link> getDeviceEgressLinks(DeviceId deviceId) {
-        checkPermission(Permission.LINK_READ);
+        checkPermission(LINK_READ);
         checkNotNull(deviceId, DEVICE_ID_NULL);
         return store.getDeviceEgressLinks(deviceId);
     }
 
     @Override
     public Set<Link> getDeviceIngressLinks(DeviceId deviceId) {
-        checkPermission(Permission.LINK_READ);
+        checkPermission(LINK_READ);
         checkNotNull(deviceId, DEVICE_ID_NULL);
         return store.getDeviceIngressLinks(deviceId);
     }
 
     @Override
     public Set<Link> getLinks(ConnectPoint connectPoint) {
-        checkPermission(Permission.LINK_READ);
+        checkPermission(LINK_READ);
         checkNotNull(connectPoint, CONNECT_POINT_NULL);
         return Sets.union(store.getEgressLinks(connectPoint),
                           store.getIngressLinks(connectPoint));
@@ -166,21 +166,21 @@
 
     @Override
     public Set<Link> getEgressLinks(ConnectPoint connectPoint) {
-        checkPermission(Permission.LINK_READ);
+        checkPermission(LINK_READ);
         checkNotNull(connectPoint, CONNECT_POINT_NULL);
         return store.getEgressLinks(connectPoint);
     }
 
     @Override
     public Set<Link> getIngressLinks(ConnectPoint connectPoint) {
-        checkPermission(Permission.LINK_READ);
+        checkPermission(LINK_READ);
         checkNotNull(connectPoint, CONNECT_POINT_NULL);
         return store.getIngressLinks(connectPoint);
     }
 
     @Override
     public Link getLink(ConnectPoint src, ConnectPoint dst) {
-        checkPermission(Permission.LINK_READ);
+        checkPermission(LINK_READ);
         checkNotNull(src, CONNECT_POINT_NULL);
         checkNotNull(dst, CONNECT_POINT_NULL);
         return store.getLink(src, dst);
