From e2c931cd748cbcfc0dbfab7b8d97061507aacc92 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Sun, 20 Oct 2019 15:05:24 +0200
Subject: [PATCH] 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)
---
 .../src/main/yang/opendaylight-meter-statistics.yang          | 2 +-
 .../multipart/MultipartRequestMeterStatsSerializer.java       | 2 +-
 .../direct/singlelayer/MeterDirectStatisticsService.java      | 2 +-
 .../multipart/MultipartRequestMeterStatsSerializerTest.java   | 4 ++--
 .../direct/singlelayer/MeterDirectStatisticsServiceTest.java  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/model/model-flow-statistics/src/main/yang/opendaylight-meter-statistics.yang b/model/model-flow-statistics/src/main/yang/opendaylight-meter-statistics.yang
index a41176e7d5..d764f7261a 100644
--- a/model/model-flow-statistics/src/main/yang/opendaylight-meter-statistics.yang
+++ b/model/model-flow-statistics/src/main/yang/opendaylight-meter-statistics.yang
@@ -148,7 +148,7 @@ module opendaylight-meter-statistics {
             // Empty request case
         }
         case multipart-request-meter-stats {
-            leaf meter-id {
+            leaf stat-meter-id {
                 type meter-types:meter-id;
             }
         }
diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestMeterStatsSerializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestMeterStatsSerializer.java
index 4230f24d35..40453b3980 100644
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestMeterStatsSerializer.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestMeterStatsSerializer.java
@@ -22,7 +22,7 @@ public class MultipartRequestMeterStatsSerializer implements OFSerializer<Multip
     @Override
     public void serialize(final MultipartRequestMeterStats multipartRequestMeterStats, final ByteBuf byteBuf) {
         byteBuf.writeInt(MoreObjects
-            .firstNonNull(multipartRequestMeterStats.getMeterId(), new MeterId(OFConstants.OFPM_ALL))
+            .firstNonNull(multipartRequestMeterStats.getStatMeterId(), new MeterId(OFConstants.OFPM_ALL))
                 .getValue().intValue());
         byteBuf.writeZero(PADDING_IN_MULTIPART_REQUEST_METER_BODY);
     }
diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/MeterDirectStatisticsService.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/MeterDirectStatisticsService.java
index 4c7dc1daf0..c0193904cd 100644
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/MeterDirectStatisticsService.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/MeterDirectStatisticsService.java
@@ -53,7 +53,7 @@ public class MeterDirectStatisticsService extends AbstractMeterDirectStatisticsS
             .setVersion(getVersion())
             .setRequestMore(false)
             .setMultipartRequestBody(new MultipartRequestMeterStatsBuilder()
-                .setMeterId(input.getMeterId())
+                .setStatMeterId(input.getMeterId())
                 .build())
             .build();
     }
diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestMeterStatsSerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestMeterStatsSerializerTest.java
index 788b8fd659..18f6ad529d 100644
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestMeterStatsSerializerTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestMeterStatsSerializerTest.java
@@ -24,7 +24,7 @@ public class MultipartRequestMeterStatsSerializerTest extends AbstractSerializer
     private static final byte PADDING_IN_MULTIPART_REQUEST_METER_BODY = 4;
     private static final long METER_ID = 42;
     private static final MultipartRequestMeterStats BODY = new MultipartRequestMeterStatsBuilder()
-            .setMeterId(new MeterId(METER_ID))
+            .setStatMeterId(new MeterId(METER_ID))
             .build();
 
     private MultipartRequestMeterStatsSerializer serializer;
@@ -45,4 +45,4 @@ public class MultipartRequestMeterStatsSerializerTest extends AbstractSerializer
         assertEquals(out.readableBytes(), 0);
     }
 
-}
\ No newline at end of file
+}
diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/MeterDirectStatisticsServiceTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/MeterDirectStatisticsServiceTest.java
index 5ccb4d506f..d61b1cf118 100644
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/MeterDirectStatisticsServiceTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/MeterDirectStatisticsServiceTest.java
@@ -62,7 +62,7 @@ public class MeterDirectStatisticsServiceTest extends AbstractDirectStatisticsSe
             .buildRequest(new Xid(Uint32.valueOf(42L)), input))
             .getMultipartRequestBody();
 
-        assertEquals(METER_NO, body.getMeterId().getValue());
+        assertEquals(METER_NO, body.getStatMeterId().getValue());
     }
 
     @Override
-- 
2.36.6