commit 8ebfff047bbfa2564fff7da6eac1b3fc8cb48f3c
author Rimon Ashkenazy <rimon8963@gmail.com> Mon Feb 01 11:56:36 2016 +0200
committer Gerrit Code Review <gerrit@onlab.us> Tue Feb 09 20:36:40 2016 +0000
tree 77bc6f578b81faec8deade57b8f919f89c10680c
parent dd3750cf0198b17299f15816c893379e79ccaeac

Add OTN device and ports

Change-Id: I18f3376d1466077e95d7324a27a660302f0123b3

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 23f67d1..2bdaeab 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
@@ -186,7 +186,7 @@
     private ApplicationId appId;
 
     static final SuppressionRules DEFAULT_RULES
-        = new SuppressionRules(EnumSet.of(Device.Type.ROADM, Device.Type.FIBER_SWITCH),
+        = new SuppressionRules(EnumSet.of(Device.Type.ROADM, Device.Type.FIBER_SWITCH, Device.Type.OTN),
                                ImmutableMap.of(NO_LLDP, SuppressionRules.ANY_VALUE));
 
     private SuppressionRules rules = LldpLinkProvider.DEFAULT_RULES;

providers/lldp/src/test/java/org/onosproject/provider/lldp/impl/SuppressionRulesTest.java

diff --git a/providers/lldp/src/test/java/org/onosproject/provider/lldp/impl/SuppressionRulesTest.java b/providers/lldp/src/test/java/org/onosproject/provider/lldp/impl/SuppressionRulesTest.java
index c18c248..2bd856b 100644
--- a/providers/lldp/src/test/java/org/onosproject/provider/lldp/impl/SuppressionRulesTest.java
+++ b/providers/lldp/src/test/java/org/onosproject/provider/lldp/impl/SuppressionRulesTest.java
@@ -51,7 +51,7 @@
 
     @Before
     public void setUp() throws Exception {
-        rules = new SuppressionRules(ImmutableSet.of(Device.Type.ROADM),
+        rules = new SuppressionRules(ImmutableSet.of(Device.Type.ROADM, Device.Type.OTN),
                                ImmutableMap.of("no-lldp", SuppressionRules.ANY_VALUE,
                                                "sendLLDP", "false"));
     }