mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2026-05-05 20:26:16 +02:00
Code Issues Projects Releases Wiki Activity

Do not send table stats request if unsupported

Browse Source 
Change-Id: Ia66447aad1eeb0a01577215e4c5985526dadd274
This commit is contained in:
Laszlo Papp 2017-12-14 20:05:49 +00:00 committed by Andrea Campanella
parent c45ede5f1c
commit edadbe2574
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowSwitch.java
View File

@ -17,6 +17,7 @@ package org.onosproject.openflow.controller;
import org.onosproject.net.Device;
import org.projectfloodlight.openflow.protocol.OFFactory;
import org.projectfloodlight.openflow.protocol.OFFeaturesReply;
import org.projectfloodlight.openflow.protocol.OFMessage;
import org.projectfloodlight.openflow.protocol.OFMeterFeatures;
import org.projectfloodlight.openflow.protocol.OFPortDesc;
@ -80,6 +81,14 @@ public interface OpenFlowSwitch {
*/
OFMeterFeatures getMeterFeatures();
/**
* Fetches the features of this switch.
* @return unmodifiable features
*/
default OFFeaturesReply features() {
return null;
}
/**
* Provides the factory for this OF version.
* @return OF version specific factory.

5
protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/AbstractOpenFlowSwitch.java
View File

@ -527,6 +527,11 @@ public abstract class AbstractOpenFlowSwitch extends AbstractHandlerBehaviour
}
}
@Override
public OFFeaturesReply features() {
return this.features;
}
@Override
public String manufacturerDescription() {
return this.desc.getMfrDesc();

9
providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/OpenFlowRuleProvider.java
View File

@ -66,6 +66,7 @@ import org.onosproject.provider.of.flow.util.FlowEntryBuilder;
import org.osgi.service.component.ComponentContext;
import org.projectfloodlight.openflow.protocol.OFBadRequestCode;
import org.projectfloodlight.openflow.protocol.OFBarrierRequest;
import org.projectfloodlight.openflow.protocol.OFCapabilities;
import org.projectfloodlight.openflow.protocol.OFErrorMsg;
import org.projectfloodlight.openflow.protocol.OFFlowLightweightStatsReply;
import org.projectfloodlight.openflow.protocol.OFFlowMod;
@ -253,9 +254,11 @@ public class OpenFlowRuleProvider extends AbstractProvider
stopCollectorIfNeeded(simpleCollectors.put(new Dpid(sw.getId()), fsc));
fsc.start();
}
TableStatisticsCollector tsc = new TableStatisticsCollector(timer, sw, flowPollFrequency);
stopCollectorIfNeeded(tableStatsCollectors.put(new Dpid(sw.getId()), tsc));
tsc.start();
if (sw.features().getCapabilities().contains(OFCapabilities.TABLE_STATS)) {
TableStatisticsCollector tsc = new TableStatisticsCollector(timer, sw, flowPollFrequency);
stopCollectorIfNeeded(tableStatsCollectors.put(new Dpid(sw.getId()), tsc));
tsc.start();
}
}
private void stopCollectorIfNeeded(SwitchDataCollector collector) {