Fix opendaylight-flow-types.yang cases 72/73472/2
authorRobert Varga <robert.varga@pantheon.tech>
Wed, 27 Jun 2018 11:18:43 +0000 (13:18 +0200)
committerRobert Varga <robert.varga@pantheon.tech>
Wed, 27 Jun 2018 11:23:49 +0000 (13:23 +0200)
commit96c6b1a800dc325eddb8c2053cf63cafbb256ea5
tree664eca074b66d041238671997aba8f30e14c79ae
parent201d5692644d27abac4e57e78ef5cfab48a9a791
Fix opendaylight-flow-types.yang cases

The model is invalid, as it is introducing duplicate names into
a choice. Fix this up by adding an intermediate container.

JIRA: OPNFLWPLUG-1020
Change-Id: I76b4822b63df05051bdd3f4787186a5e76480970
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
model/model-flow-base/src/main/yang/opendaylight-flow-types.yang
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/common/MultipartRequestInputFactory.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestFlowAggregateStatsSerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestFlowStatsSerializer.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/singlelayer/SingleLayerAggregateFlowMultipartService.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/FlowDirectStatisticsService.java
openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestFlowAggregateStatsSerializerTest.java
openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestFlowStatsSerializerTest.java
openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/singlelayer/SingleLayerAggregateFlowMultipartServiceTest.java
openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/FlowDirectStatisticsServiceTest.java