commit d9fe3a3f871f66a2157080cd220d77090fbf6c4a
author HIGUCHI Yuta <y-higuchi@ak.jp.nec.com> Tue Nov 24 18:52:25 2015 -0800
committer Gerrit Code Review <gerrit@onlab.us> Wed Nov 25 23:13:38 2015 +0000
tree 98ebcaaeddb18fb16fb7fb14a5d0f7bc13845d02
parent 549464b04e1eb063882b918d0941c05bd5a259ff

ONOS-3461 Disable LinkDiscovery on specific device/port.

- Configuration moved from "apps" -> "devices", "ports"
  in network configuration tree

Change-Id: I030bab489939ce5326a6ebea14f246726ca024f0

providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/SuppressionRules.java

diff --git a/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/SuppressionRules.java b/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/SuppressionRules.java
index 9cda07c..14bc220 100644
--- a/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/SuppressionRules.java
+++ b/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/SuppressionRules.java
@@ -23,7 +23,6 @@
 
 import org.onosproject.net.Annotations;
 import org.onosproject.net.Device;
-import org.onosproject.net.DeviceId;
 import org.onosproject.net.Element;
 import org.onosproject.net.Port;
 
@@ -35,23 +34,17 @@
 
     public static final String ANY_VALUE = "(any)";
 
-    private final Set<DeviceId> suppressedDevice;
     private final Set<Device.Type> suppressedDeviceType;
     private final Map<String, String> suppressedAnnotation;
 
-    public SuppressionRules(Set<DeviceId> suppressedDevice,
-                     Set<Device.Type> suppressedType,
-                     Map<String, String> suppressedAnnotation) {
+    public SuppressionRules(Set<Device.Type> suppressedType,
+                            Map<String, String> suppressedAnnotation) {
 
-        this.suppressedDevice = ImmutableSet.copyOf(suppressedDevice);
         this.suppressedDeviceType = ImmutableSet.copyOf(suppressedType);
         this.suppressedAnnotation = ImmutableMap.copyOf(suppressedAnnotation);
     }
 
     public boolean isSuppressed(Device device) {
-        if (suppressedDevice.contains(device.id())) {
-            return true;
-        }
         if (suppressedDeviceType.contains(device.type())) {
             return true;
         }
@@ -94,10 +87,6 @@
         return false;
     }
 
-    Set<DeviceId> getSuppressedDevice() {
-        return suppressedDevice;
-    }
-
     Set<Device.Type> getSuppressedDeviceType() {
         return suppressedDeviceType;
     }
@@ -108,8 +97,7 @@
 
     @Override
     public int hashCode() {
-        return Objects.hash(suppressedDevice,
-                            suppressedDeviceType,
+        return Objects.hash(suppressedDeviceType,
                             suppressedAnnotation);
     }
 
@@ -117,9 +105,7 @@
     public boolean equals(Object object) {
         if (object != null && getClass() == object.getClass()) {
             SuppressionRules that = (SuppressionRules) object;
-            return Objects.equals(this.suppressedDevice,
-                                  that.suppressedDevice)
-                    && Objects.equals(this.suppressedDeviceType,
+            return Objects.equals(this.suppressedDeviceType,
                                       that.suppressedDeviceType)
                     && Objects.equals(this.suppressedAnnotation,
                                       that.suppressedAnnotation);
@@ -130,7 +116,6 @@
     @Override
     public String toString() {
         return MoreObjects.toStringHelper(this)
-                .add("suppressedDevice", suppressedDevice)
                 .add("suppressedDeviceType", suppressedDeviceType)
                 .add("suppressedAnnotation", suppressedAnnotation)
                 .toString();