홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Marc De Leenheer
Committed by Gerrit Code Review
0bfc2a1c 1 parent 1fdd2242

Fixes for fiber switch 

Change-Id: Ic2dec025cb1cb4cdd6d68120843472ecb38960bc
Inline Side-by-side
Showing 2 changed files with 27 additions and 29 deletions
...@@ -161,8 +161,7 @@ ...@@ -161,8 +161,7 @@
161 impl="org.onosproject.driver.pipeline.CpqdOFDPA2VlanPipeline"/> 161 impl="org.onosproject.driver.pipeline.CpqdOFDPA2VlanPipeline"/>
162 </driver> 162 </driver>
163 <driver name="calient" extends="default" 163 <driver name="calient" extends="default"
164 - manufacturer="calient inc" hwVersion="calient hardware" 164 + manufacturer="Calient Technologies" hwVersion=".*" swVersion="Optical Circuit Switch">
165 - swVersion="ocs switch">
166 <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver" 165 <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver"
167 impl="org.onosproject.driver.handshaker.CalientFiberSwitchHandshaker"/> 166 impl="org.onosproject.driver.handshaker.CalientFiberSwitchHandshaker"/>
168 <behaviour api="org.onosproject.net.behaviour.LambdaQuery" 167 <behaviour api="org.onosproject.net.behaviour.LambdaQuery"
......
...@@ -15,29 +15,9 @@ ...@@ -15,29 +15,9 @@
15 */ 15 */
16 package org.onosproject.provider.lldp.impl; 16 package org.onosproject.provider.lldp.impl;
17 17
18 -import static com.google.common.base.Strings.isNullOrEmpty; 18 +import com.google.common.collect.ImmutableMap;
19 -import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor; 19 +import com.google.common.collect.ImmutableSet;
20 -import static java.util.concurrent.TimeUnit.SECONDS; 20 +import com.google.common.collect.Maps;
21 -import static org.onlab.packet.Ethernet.TYPE_BSN;
22 -import static org.onlab.packet.Ethernet.TYPE_LLDP;
23 -import static org.onlab.util.Tools.get;
24 -import static org.onlab.util.Tools.groupedThreads;
25 -import static org.onosproject.net.Link.Type.DIRECT;
26 -import static org.onosproject.net.config.basics.SubjectFactories.APP_SUBJECT_FACTORY;
27 -import static org.onosproject.net.config.basics.SubjectFactories.CONNECT_POINT_SUBJECT_FACTORY;
28 -import static org.onosproject.net.config.basics.SubjectFactories.DEVICE_SUBJECT_FACTORY;
29 -import static org.slf4j.LoggerFactory.getLogger;
30 -import static org.onosproject.cluster.ClusterMetadata.NO_NAME;
31 -
32 -import java.util.Dictionary;
33 -import java.util.EnumSet;
34 -import java.util.Map;
35 -import java.util.Optional;
36 -import java.util.Properties;
37 -import java.util.Set;
38 -import java.util.concurrent.ConcurrentHashMap;
39 -import java.util.concurrent.ScheduledExecutorService;
40 -
41 import org.apache.felix.scr.annotations.Activate; 21 import org.apache.felix.scr.annotations.Activate;
42 import org.apache.felix.scr.annotations.Component; 22 import org.apache.felix.scr.annotations.Component;
43 import org.apache.felix.scr.annotations.Deactivate; 23 import org.apache.felix.scr.annotations.Deactivate;
...@@ -86,9 +66,28 @@ import org.onosproject.store.service.ConsistentMapException; ...@@ -86,9 +66,28 @@ import org.onosproject.store.service.ConsistentMapException;
86 import org.osgi.service.component.ComponentContext; 66 import org.osgi.service.component.ComponentContext;
87 import org.slf4j.Logger; 67 import org.slf4j.Logger;
88 68
89 -import com.google.common.collect.ImmutableMap; 69 +import java.util.Dictionary;
90 -import com.google.common.collect.ImmutableSet; 70 +import java.util.EnumSet;
91 -import com.google.common.collect.Maps; 71 +import java.util.Map;
72 +import java.util.Optional;
73 +import java.util.Properties;
74 +import java.util.Set;
75 +import java.util.concurrent.ConcurrentHashMap;
76 +import java.util.concurrent.ScheduledExecutorService;
77 +
78 +import static com.google.common.base.Strings.isNullOrEmpty;
79 +import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
80 +import static java.util.concurrent.TimeUnit.SECONDS;
81 +import static org.onlab.packet.Ethernet.TYPE_BSN;
82 +import static org.onlab.packet.Ethernet.TYPE_LLDP;
83 +import static org.onlab.util.Tools.get;
84 +import static org.onlab.util.Tools.groupedThreads;
85 +import static org.onosproject.cluster.ClusterMetadata.NO_NAME;
86 +import static org.onosproject.net.Link.Type.DIRECT;
87 +import static org.onosproject.net.config.basics.SubjectFactories.APP_SUBJECT_FACTORY;
88 +import static org.onosproject.net.config.basics.SubjectFactories.CONNECT_POINT_SUBJECT_FACTORY;
89 +import static org.onosproject.net.config.basics.SubjectFactories.DEVICE_SUBJECT_FACTORY;
90 +import static org.slf4j.LoggerFactory.getLogger;
92 91
93 /** 92 /**
94 * Provider which uses LLDP and BDDP packets to detect network infrastructure links. 93 * Provider which uses LLDP and BDDP packets to detect network infrastructure links.
...@@ -185,7 +184,7 @@ public class LldpLinkProvider extends AbstractProvider implements LinkProvider { ...@@ -185,7 +184,7 @@ public class LldpLinkProvider extends AbstractProvider implements LinkProvider {
185 private ApplicationId appId; 184 private ApplicationId appId;
186 185
187 static final SuppressionRules DEFAULT_RULES 186 static final SuppressionRules DEFAULT_RULES
188 - = new SuppressionRules(EnumSet.of(Device.Type.ROADM), 187 + = new SuppressionRules(EnumSet.of(Device.Type.ROADM, Device.Type.FIBER_SWITCH),
189 ImmutableMap.of(NO_LLDP, SuppressionRules.ANY_VALUE)); 188 ImmutableMap.of(NO_LLDP, SuppressionRules.ANY_VALUE));
190 189
191 private SuppressionRules rules = LldpLinkProvider.DEFAULT_RULES; 190 private SuppressionRules rules = LldpLinkProvider.DEFAULT_RULES;
......