commit | 3baff6785fe7cf2fa4865af5f75b1a9c25bb6bb5 | [log] [tgz] |
---|---|---|
author | Cem Türker <cem.turker@argela.com.tr> | Thu Oct 12 15:09:01 2017 +0300 |
committer | Yuta HIGUCHI <y-higuchi@opennetworking.org> | Thu Oct 19 00:09:28 2017 +0000 |
tree | f43c10879517432468db9ce62fbce21b7bcb4a69 | |
parent | 3ba06869ec6d3c7731296484eff37fdf578a6040 [diff] [blame] |
ONOS-7077 Openflow 1.5 OXS and stat trigger support Change-Id: I006bcd3d8eac451a780c7e5c69a12298ead14281
diff --git a/providers/openflow/meter/src/main/java/org/onosproject/provider/of/meter/impl/OpenFlowMeterProvider.java b/providers/openflow/meter/src/main/java/org/onosproject/provider/of/meter/impl/OpenFlowMeterProvider.java index 3d0dacd..bcacb29 100644 --- a/providers/openflow/meter/src/main/java/org/onosproject/provider/of/meter/impl/OpenFlowMeterProvider.java +++ b/providers/openflow/meter/src/main/java/org/onosproject/provider/of/meter/impl/OpenFlowMeterProvider.java
@@ -339,8 +339,9 @@ meter.setLife(stat.getDurationSec()); meter.setProcessedBytes(stat.getByteInCount().getValue()); meter.setProcessedPackets(stat.getPacketInCount().getValue()); - meter.setReferenceCount(stat.getFlowCount()); - + if (stat.getVersion().getWireVersion() < OFVersion.OF_15.getWireVersion()) { + meter.setReferenceCount(stat.getFlowCount()); + } // marks the meter as seen on the dataplane pendingOperations.invalidate(stat.getMeterId()); return meter;