Fix meter-id overlap 99/85599/2
authorRobert Varga <robert.varga@pantheon.tech>
Sun, 20 Oct 2019 13:05:24 +0000 (15:05 +0200)
committerRobert Varga <nite@hq.sk>
Thu, 7 Nov 2019 08:04:33 +0000 (08:04 +0000)
commite2c931cd748cbcfc0dbfab7b8d97061507aacc92
tree347e72163479fc5329c41557cfffc406d06bddf2
parent2969d04b06e68a842d3766c48e1b9e2fabd8f9cb
Fix meter-id overlap

Adding meter-id leaf in two cases is not valid YANG, fix that up.

Change-Id: Icbdf91015d28061548bac3aa0f1f94e1668aaa91
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit d9f901335a6fd2ff660545d4e85497fd64f7d533)
model/model-flow-statistics/src/main/yang/opendaylight-meter-statistics.yang
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestMeterStatsSerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/MeterDirectStatisticsService.java
openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestMeterStatsSerializerTest.java
openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/MeterDirectStatisticsServiceTest.java