commit 09697d0a5d73c38097f4a1a316a5f0acfbad22f4
author Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Fri Mar 03 16:53:39 2017 -0800
committer Yuta HIGUCHI <y-higuchi@onlab.us> Tue Mar 07 07:01:44 2017 +0000
tree 1f1733bddeabce68bd876ffc41a9de95f90ed0a0
parent 95f4b42a2f2f58bc79f8dccd6a5a08bdc2798093

ONOS-6067 avoid sending FlowRule against EDFA device.

- Also exclude optical amplifier type from default no-LLDP list

Change-Id: I220d0a3cfa95d80644707cbe3395d3ed63540716

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

diff --git a/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/LldpLinkProvider.java b/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/LldpLinkProvider.java
index eddf4b4..98ae408 100644
--- a/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/LldpLinkProvider.java
+++ b/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/LldpLinkProvider.java
@@ -187,7 +187,10 @@
     private ApplicationId appId;
 
     static final SuppressionRules DEFAULT_RULES
-        = new SuppressionRules(EnumSet.of(Device.Type.ROADM, Device.Type.FIBER_SWITCH, Device.Type.OTN),
+        = new SuppressionRules(EnumSet.of(Device.Type.ROADM,
+                                          Device.Type.FIBER_SWITCH,
+                                          Device.Type.OPTICAL_AMPLIFIER,
+                                          Device.Type.OTN),
                                ImmutableMap.of(NO_LLDP, SuppressionRules.ANY_VALUE));
 
     private SuppressionRules rules = LldpLinkProvider.DEFAULT_RULES;