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)
// Empty request case
}
case multipart-request-meter-stats {
- leaf meter-id {
+ leaf stat-meter-id {
type meter-types:meter-id;
}
}
@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);
}
.setVersion(getVersion())
.setRequestMore(false)
.setMultipartRequestBody(new MultipartRequestMeterStatsBuilder()
- .setMeterId(input.getMeterId())
+ .setStatMeterId(input.getMeterId())
.build())
.build();
}
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;
assertEquals(out.readableBytes(), 0);
}
-}
\ No newline at end of file
+}
.buildRequest(new Xid(Uint32.valueOf(42L)), input))
.getMultipartRequestBody();
- assertEquals(METER_NO, body.getMeterId().getValue());
+ assertEquals(METER_NO, body.getStatMeterId().getValue());
}
@Override