From 59bf5b768c4bcc0a7d25101e8b25d82e5af4be38 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 1 Jun 2021 13:19:07 +0200 Subject: [PATCH] Update MRI upstreams for Phosphorus Adopt latest versions, namely; - odlparent-9.0.2 - infrautils-2.0.2 - mdsal-8.0.0 - controller-4.0.0 - aaa-0.14.0 - netconf-2.0.0 Also introduce model-{inventory,topology}, which were removed from upstream. Since these versions also force the Uint8/Uint32 vs. Short/Long equivalence issue, we mass-migrate all APIs to use Uint constructs. This in turn requires minor adjustments to mocks, as we no longer get automatic smart zeroes. Another thing that is cropping up here is that augment-identifier is now reflected in package names properly, requiring a proper update of imports and references. Change-Id: If3fc2bf0bb29ed4c313ad4489ab90ecd383df7d0 Signed-off-by: Robert Varga --- applications/arbitratorreconciliation/pom.xml | 2 +- applications/bulk-o-matic/pom.xml | 2 +- applications/forwardingrules-sync/pom.xml | 2 +- .../SyncPlanPushStrategyFlatBatchImpl.java | 90 ++-- ...SyncPlanPushStrategyFlatBatchImplTest.java | 36 +- applications/lldp-speaker/pom.xml | 2 +- applications/notification-supplier/pom.xml | 2 +- .../supplier/NotificationProvider.java | 2 +- .../MeterStatNotificationSupplierImpl.java | 2 +- ...MeterStatNotificationSupplierImplTest.java | 8 +- applications/of-switch-config-pusher/pom.xml | 2 +- applications/pom.xml | 2 +- applications/table-miss-enforcer/pom.xml | 2 +- applications/topology-lldp-discovery/pom.xml | 4 +- applications/topology-manager/pom.xml | 4 +- artifacts/pom.xml | 12 +- distribution/karaf/pom.xml | 2 +- drop-test-karaf/pom.xml | 2 +- .../features-openflowplugin-extension/pom.xml | 2 +- .../pom.xml | 2 +- .../odl-openflowplugin-nxm-extensions/pom.xml | 2 +- .../odl-openflowplugin-onf-extensions/pom.xml | 2 +- .../features-extension-aggregator/pom.xml | 2 +- .../codec/match/Icmpv6NDOptionsTypeCodec.java | 12 +- .../codec/match/Icmpv6NDReservedCodec.java | 12 +- .../src/main/yang/eric-match.yang | 7 +- ...EricExtensionCodecRegistratorImplTest.java | 3 +- .../eric/EricExtensionsRegistratorTest.java | 16 +- .../match/Icmpv6NDOptionsTypeCodecTest.java | 4 +- .../match/Icmpv6NDReservedCodecTest.java | 4 +- .../nx/api/NiciraActionDeserializerKey.java | 26 +- .../nx/api/NiciraActionSerializerKey.java | 28 +- .../api/NiciraActionDeserializerKeyTest.java | 7 +- .../nx/api/NiciraActionSerializerKeyTest.java | 8 +- .../NiciraExtensionCodecRegistratorImpl.java | 42 +- .../nx/codec/action/ActionDeserializer.java | 18 +- .../nx/codec/action/ConntrackCodec.java | 8 +- .../nx/codec/action/CtClearCodec.java | 13 +- .../nx/codec/action/DecNshTtlCodec.java | 13 +- .../nx/codec/action/DecapCodec.java | 12 +- .../nx/codec/action/EncapCodec.java | 12 +- .../nx/codec/action/FinTimeoutCodec.java | 8 +- .../nx/codec/action/LearnCodec.java | 9 +- .../nx/codec/action/LearnCodecUtil.java | 2 +- .../nx/codec/action/MultipathCodec.java | 8 +- .../nx/codec/action/OutputReg2Codec.java | 8 +- .../nx/codec/action/OutputRegCodec.java | 8 +- .../nx/codec/action/RegLoad2Codec.java | 23 +- .../nx/codec/action/RegLoadCodec.java | 8 +- .../nx/codec/action/RegMoveCodec.java | 8 +- .../nx/codec/action/ResubmitCodec.java | 10 +- .../match/AbstractExperimenterMatchCodec.java | 13 +- .../nx/codec/match/AbstractNshcCodec.java | 10 +- .../nx/codec/match/AbstractRegCodec.java | 4 +- .../nx/codec/match/ArpOpCodec.java | 12 +- .../nx/codec/match/ArpShaCodec.java | 12 +- .../nx/codec/match/ArpSpaCodec.java | 12 +- .../nx/codec/match/ArpThaCodec.java | 12 +- .../nx/codec/match/ArpTpaCodec.java | 12 +- .../nx/codec/match/CtMarkCodec.java | 8 +- .../nx/codec/match/CtStateCodec.java | 12 +- .../nx/codec/match/CtTpDstCodec.java | 12 +- .../nx/codec/match/CtTpSrcCodec.java | 12 +- .../nx/codec/match/CtZoneCodec.java | 12 +- .../nx/codec/match/EthDstCodec.java | 12 +- .../nx/codec/match/EthSrcCodec.java | 12 +- .../nx/codec/match/EthTypeCodec.java | 12 +- .../nx/codec/match/IcmpTypeCodec.java | 12 +- .../nx/codec/match/InPortCodec.java | 10 +- .../nx/codec/match/IpDstCodec.java | 12 +- .../nx/codec/match/IpSrcCodec.java | 12 +- .../nx/codec/match/Ipv6DstCodec.java | 12 +- .../nx/codec/match/Ipv6SrcCodec.java | 12 +- .../nx/codec/match/MetadataCodec.java | 12 +- .../nx/codec/match/MplsLabelCodec.java | 8 +- .../nx/codec/match/NshFlagsCodec.java | 15 +- .../nx/codec/match/NshMdtypeCodec.java | 14 +- .../nx/codec/match/NshNpCodec.java | 14 +- .../nx/codec/match/NshTtlCodec.java | 10 +- .../nx/codec/match/Nshc1Codec.java | 5 +- .../nx/codec/match/Nshc2Codec.java | 5 +- .../nx/codec/match/Nshc3Codec.java | 5 +- .../nx/codec/match/Nshc4Codec.java | 5 +- .../openflowjava/nx/codec/match/NsiCodec.java | 10 +- .../openflowjava/nx/codec/match/NspCodec.java | 14 +- .../nx/codec/match/PktMarkCodec.java | 12 +- .../nx/codec/match/Reg0Codec.java | 6 +- .../nx/codec/match/Reg1Codec.java | 6 +- .../nx/codec/match/Reg2Codec.java | 6 +- .../nx/codec/match/Reg3Codec.java | 6 +- .../nx/codec/match/Reg4Codec.java | 6 +- .../nx/codec/match/Reg5Codec.java | 6 +- .../nx/codec/match/Reg6Codec.java | 5 +- .../nx/codec/match/Reg7Codec.java | 6 +- .../nx/codec/match/TcpDstCodec.java | 8 +- .../nx/codec/match/TcpSrcCodec.java | 12 +- .../nx/codec/match/TunIdCodec.java | 8 +- .../nx/codec/match/TunIpv4DstCodec.java | 13 +- .../nx/codec/match/TunIpv4SrcCodec.java | 13 +- .../nx/codec/match/UdpDstCodec.java | 12 +- .../nx/codec/match/UdpSrcCodec.java | 12 +- ...ciraExtensionCodecRegistratorImplTest.java | 3 +- .../nx/NiciraExtensionsRegistratorTest.java | 420 +++++++++--------- .../codec/action/ActionDeserializerTest.java | 9 +- .../nx/codec/action/ConntrackCodecTest.java | 4 +- .../nx/codec/action/CtClearCodecTest.java | 6 +- .../nx/codec/action/DecNshTtlCodecTest.java | 7 +- .../nx/codec/action/DecapCodecTest.java | 7 +- .../nx/codec/action/EncapCodecTest.java | 6 +- .../nx/codec/action/FinTimeoutCodecTest.java | 9 +- .../nx/codec/action/LearnCodecTest.java | 8 +- .../nx/codec/action/MultipathCodecTest.java | 7 +- .../nx/codec/action/OutputReg2CodecTest.java | 4 +- .../nx/codec/action/OutputRegCodecTest.java | 6 +- .../nx/codec/action/RegLoad2CodecTest.java | 12 +- .../nx/codec/action/RegLoadCodecTest.java | 6 +- .../nx/codec/action/RegMoveCodecTest.java | 8 +- .../nx/codec/action/ResubmitCodecTest.java | 8 +- .../AbstractExperimenterMatchCodecTest.java | 10 +- .../nx/codec/match/AbstractNshcCodecTest.java | 6 +- .../nx/codec/match/ArpOpCodecTest.java | 4 +- .../nx/codec/match/ArpShaCodecTest.java | 4 +- .../nx/codec/match/ArpSpaCodecTest.java | 4 +- .../nx/codec/match/ArpThaCodecTest.java | 4 +- .../nx/codec/match/ArpTpaCodecTest.java | 4 +- .../nx/codec/match/CtStateCodecTest.java | 4 +- .../nx/codec/match/CtTpDstCodecTest.java | 4 +- .../nx/codec/match/CtTpSrcCodecTest.java | 4 +- .../nx/codec/match/CtZoneCodecTest.java | 4 +- .../nx/codec/match/EthDstCodecTest.java | 4 +- .../nx/codec/match/EthSrcCodecTest.java | 4 +- .../nx/codec/match/EthTypeCodecTest.java | 4 +- .../nx/codec/match/IcmpTypeCodecTest.java | 4 +- .../nx/codec/match/IpDstCodecTest.java | 4 +- .../nx/codec/match/IpSrcCodecTest.java | 4 +- .../nx/codec/match/Ipv6DstCodecTest.java | 4 +- .../nx/codec/match/Ipv6SrcCodecTest.java | 4 +- .../nx/codec/match/MetadataCodecTest.java | 2 +- .../nx/codec/match/NshFlagsCodecTest.java | 10 +- .../nx/codec/match/NshMdtypeCodecTest.java | 10 +- .../nx/codec/match/NshNpCodecTest.java | 10 +- .../nx/codec/match/NshTtlCodecTest.java | 6 +- .../nx/codec/match/NsiCodecTest.java | 10 +- .../nx/codec/match/NspCodecTest.java | 6 +- .../nx/codec/match/PktMarkCodecTest.java | 4 +- .../nx/codec/match/Reg0CodecTest.java | 4 +- .../nx/codec/match/Reg1CodecTest.java | 4 +- .../nx/codec/match/Reg2CodecTest.java | 4 +- .../nx/codec/match/Reg3CodecTest.java | 4 +- .../nx/codec/match/Reg4CodecTest.java | 4 +- .../nx/codec/match/Reg5CodecTest.java | 4 +- .../nx/codec/match/Reg6CodecTest.java | 4 +- .../nx/codec/match/Reg7CodecTest.java | 4 +- .../nx/codec/match/TcpDstCodecTest.java | 4 +- .../nx/codec/match/TcpSrcCodecTest.java | 4 +- .../nx/codec/match/TunIdCodecTest.java | 4 +- .../nx/codec/match/TunIpv4DstCodecTest.java | 4 +- .../nx/codec/match/TunIpv4SrcCodecTest.java | 4 +- .../nx/codec/match/UdpDstCodecTest.java | 4 +- .../nx/codec/match/UdpSrcCodecTest.java | 4 +- .../openflowplugin-extension-api/pom.xml | 2 +- .../extension/api/ConverterExtensionKey.java | 4 +- .../api/ConverterMessageToOFJava.java | 3 +- .../extension/api/ConvertorData.java | 15 +- .../extension/api/ExtensionConvertorData.java | 3 +- .../extension/api/TypeVersionKey.java | 23 +- .../extension/api/TypeVersionKeyTest.java | 9 +- .../openflowplugin-extension-eric/pom.xml | 2 +- .../vendor/eric/EricExtensionProvider.java | 6 +- .../match/Icmpv6NDOptionsTypeConvertor.java | 12 +- .../match/Icmpv6NDReservedConvertor.java | 14 +- .../eric/convertor/match/MatchUtil.java | 8 +- .../openflowplugin-extension-eric-match.yang | 4 +- .../Icmpv6NDOptionsTypeConvertorTest.java | 5 +- .../match/Icmpv6NDReservedConvertorTest.java | 4 +- .../openflowplugin-extension-nicira/pom.xml | 2 +- .../nicira/NiciraExtensionProvider.java | 112 ++--- .../convertor/action/ConntrackConvertor.java | 5 +- .../convertor/action/CtClearConvertor.java | 9 +- .../convertor/action/DecNshTtlConvertor.java | 9 +- .../convertor/action/DecapConvertor.java | 11 +- .../convertor/action/EncapConvertor.java | 11 +- .../convertor/action/FinTimeoutConvertor.java | 5 +- .../convertor/action/LearnConvertor.java | 5 +- .../convertor/action/MultipathConvertor.java | 5 +- .../convertor/action/OutputReg2Convertor.java | 9 +- .../convertor/action/OutputRegConvertor.java | 4 +- .../convertor/action/RegLoad2Convertor.java | 18 +- .../convertor/action/RegLoadConvertor.java | 4 +- .../convertor/action/RegMoveConvertor.java | 4 +- .../convertor/action/ResubmitConvertor.java | 5 +- .../convertor/match/ArpOpConvertor.java | 10 +- .../convertor/match/ArpShaConvertor.java | 12 +- .../convertor/match/ArpSpaConvertor.java | 4 +- .../convertor/match/ArpThaConvertor.java | 12 +- .../convertor/match/ArpTpaConvertor.java | 4 +- .../convertor/match/CtMarkConvertor.java | 12 +- .../convertor/match/CtStateConvertor.java | 19 +- .../convertor/match/CtTpDstConvertor.java | 12 +- .../convertor/match/CtTpSrcConvertor.java | 12 +- .../convertor/match/CtZoneConvertor.java | 12 +- .../convertor/match/EthDstConvertor.java | 12 +- .../convertor/match/EthSrcConvertor.java | 12 +- .../convertor/match/EthTypeConvertor.java | 12 +- .../nicira/convertor/match/MatchUtil.java | 11 +- .../convertor/match/NshFlagsConvertor.java | 18 +- .../convertor/match/NshMdtypeConvertor.java | 18 +- .../convertor/match/NshNpConvertor.java | 18 +- .../convertor/match/NshTtlConvertor.java | 18 +- .../convertor/match/Nshc1Convertor.java | 9 +- .../convertor/match/Nshc2Convertor.java | 15 +- .../convertor/match/Nshc3Convertor.java | 16 +- .../convertor/match/Nshc4Convertor.java | 16 +- .../nicira/convertor/match/NsiConvertor.java | 16 +- .../nicira/convertor/match/NspConvertor.java | 16 +- .../convertor/match/NxmInPortConvertor.java | 22 +- .../convertor/match/PktMarkConvertor.java | 12 +- .../nicira/convertor/match/RegConvertor.java | 4 +- .../convertor/match/TcpDstConvertor.java | 12 +- .../convertor/match/TcpSrcConvertor.java | 15 +- .../convertor/match/TunIPv4DstConvertor.java | 4 +- .../convertor/match/TunIPv4SrcConvertor.java | 4 +- .../convertor/match/TunIdConvertor.java | 4 +- .../convertor/match/UdpDstConvertor.java | 12 +- .../convertor/match/UdpSrcConvertor.java | 12 +- ...openflowplugin-extension-nicira-match.yang | 2 +- .../action/ConntrackConvertorTest.java | 4 +- .../action/CtClearConvertorTest.java | 7 +- .../action/DecNshTtlConvertorTest.java | 3 +- .../convertor/action/DecapConvertorTest.java | 3 +- .../convertor/action/EncapConvertorTest.java | 3 +- .../action/FinTimeoutConvertorTest.java | 2 +- .../action/MultipathConvertorTest.java | 2 +- .../action/OutputReg2ConvertorTest.java | 3 +- .../action/OutputRegConvertorTest.java | 2 +- .../action/RegLoad2ConvertorTest.java | 31 +- .../action/RegLoadConvertorTest.java | 2 +- .../action/RegMoveConvertorTest.java | 3 +- .../action/ResubmitConvertorTest.java | 2 +- .../convertor/match/ArpOpConvertorTest.java | 2 +- .../convertor/match/ArpShaConvertorTest.java | 4 +- .../convertor/match/ArpSpaConvertorTest.java | 4 +- .../convertor/match/ArpThaConvertorTest.java | 4 +- .../convertor/match/ArpTpaConvertorTest.java | 4 +- .../convertor/match/CtStateConvertorTest.java | 4 +- .../convertor/match/CtZoneConvertorTest.java | 4 +- .../convertor/match/EthDstConvertorTest.java | 4 +- .../convertor/match/EthSrcConvertorTest.java | 4 +- .../convertor/match/EthTypeConvertorTest.java | 4 +- .../match/NshFlagsConvertorTest.java | 4 +- .../match/NshMdtypeConvertorTest.java | 4 +- .../convertor/match/NshNpConvertorTest.java | 4 +- .../convertor/match/NshTtlConvertorTest.java | 4 +- .../convertor/match/Nshc1ConvertorTest.java | 4 +- .../convertor/match/Nshc2ConvertorTest.java | 4 +- .../convertor/match/Nshc3ConvertorTest.java | 4 +- .../convertor/match/Nshc4ConvertorTest.java | 4 +- .../convertor/match/NsiConvertorTest.java | 4 +- .../convertor/match/NspConvertorTest.java | 4 +- .../convertor/match/TcpDstConvertorTest.java | 4 +- .../convertor/match/TcpSrcConvertorTest.java | 4 +- .../match/TunIPv4DstConvertorTest.java | 4 +- .../match/TunIPv4SrcConvertorTest.java | 4 +- .../convertor/match/TunIdConvertorTest.java | 4 +- .../convertor/match/UdpDstConvertorTest.java | 4 +- .../convertor/match/UdpSrcConvertorTest.java | 4 +- .../extension/onf/OnfConstants.java | 8 +- .../extension/onf/OnfExtensionProvider.java | 8 +- .../converter/BundleAddMessageConverter.java | 3 +- .../onf/converter/BundleControlConverter.java | 3 +- .../deserializer/BundleControlFactory.java | 2 +- .../AbstractBundleMessageFactory.java | 13 +- .../serializer/BundleAddMessageFactory.java | 22 +- .../BundleAddMessageConverterTest.java | 2 +- .../converter/BundleControlConverterTest.java | 10 +- extension/pom.xml | 2 +- extension/test-extension/pom.xml | 2 +- .../features-openflowplugin/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../odl-openflowplugin-app-topology/pom.xml | 2 +- .../odl-openflowplugin-drop-test/pom.xml | 2 +- .../pom.xml | 4 +- .../odl-openflowplugin-flow-services/pom.xml | 2 +- .../odl-openflowplugin-libraries/pom.xml | 2 +- .../src/main/feature/feature.xml | 2 +- .../odl-openflowplugin-nsf-model/pom.xml | 31 +- .../src/main/feature/feature.xml | 4 +- .../odl-openflowplugin-southbound/pom.xml | 6 +- .../src/main/feature/feature.xml | 4 +- features-aggregator/pom.xml | 2 +- libraries/pom.xml | 2 +- model/model-flow-base/pom.xml | 2 +- model/model-flow-service/pom.xml | 2 +- model/model-flow-statistics/pom.xml | 2 +- model/model-inventory/pom.xml | 41 ++ .../src/main/yang/opendaylight-inventory.yang | 251 +++++++++++ model/model-topology/pom.xml | 41 ++ .../yang/opendaylight-topology-inventory.yang | 34 ++ model/pom.xml | 4 +- .../features-openflowjava/pom.xml | 2 +- .../odl-openflowjava-protocol/pom.xml | 6 +- .../src/main/feature/feature.xml | 6 +- .../features-openflowjava-aggregator/pom.xml | 2 +- .../api/connection/OutboundQueue.java | 7 +- .../api/connection/OutboundQueueHandler.java | 3 +- .../extensibility/EnhancedMessageCodeKey.java | 6 +- .../extensibility/EnhancedMessageTypeKey.java | 5 +- .../api/keys/ActionDeserializerKey.java | 18 +- .../api/keys/ActionSerializerKey.java | 16 +- .../ExperimenterActionDeserializerKey.java | 5 +- .../keys/ExperimenterActionSerializerKey.java | 12 +- .../keys/ExperimenterIdDeserializerKey.java | 18 +- ...perimenterIdMeterSubTypeSerializerKey.java | 16 +- .../api/keys/ExperimenterIdSerializerKey.java | 19 +- .../ExperimenterIdTypeDeserializerKey.java | 10 +- .../keys/ExperimenterIdTypeSerializerKey.java | 9 +- ...xperimenterInstructionDeserializerKey.java | 5 +- .../ExperimenterInstructionSerializerKey.java | 5 +- .../api/keys/InstructionDeserializerKey.java | 12 +- .../api/keys/InstructionSerializerKey.java | 19 +- .../api/keys/MatchEntryDeserializerKey.java | 10 +- .../api/keys/MatchEntrySerializerKey.java | 22 +- .../protocol/api/keys/MessageCodeKey.java | 34 +- .../protocol/api/keys/MessageTypeKey.java | 23 +- .../protocol/api/keys/TypeToClassKey.java | 21 +- .../EnhancedMessageCodeKeyTest.java | 20 +- .../EnhancedMessageTypeKeyTest.java | 26 +- .../api/extensibility/MessageCodeKeyTest.java | 22 +- .../api/extensibility/MessageTypeKeyTest.java | 20 +- .../api/keys/ActionDeserializerKeyTest.java | 21 +- .../api/keys/ActionSerializerKeyTest.java | 26 +- .../keys/InstructionDeserializerKeyTest.java | 22 +- .../keys/InstructionSerializerKeyTest.java | 26 +- .../protocol/api/keys/KeysTest.java | 28 +- .../keys/MatchEntryDeserializerKeyTest.java | 21 +- .../api/keys/MatchEntrySerializerKeyTest.java | 28 +- .../protocol/api/keys/TypeToClassKeyTest.java | 8 +- ...ExperimenterActionDeserializerKeyTest.java | 12 +- .../ExperimenterActionSerializerKeyTest.java | 20 +- .../ExperimenterIdDeserializerKeyTest.java | 37 +- .../ExperimenterIdSerializerKeyTest.java | 32 +- ...ExperimenterIdTypeDeserializerKeyTest.java | 38 +- .../ExperimenterIdTypeSerializerKeyTest.java | 38 +- ...imenterInstructionDeserializerKeyTest.java | 11 +- ...erimenterInstructionSerializerKeyTest.java | 13 +- .../impl/core/OFDatagramPacketDecoder.java | 2 +- .../impl/core/OFDatagramPacketEncoder.java | 8 +- .../impl/core/OFDatagramPacketHandler.java | 18 +- .../protocol/impl/core/OFEncoder.java | 2 +- .../protocol/impl/core/OFVersionDetector.java | 17 +- .../impl/core/VersionMessageUdpWrapper.java | 4 +- .../impl/core/VersionMessageWrapper.java | 9 +- .../AbstractStackedOutboundQueue.java | 12 +- .../core/connection/OutboundQueueManager.java | 3 +- .../core/connection/StackedOutboundQueue.java | 10 +- .../StackedOutboundQueueNoBarrier.java | 6 +- .../ActionDeserializerInitializer.java | 4 +- .../DeserializationFactory.java | 3 +- .../DeserializerRegistryImpl.java | 10 +- .../InstructionDeserializerInitializer.java | 4 +- .../MatchEntryDeserializerInitializer.java | 4 +- .../TypeToClassMapInitializer.java | 16 +- .../OF13SetFieldActionDeserializer.java | 2 +- .../factories/ErrorMessageFactory.java | 5 +- .../factories/ExperimenterMessageFactory.java | 2 +- .../factories/FlowModInputMessageFactory.java | 4 +- .../factories/FlowRemovedMessageFactory.java | 2 +- .../GroupModInputMessageFactory.java | 6 +- .../MeterModInputMessageFactory.java | 5 +- .../MultipartReplyMessageFactory.java | 26 +- .../MultipartRequestInputMessageFactory.java | 61 +-- .../OF10FlowModInputMessageFactory.java | 10 +- .../OF10FlowRemovedMessageFactory.java | 6 +- .../OF10PacketOutInputMessageFactory.java | 6 +- .../OF10StatsReplyMessageFactory.java | 24 +- .../OF10StatsRequestInputFactory.java | 26 +- .../factories/PacketInMessageFactory.java | 2 +- .../PacketOutInputMessageFactory.java | 6 +- .../QueueGetConfigReplyMessageFactory.java | 13 +- .../factories/VendorMessageFactory.java | 6 +- ...AbstractActionInstructionDeserializer.java | 6 +- ...OxmExperimenterMatchEntryDeserializer.java | 4 +- .../match/ext/OnfOxmTcpFlagsDeserializer.java | 4 +- .../serialization/ActionsInitializer.java | 4 +- .../AdditionalMessageFactoryInitializer.java | 7 +- .../InstructionsInitializer.java | 6 +- .../MatchEntriesInitializer.java | 4 +- .../MessageFactoryInitializer.java | 6 +- .../serialization/SerializationFactory.java | 6 +- .../serialization/SerializerRegistryImpl.java | 20 +- .../action/OF13SetFieldActionSerializer.java | 6 +- .../ExperimenterInputMessageFactory.java | 10 +- .../factories/FlowModInputMessageFactory.java | 10 +- .../factories/FlowRemovedMessageFactory.java | 7 +- .../GroupModInputMessageFactory.java | 12 +- .../MeterModInputMessageFactory.java | 7 +- .../MultipartReplyMessageFactory.java | 19 +- .../MultipartRequestInputFactory.java | 26 +- .../OF10FlowModInputMessageFactory.java | 6 +- .../OF10FlowRemovedMessageFactory.java | 7 +- .../OF10PacketOutInputMessageFactory.java | 10 +- .../OF10StatsReplyMessageFactory.java | 4 +- .../OF10StatsRequestInputFactory.java | 13 +- .../factories/PacketInMessageFactory.java | 5 +- .../PacketOutInputMessageFactory.java | 8 +- .../factories/PortModInputMessageFactory.java | 6 +- .../factories/VendorInputMessageFactory.java | 10 +- .../AbstractActionInstructionSerializer.java | 3 +- ...ctOxmExperimenterMatchEntrySerializer.java | 2 +- .../match/ext/OnfOxmTcpFlagsSerializer.java | 4 +- .../impl/util/AbstractCodeKeyMaker.java | 13 +- .../impl/util/AbstractTypeKeyMaker.java | 13 +- .../ActionDeserializerRegistryHelper.java | 15 +- .../util/ActionSerializerRegistryHelper.java | 10 +- .../impl/util/CodeKeyMakerFactory.java | 7 +- .../util/CommonMessageRegistryHelper.java | 12 +- ...InstructionDeserializerRegistryHelper.java | 15 +- .../InstructionSerializerRegistryHelper.java | 17 +- .../protocol/impl/util/MatchDeserializer.java | 7 +- .../MatchEntryDeserializerRegistryHelper.java | 10 +- .../MatchEntrySerializerRegistryHelper.java | 9 +- .../impl/util/OF13MatchSerializer.java | 4 +- .../SimpleDeserializerRegistryHelper.java | 9 +- .../impl/util/TypeKeyMakerFactory.java | 9 +- .../impl/util/TypeToClassInitHelper.java | 13 +- .../core/OFDatagramPacketDecoderTest.java | 2 +- .../core/OFDatagramPacketHandlerTest.java | 4 +- .../impl/core/OFDecoderStatisticsTest.java | 10 +- .../protocol/impl/core/OFDecoderTest.java | 10 +- .../impl/core/OFEncoderStatisticsTest.java | 3 +- .../protocol/impl/core/OFEncoderTest.java | 3 +- .../core/VersionMessageUdpWrapperTest.java | 6 +- .../SwitchConnectionProviderImpl02Test.java | 53 +-- .../DeserializationFactoryTest.java | 6 +- .../DeserializerRegistryImplTest.java | 19 +- .../TypeToClassMapInitializerTest.java | 19 +- .../BarrierInputMessageFactoryTest.java | 18 +- .../BarrierReplyMessageFactoryTest.java | 18 +- .../EchoReplyMessageFactoryTest.java | 13 +- .../EchoRequestMessageFactoryTest.java | 13 +- .../FeaturesReplyMessageFactoryTest.java | 3 +- .../FlowModInputMessageFactoryTest.java | 2 +- .../FlowRemovedMessageFactoryTest.java | 2 +- .../GetAsyncReplyMessageFactoryTest.java | 3 +- .../GetAsyncRequestMessageFactoryTest.java | 2 +- .../GetConfigInputMessageFactoryTest.java | 13 +- .../GetConfigReplyMessageFactoryTest.java | 14 +- .../GetFeaturesInputFactoryTest.java | 2 +- ...GetQueueConfigInputMessageFactoryTest.java | 4 +- .../GroupModInputMessageFactoryTest.java | 2 +- .../factories/HelloMessageFactoryTest.java | 12 +- .../MeterModInputMessageFactoryTest.java | 2 +- .../MultipartReplyMessageFactoryTest.java | 2 +- ...questAggregateInputMessageFactoryTest.java | 2 +- ...artRequestDescInputMessageFactoryTest.java | 2 +- ...artRequestFlowInputMessageFactoryTest.java | 2 +- ...rtRequestGroupInputMessageFactoryTest.java | 2 +- ...estMeterConfigInputMessageFactoryTest.java | 2 +- ...rtRequestMeterInputMessageFactoryTest.java | 2 +- ...questPortStatsInputMessageFactoryTest.java | 2 +- ...rtRequestQueueInputMessageFactoryTest.java | 2 +- ...tTableFeaturesInputMessageFactoryTest.java | 6 +- ...rtRequestTableInputMessageFactoryTest.java | 2 +- .../OF10ErrorMessageFactoryTest.java | 2 +- .../OF10FeaturesReplyMessageFactoryTest.java | 3 +- ...OF10FeaturesRequestMessageFactoryTest.java | 2 +- .../OF10FlowModInputMessageFactoryTest.java | 2 +- .../OF10FlowRemovedMessageFactoryTest.java | 2 +- ...GetQueueConfigInputMessageFactoryTest.java | 2 +- .../OF10HelloMessageFactoryTest.java | 3 +- .../OF10PacketInMessageFactoryTest.java | 2 +- .../OF10PacketOutInputMessageFactoryTest.java | 2 +- .../OF10PortModInputMessageFactoryTest.java | 2 +- .../OF10PortStatusMessageFactoryTest.java | 2 +- ...QueueGetConfigReplyMessageFactoryTest.java | 3 +- .../OF10StatsReplyMessageFactoryTest.java | 2 +- ...StatsRequestInputAggregateFactoryTest.java | 2 +- .../OF10StatsRequestInputDescFactoryTest.java | 2 +- .../OF10StatsRequestInputFlowFactoryTest.java | 2 +- ...StatsRequestInputPortStatsFactoryTest.java | 2 +- ...OF10StatsRequestInputQueueFactoryTest.java | 2 +- ...OF10StatsRequestInputTableFactoryTest.java | 2 +- .../factories/PacketInMessageFactoryTest.java | 2 +- .../PacketOutInputMessageFactoryTest.java | 2 +- .../PortModInputMessageFactoryTest.java | 2 +- .../PortStatusMessageFactoryTest.java | 2 +- ...GetConfigReplyMessageFactoryMultiTest.java | 2 +- ...QueueGetConfigReplyMessageFactoryTest.java | 3 +- .../RoleReplyMessageFactoryTest.java | 3 +- .../RoleRequestInputMessageFactoryTest.java | 2 +- .../SetAsyncInputMessageFactoryTest.java | 2 +- .../SetConfigInputMessageFactoryTest.java | 13 +- .../TableModInputMessageFactoryTest.java | 2 +- .../multipart/MultipartReplyFlowTest.java | 2 +- .../MultipartReplyTableFeaturesTest.java | 2 +- .../SerializationFactoryTest.java | 5 +- .../SerializerRegistryImplTest.java | 17 +- .../OF13SetFieldActionSerializerTest.java | 6 +- .../BarrierInputMessageFactoryTest.java | 5 +- .../BarrierReplyMessageFactoryTest.java | 2 +- .../EchoInputMessageFactoryTest.java | 3 +- .../EchoOutputMessageFactoryTest.java | 2 +- .../EchoReplyInputMessageFactoryTest.java | 5 +- .../EchoRequestMessageFactoryTest.java | 2 +- .../factories/ErrorMessageFactoryTest.java | 2 +- .../FlowModInputMessageFactoryTest.java | 3 +- .../FlowRemovedMessageFactoryTest.java | 3 +- .../GetAsyncReplyMessageFactoryTest.java | 3 +- .../GetConfigInputMessageFactoryTest.java | 4 +- .../GetConfigReplyMessageFactoryTest.java | 2 +- .../GetFeaturesInputMessageFactoryTest.java | 5 +- .../GetFeaturesOutputFactoryTest.java | 4 +- ...GetQueueConfigInputMessageFactoryTest.java | 2 +- .../GetaAsyncRequestMessageFactoryTest.java | 3 +- .../HelloInputMessageFactoryTest.java | 13 +- .../factories/HelloMessageFactoryTest.java | 3 +- .../MeterModInputMessageFactoryTest.java | 7 +- .../MultipartReplyMessageFactoryTest.java | 28 +- .../MultipartRequestInputFactoryTest.java | 19 +- .../OF10BarrierInputMessageFactoryTest.java | 4 +- .../OF10BarrierReplyMessageFactoryTest.java | 2 +- .../OF10FeaturesReplyMessageFactoryTest.java | 13 +- .../OF10FlowModInputMessageFactoryTest.java | 3 +- .../OF10FlowRemovedMessageFactoryTest.java | 2 +- .../OF10HelloInputMessageFactoryTest.java | 4 +- .../OF10PacketInMessageFactoryTest.java | 2 +- .../OF10PacketOutInputMessageFactoryTest.java | 2 +- .../OF10PortModInputMessageFactoryTest.java | 2 +- .../OF10PortStatusMessageFactoryTest.java | 8 +- ...QueueGetConfigInputMessageFactoryTest.java | 3 +- ...QueueGetConfigReplyMessageFactoryTest.java | 2 +- .../OF10StatsReplyMessageFactoryTest.java | 6 +- .../OF10StatsRequestInputFactoryTest.java | 2 +- .../factories/PacketInMessageFactoryTest.java | 2 +- .../PacketOutInputMessageFactoryTest.java | 2 +- .../PortModInputMessageFactoryTest.java | 7 +- .../PortStatusMessageFactoryTest.java | 8 +- ...QueueGetConfigReplyMessageFactoryTest.java | 2 +- .../RoleReplyMessageFactoryTest.java | 2 +- .../RoleRequestInputMessageFactoryTest.java | 2 +- .../SetAsyncInputMessageFactoryTest.java | 3 +- .../SetConfigMessageFactoryTest.java | 2 +- .../TableModInputMessageFactoryTest.java | 2 +- .../MultipartRequestGroupDescTest.java | 3 +- .../MultipartRequestGroupFeaturesTest.java | 2 +- .../MultipartRequestMeterFeaturesTest.java | 2 +- .../MultipartRequestPortDescTest.java | 3 +- .../MultipartRequestTableFeaturesTest.java | 6 +- .../multipart/MultipartRequestTableTest.java | 2 +- .../OF10StatsRequestAggregateTest.java | 2 +- .../impl/util/ActionsDeserializerTest.java | 4 +- .../protocol/impl/util/BufferHelper.java | 9 +- .../impl/util/CodeKeyMakerFactoryTest.java | 26 +- .../util/DefaultDeserializerFactoryTest.java | 6 +- .../util/InstructionsDeserializerTest.java | 2 +- .../impl/util/MatchDeserializerTest.java | 12 +- .../util/OF10ActionsDeserializerTest.java | 2 +- .../impl/util/OF10ActionsSerializerTest.java | 3 +- .../impl/util/OF10MatchDeserializerTest.java | 4 +- .../impl/util/OF10MatchSerializerTest.java | 2 +- .../impl/util/OF13ActionsSerializerTest.java | 4 +- .../util/OF13InstructionsSerializerTest.java | 2 +- .../impl/util/OF13MatchSerializer02Test.java | 3 +- .../impl/util/OF13MatchSerializerTest.java | 9 +- .../impl/util/TypeKeyMakerFactoryTest.java | 28 +- .../ExperimenterDeserializerKeyFactory.java | 18 +- .../ExperimenterSerializerKeyFactory.java | 14 +- ...xperimenterDeserializerKeyFactoryTest.java | 51 +-- .../ExperimenterSerializerKeyFactoryTest.java | 52 +-- .../openflowplugin/api/OFConstants.java | 10 +- .../api/openflow/device/DeviceInfo.java | 5 +- .../api/openflow/device/XidSequencer.java | 10 +- .../openflow/md/core/HandshakeListener.java | 4 +- .../openflow/md/core/HandshakeManager.java | 4 +- .../api/openflow/md/core/TranslatorKey.java | 33 +- .../md/core/sal/BuildSwitchFeatures.java | 2 +- .../api/openflow/md/util/OpenflowVersion.java | 27 +- .../MessageCodeExperimenterKey.java | 22 +- openflowplugin-impl/pom.xml | 2 +- .../common/MultipartReplyTranslatorUtil.java | 3 +- .../common/MultipartRequestInputFactory.java | 27 +- .../connection/ConnectionContextImpl.java | 11 +- .../impl/connection/HandshakeManagerImpl.java | 102 ++--- .../connection/OutboundQueueProviderImpl.java | 31 +- .../listener/HandshakeListenerImpl.java | 5 +- .../SystemNotificationsListenerImpl.java | 17 +- .../multipart/FlowStatsMultipartWriter.java | 9 +- .../MeterFeaturesMultipartWriter.java | 8 +- .../multipart/MeterStatsMultipartWriter.java | 6 +- .../multipart/PortStatsMultipartWriter.java | 2 +- .../impl/device/DeviceContextImpl.java | 5 +- .../impl/device/SwitchFeaturesUtil.java | 9 +- .../DeviceInitializerProvider.java | 9 +- .../ActionDeserializerInjector.java | 8 +- .../InstructionDeserializerInjector.java | 6 +- .../MatchDeserializerInjector.java | 9 +- .../MessageDeserializerInjector.java | 40 +- .../MultipartDeserializerInjector.java | 11 +- .../action/OutputActionDeserializer.java | 2 +- .../action/SetFieldActionDeserializer.java | 8 +- ...AbstractActionInstructionDeserializer.java | 2 +- .../key/MessageCodeActionExperimenterKey.java | 22 +- .../key/MessageCodeMatchKey.java | 16 +- .../match/InPhyPortEntryDeserializer.java | 4 +- .../match/InPortEntryDeserializer.java | 4 +- .../match/Ipv6ExtHeaderEntryDeserializer.java | 5 +- .../match/MatchDeserializer.java | 4 +- .../match/PbbEntryDeserializer.java | 8 +- .../messages/FlowMessageDeserializer.java | 8 +- .../messages/GroupMessageDeserializer.java | 2 +- .../messages/MeterMessageDeserializer.java | 7 +- .../messages/PacketInMessageDeserializer.java | 2 +- ...ultipartReplyExperimenterDeserializer.java | 17 +- .../MultipartReplyFlowStatsDeserializer.java | 4 +- .../MultipartReplyGroupDescDeserializer.java | 5 +- .../MultipartReplyMessageDeserializer.java | 3 +- ...MultipartReplyMeterConfigDeserializer.java | 9 +- .../MultipartReplyPortStatsDeserializer.java | 2 +- .../MultipartReplyQueueStatsDeserializer.java | 2 +- ...ltipartReplyTableFeaturesDeserializer.java | 9 +- .../TableFeaturesMatchFieldDeserializer.java | 82 ++-- .../deserialization/util/ActionUtil.java | 11 +- .../deserialization/util/InstructionUtil.java | 7 +- .../ActionSerializerInjector.java | 7 +- .../InstructionSerializerInjector.java | 11 +- .../MatchSerializerInjector.java | 5 +- .../MessageSerializerInjector.java | 10 +- ...MultipartMatchFieldSerializerInjector.java | 12 +- .../MultipartSerializerInjector.java | 11 +- ...tipartTableFeaturesSerializerInjector.java | 10 +- .../AbstractSetFieldActionSerializer.java | 9 +- .../actions/SetFieldActionSerializer.java | 6 +- .../AbstractActionInstructionSerializer.java | 3 +- .../ApplyActionsInstructionSerializer.java | 4 +- .../WriteActionsInstructionSerializer.java | 4 +- .../serialization/match/MatchSerializer.java | 4 +- .../messages/FlowMessageSerializer.java | 5 +- .../messages/MeterMessageSerializer.java | 4 +- ...ultipartRequestExperimenterSerializer.java | 6 +- ...rtRequestFlowAggregateStatsSerializer.java | 2 +- .../MultipartRequestFlowStatsSerializer.java | 3 +- .../MultipartRequestMessageSerializer.java | 2 +- ...ltipartRequestTableFeaturesSerializer.java | 2 +- ...plyActionsMissTablePropertySerializer.java | 2 +- .../ApplyActionsTablePropertySerializer.java | 2 +- ...lySetfieldMissTablePropertySerializer.java | 6 +- .../ApplySetfieldTablePropertySerializer.java | 7 +- ...structionsMissTablePropertySerializer.java | 2 +- .../InstructionsTablePropertySerializer.java | 2 +- .../MatchTablePropertySerializer.java | 6 +- .../WildcardsTablePropertySerializer.java | 6 +- ...iteActionsMissTablePropertySerializer.java | 2 +- .../WriteActionsTablePropertySerializer.java | 2 +- ...teSetfieldMissTablePropertySerializer.java | 7 +- .../WriteSetfieldTablePropertySerializer.java | 6 +- .../serialization/util/ActionUtil.java | 12 +- .../serialization/util/InstructionUtil.java | 18 +- .../registry/flow/DeviceFlowRegistryImpl.java | 2 +- .../registry/flow/FlowRegistryKeyFactory.java | 2 +- .../impl/role/RoleContextImpl.java | 2 +- .../impl/rpc/RpcContextImpl.java | 4 +- .../AbstractMultipartCollectorService.java | 2 +- .../impl/services/AbstractService.java | 9 +- .../impl/services/RoleService.java | 5 +- .../services/batch/FlatBatchFlowAdapters.java | 8 +- .../batch/FlatBatchGroupAdapters.java | 8 +- .../batch/FlatBatchMeterAdapters.java | 24 +- ...ltiLayerAggregateFlowMultipartService.java | 6 +- .../impl/services/sal/SalPortServiceImpl.java | 3 +- .../impl/services/util/RequestInputUtils.java | 5 +- .../AggregateFlowsInTableService.java | 5 +- .../services/AllFlowsInTableService.java | 12 +- .../services/AllGroupsStatsService.java | 28 +- .../services/AllMeterConfigStatsService.java | 21 +- .../services/AllMeterStatsService.java | 29 +- .../services/AllQueuesOnePortService.java | 14 +- .../services/FlowsInTableService.java | 12 +- .../services/OneQueueOnePortService.java | 14 +- .../statistics/services/PortStatsService.java | 15 +- .../AbstractCompatibleStatService.java | 4 +- .../StatisticsGatheringOnTheFlyService.java | 2 +- .../dedicated/StatisticsGatheringService.java | 2 +- .../FlowDirectStatisticsService.java | 3 +- .../translator/PacketReceivedTranslator.java | 7 +- .../impl/translator/TranslatorKeyFactory.java | 11 +- .../impl/util/AddressNormalizationUtil.java | 3 +- .../impl/util/FlatBatchUtil.java | 24 +- .../impl/util/FlowCreatorUtil.java | 16 +- .../openflowplugin/impl/util/FlowUtil.java | 14 +- .../openflowplugin/impl/util/GroupUtil.java | 6 +- .../impl/util/MatchNormalizationUtil.java | 28 +- .../impl/util/MessageFactory.java | 19 +- .../openflowplugin/impl/util/MeterUtil.java | 6 +- .../NodeConnectorRefToPortTranslator.java | 7 +- .../impl/util/PortTranslatorUtil.java | 5 +- .../MultipartRequestInputFactoryTest.java | 11 +- .../connection/HandshakeManagerImplTest.java | 102 ++--- .../OutboundQueueProviderImplTest.java | 11 +- .../listener/HandshakeListenerImplTest.java | 44 +- .../impl/device/DeviceContextImplTest.java | 4 +- .../impl/device/DeviceManagerImplTest.java | 2 + .../OF10DeviceInitializerTest.java | 2 + .../OF13DeviceInitializerTest.java | 2 + .../MessageDeserializerInjectorTest.java | 10 +- .../AbstractActionDeserializerTest.java | 9 +- .../SetFieldActionDeserializerTest.java | 2 +- .../AbstractInstructionDeserializerTest.java | 9 +- ...plyActionsInstructionDeserializerTest.java | 5 +- ...iteActionsInstructionDeserializerTest.java | 5 +- .../AbstractMatchEntryDeserializerTest.java | 9 +- .../match/InPhyPortEntryDeserializerTest.java | 2 +- .../match/InPortEntryDeserializerTest.java | 2 +- .../messages/FlowMessageDeserializerTest.java | 3 +- .../GroupMessageDeserializerTest.java | 3 +- .../MeterMessageDeserializerTest.java | 2 +- .../PacketInMessageDeserializerTest.java | 2 +- .../messages/PortMessageDeserializerTest.java | 2 +- .../AbstractMultipartDeserializerTest.java | 4 +- ...MultipartReplyMessageDeserializerTest.java | 2 +- .../ActionSerializerInjectorTest.java | 6 +- .../InstructionSerializerInjectorTest.java | 6 +- .../MessageSerializerInjectorTest.java | 2 +- .../actions/AbstractActionSerializerTest.java | 5 +- .../actions/SetNwTosActionSerializerTest.java | 9 +- .../AbstractInstructionSerializerTest.java | 3 +- .../AbstractMatchEntrySerializerTest.java | 3 +- .../AsyncConfigMessageSerializerTest.java | 2 +- .../messages/FlowMessageSerializerTest.java | 2 +- .../messages/GroupMessageSerializerTest.java | 2 +- .../messages/MeterMessageSerializerTest.java | 2 +- .../messages/PortMessageSerializerTest.java | 2 +- .../MultipartRequestDescSerializerTest.java | 4 +- ...questFlowAggregateStatsSerializerTest.java | 2 +- ...ltipartRequestFlowStatsSerializerTest.java | 4 +- ...rtRequestFlowTableStatsSerializerTest.java | 4 +- ...ltipartRequestGroupDescSerializerTest.java | 7 +- ...artRequestGroupFeaturesSerializerTest.java | 7 +- ...tipartRequestGroupStatsSerializerTest.java | 3 +- ...MultipartRequestMessageSerializerTest.java | 2 +- ...ipartRequestMeterConfigSerializerTest.java | 3 +- ...artRequestMeterFeaturesSerializerTest.java | 7 +- ...tipartRequestMeterStatsSerializerTest.java | 3 +- ...ultipartRequestPortDescSerializerTest.java | 4 +- ...ltipartRequestPortStatsSerializerTest.java | 3 +- ...tipartRequestQueueStatsSerializerTest.java | 3 +- ...artRequestTableFeaturesSerializerTest.java | 3 +- .../AbstractTablePropertySerializerTest.java | 3 +- .../impl/rpc/RpcContextImplTest.java | 20 +- .../impl/services/EchoServiceTest.java | 2 +- .../impl/services/ServiceMocking.java | 7 +- .../batch/FlatBatchFlowAdaptersTest.java | 16 +- .../batch/FlatBatchGroupAdaptersTest.java | 16 +- .../batch/FlatBatchMeterAdaptersTest.java | 16 +- .../sal/SalAsyncConfigServiceImplTest.java | 6 +- .../services/sal/SalEchoServiceImplTest.java | 8 +- ...SalExperimenterMessageServiceImplTest.java | 2 +- .../sal/SalFlatBatchServiceImplTest.java | 44 +- .../services/sal/SalFlowServiceImplTest.java | 17 +- .../services/sal/SalTableServiceImplTest.java | 13 +- .../services/util/RequestInputUtilsTest.java | 5 +- .../MultipartReplyTranslatorTest.java | 3 +- .../StatisticsContextImpMockInitiation.java | 4 +- .../statistics/StatisticsContextImplTest.java | 47 +- .../StatisticsGatheringUtilsTest.java | 4 +- .../services/AbstractStatsServiceTest.java | 5 +- ...aylightFlowStatisticsServiceImpl2Test.java | 2 +- ...ghtFlowTableStatisticsServiceImplTest.java | 2 +- ...aylightGroupStatisticsServiceImplTest.java | 2 +- ...aylightMeterStatisticsServiceImplTest.java | 2 +- ...daylightPortStatisticsServiceImplTest.java | 2 +- ...aylightQueueStatisticsServiceImplTest.java | 6 +- .../AbstractCompatibleStatServiceTest.java | 4 +- ...FlowStatisticsServiceDelegateImplTest.java | 2 +- .../AbstractDirectStatisticsServiceTest.java | 6 +- .../translator/FlowRemovedTranslatorTest.java | 3 +- .../util/DeviceInitializationUtilTest.java | 2 +- .../impl/util/FlatBatchUtilTest.java | 74 +-- .../impl/util/FlowCreatorUtilTest.java | 21 +- .../impl/util/FlowUtilTest.java | 3 +- .../impl/util/GroupUtilTest.java | 3 +- .../impl/util/MatchNormalizationUtilTest.java | 4 +- .../impl/util/MdSalRegistrationUtilsTest.java | 2 + .../impl/util/MessageFactoryTest.java | 20 +- .../impl/util/MeterUtilTest.java | 5 +- .../NodeConnectorRefToPortTranslatorTest.java | 3 +- .../impl/util/PortTranslatorUtilTest.java | 3 +- openflowplugin/pom.xml | 2 +- .../core/extension/ActionExtensionHelper.java | 4 +- .../core/extension/MatchExtensionHelper.java | 7 +- .../core/sal/convertor/ConvertorManager.java | 23 +- .../sal/convertor/ConvertorRegistrator.java | 4 +- .../md/core/sal/convertor/GroupConvertor.java | 2 +- .../GroupDescStatsResponseConvertor.java | 27 +- .../MeterConfigStatsResponseConvertor.java | 5 +- .../md/core/sal/convertor/MeterConvertor.java | 7 +- .../convertor/OFApprovedExperimenterIds.java | 10 +- .../sal/convertor/PacketOutConvertor.java | 5 +- .../md/core/sal/convertor/PortConvertor.java | 2 +- .../sal/convertor/TableFeaturesConvertor.java | 4 +- .../TableFeaturesResponseConvertor.java | 60 ++- .../action/cases/OfToSalSetTpDstCase.java | 5 +- .../action/cases/OfToSalSetTpSrcCase.java | 5 +- .../SalToOfGeneralExtensionGroupingCase.java | 11 +- .../action/cases/SalToOfGroupActionCase.java | 7 +- .../action/cases/SalToOfOutputActionCase.java | 3 +- .../action/cases/SalToOfSetFieldCase.java | 10 +- .../cases/SalToOfSetNwTosActionV10Case.java | 9 +- .../cases/SalToOfSetTpSrcActionCase.java | 46 +- .../action/cases/SalToOfVendorCodecCase.java | 8 +- .../action/data/ActionConvertorData.java | 3 +- .../data/ActionResponseConvertorData.java | 2 +- .../sal/convertor/common/ConvertReactor.java | 11 +- .../sal/convertor/common/ConvertorCase.java | 7 +- .../sal/convertor/common/ConvertorData.java | 13 +- .../sal/convertor/common/ConvertorKey.java | 11 +- .../convertor/common/ConvertorProcessor.java | 15 +- .../data/FlowStatsResponseConvertorData.java | 6 +- .../convertor/data/VersionConvertorData.java | 4 +- .../data/VersionDatapathIdConvertorData.java | 4 +- .../sal/convertor/data/XidConvertorData.java | 4 +- .../sal/convertor/flow/FlowConvertor.java | 9 +- .../sal/convertor/flow/FlowConvertorUtil.java | 22 +- .../sal/convertor/flow/FlowFlagsInjector.java | 6 +- .../FlowInstructionResponseConvertor.java | 25 +- .../flow/FlowStatsResponseConvertor.java | 21 +- .../sal/convertor/match/MatchConvertor.java | 15 +- .../convertor/match/MatchConvertorUtil.java | 4 +- .../sal/convertor/match/MatchInjector.java | 6 +- .../cases/OfToSalExperimenterIdCase.java | 15 +- .../match/cases/OfToSalIpv6ExthdrCase.java | 12 +- .../match/cases/OfToSalMetadataCase.java | 13 +- .../match/cases/OfToSalPbbIsidCase.java | 9 +- .../match/cases/OfToSalTunnelIdCase.java | 12 +- .../data/MatchResponseConvertorData.java | 41 +- .../openflow/md/util/ActionUtil.java | 11 +- .../openflow/md/util/OpenflowPortsUtil.java | 21 +- .../extension/ActionExtensionHelperTest.java | 4 +- .../ExtensionConverterManagerImplTest.java | 5 +- .../sal/convertor/GroupConvertorTest.java | 11 +- .../sal/convertor/MeterConvertorTest.java | 12 +- .../sal/convertor/PacketOutConvertorTest.java | 12 +- .../core/sal/convertor/PortConvertorTest.java | 2 +- .../convertor/TableFeaturesConvertorTest.java | 4 +- .../TableFeaturesResponseConvertorTest.java | 4 +- .../convertor/action/ActionConvertorTest.java | 3 +- .../match/MatchConvertorUtilTest.java | 8 +- parent/pom.xml | 6 +- samples/learning-switch/pom.xml | 2 +- samples/pom.xml | 2 +- samples/sample-bundles/pom.xml | 2 +- samples/sample-consumer/pom.xml | 2 +- test-common/pom.xml | 2 +- test-provider/pom.xml | 2 +- .../OpenflowpluginTestCommandProvider.java | 35 +- 865 files changed, 4231 insertions(+), 4129 deletions(-) create mode 100644 model/model-inventory/pom.xml create mode 100644 model/model-inventory/src/main/yang/opendaylight-inventory.yang create mode 100644 model/model-topology/pom.xml create mode 100644 model/model-topology/src/main/yang/opendaylight-topology-inventory.yang diff --git a/applications/arbitratorreconciliation/pom.xml b/applications/arbitratorreconciliation/pom.xml index df4aaed6d3..abdfcae4a4 100644 --- a/applications/arbitratorreconciliation/pom.xml +++ b/applications/arbitratorreconciliation/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent-lite - 8.1.1 + 9.0.2 diff --git a/applications/bulk-o-matic/pom.xml b/applications/bulk-o-matic/pom.xml index 483c866c9c..2e50fd15b2 100644 --- a/applications/bulk-o-matic/pom.xml +++ b/applications/bulk-o-matic/pom.xml @@ -22,7 +22,7 @@ mdsal-binding-api - org.opendaylight.controller.model + org.opendaylight.openflowplugin.model model-inventory diff --git a/applications/forwardingrules-sync/pom.xml b/applications/forwardingrules-sync/pom.xml index b310b8d81e..abea3619be 100644 --- a/applications/forwardingrules-sync/pom.xml +++ b/applications/forwardingrules-sync/pom.xml @@ -25,7 +25,7 @@ - org.opendaylight.controller.model + org.opendaylight.openflowplugin.model model-inventory diff --git a/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/SyncPlanPushStrategyFlatBatchImpl.java b/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/SyncPlanPushStrategyFlatBatchImpl.java index 5144af71ac..25c833a175 100644 --- a/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/SyncPlanPushStrategyFlatBatchImpl.java +++ b/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/SyncPlanPushStrategyFlatBatchImpl.java @@ -30,54 +30,54 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev16032 import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.ProcessFlatBatchInputBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.ProcessFlatBatchOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.SalFlatBatchService; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.FlatBatchAddFlowCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.FlatBatchAddFlowCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.FlatBatchRemoveFlowCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.FlatBatchRemoveFlowCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.FlatBatchUpdateFlowCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.FlatBatchUpdateFlowCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.flat.batch.add.flow._case.FlatBatchAddFlow; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.flat.batch.add.flow._case.FlatBatchAddFlowBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.flat.batch.add.flow._case.FlatBatchAddFlowKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.flat.batch.remove.flow._case.FlatBatchRemoveFlow; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.flat.batch.remove.flow._case.FlatBatchRemoveFlowBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.flat.batch.remove.flow._case.FlatBatchRemoveFlowKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.flat.batch.update.flow._case.FlatBatchUpdateFlow; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.flat.batch.update.flow._case.FlatBatchUpdateFlowBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.flat.batch.update.flow._case.FlatBatchUpdateFlowKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.FlatBatchAddGroupCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.FlatBatchAddGroupCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.FlatBatchRemoveGroupCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.FlatBatchRemoveGroupCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.FlatBatchUpdateGroupCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.FlatBatchUpdateGroupCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.flat.batch.add.group._case.FlatBatchAddGroup; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.flat.batch.add.group._case.FlatBatchAddGroupBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.flat.batch.add.group._case.FlatBatchAddGroupKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.flat.batch.remove.group._case.FlatBatchRemoveGroup; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.flat.batch.remove.group._case.FlatBatchRemoveGroupBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.flat.batch.remove.group._case.FlatBatchRemoveGroupKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.flat.batch.update.group._case.FlatBatchUpdateGroup; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.flat.batch.update.group._case.FlatBatchUpdateGroupBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.flat.batch.update.group._case.FlatBatchUpdateGroupKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.FlatBatchAddMeterCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.FlatBatchAddMeterCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.FlatBatchRemoveMeterCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.FlatBatchRemoveMeterCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.FlatBatchUpdateMeterCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.FlatBatchUpdateMeterCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.flat.batch.add.meter._case.FlatBatchAddMeter; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.flat.batch.add.meter._case.FlatBatchAddMeterBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.flat.batch.add.meter._case.FlatBatchAddMeterKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.flat.batch.remove.meter._case.FlatBatchRemoveMeter; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.flat.batch.remove.meter._case.FlatBatchRemoveMeterBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.flat.batch.remove.meter._case.FlatBatchRemoveMeterKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.flat.batch.update.meter._case.FlatBatchUpdateMeter; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.flat.batch.update.meter._case.FlatBatchUpdateMeterBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.flat.batch.update.meter._case.FlatBatchUpdateMeterKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.Batch; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.BatchBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.BatchChoice; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchAddFlowCase; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchAddFlowCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchAddGroupCase; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchAddGroupCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchAddMeterCase; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchAddMeterCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchRemoveFlowCase; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchRemoveFlowCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchRemoveGroupCase; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchRemoveGroupCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchRemoveMeterCase; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchRemoveMeterCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchUpdateFlowCase; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchUpdateFlowCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchUpdateGroupCase; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchUpdateGroupCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchUpdateMeterCase; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchUpdateMeterCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.add.flow._case.FlatBatchAddFlow; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.add.flow._case.FlatBatchAddFlowBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.add.flow._case.FlatBatchAddFlowKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.add.group._case.FlatBatchAddGroup; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.add.group._case.FlatBatchAddGroupBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.add.group._case.FlatBatchAddGroupKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.add.meter._case.FlatBatchAddMeter; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.add.meter._case.FlatBatchAddMeterBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.add.meter._case.FlatBatchAddMeterKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.remove.flow._case.FlatBatchRemoveFlow; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.remove.flow._case.FlatBatchRemoveFlowBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.remove.flow._case.FlatBatchRemoveFlowKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.remove.group._case.FlatBatchRemoveGroup; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.remove.group._case.FlatBatchRemoveGroupBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.remove.group._case.FlatBatchRemoveGroupKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.remove.meter._case.FlatBatchRemoveMeter; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.remove.meter._case.FlatBatchRemoveMeterBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.remove.meter._case.FlatBatchRemoveMeterKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.update.flow._case.FlatBatchUpdateFlow; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.update.flow._case.FlatBatchUpdateFlowBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.update.flow._case.FlatBatchUpdateFlowKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.update.group._case.FlatBatchUpdateGroup; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.update.group._case.FlatBatchUpdateGroupBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.update.group._case.FlatBatchUpdateGroupKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.update.meter._case.FlatBatchUpdateMeter; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.update.meter._case.FlatBatchUpdateMeterBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.update.meter._case.FlatBatchUpdateMeterKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.output.BatchFailure; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.meters.Meter; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.TableKey; diff --git a/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/SyncPlanPushStrategyFlatBatchImplTest.java b/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/SyncPlanPushStrategyFlatBatchImplTest.java index f117965e0c..d19460c27e 100644 --- a/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/SyncPlanPushStrategyFlatBatchImplTest.java +++ b/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/SyncPlanPushStrategyFlatBatchImplTest.java @@ -29,26 +29,26 @@ import org.opendaylight.openflowplugin.applications.frsync.util.SyncCrudCounters import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.ProcessFlatBatchInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.ProcessFlatBatchOutputBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.SalFlatBatchService; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.FlatBatchAddFlowCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.FlatBatchAddFlowCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.FlatBatchRemoveFlowCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.FlatBatchRemoveFlowCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.FlatBatchUpdateFlowCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.FlatBatchUpdateFlowCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.FlatBatchAddGroupCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.FlatBatchAddGroupCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.FlatBatchRemoveGroupCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.FlatBatchRemoveGroupCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.FlatBatchUpdateGroupCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.FlatBatchUpdateGroupCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.FlatBatchAddMeterCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.FlatBatchAddMeterCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.FlatBatchRemoveMeterCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.FlatBatchRemoveMeterCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.FlatBatchUpdateMeterCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.FlatBatchUpdateMeterCaseBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.Batch; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.BatchBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchAddFlowCase; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchAddFlowCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchAddGroupCase; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchAddGroupCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchAddMeterCase; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchAddMeterCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchRemoveFlowCase; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchRemoveFlowCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchRemoveGroupCase; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchRemoveGroupCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchRemoveMeterCase; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchRemoveMeterCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchUpdateFlowCase; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchUpdateFlowCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchUpdateGroupCase; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchUpdateGroupCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchUpdateMeterCase; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchUpdateMeterCaseBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.meters.Meter; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.TableKey; diff --git a/applications/lldp-speaker/pom.xml b/applications/lldp-speaker/pom.xml index 407d96db6f..375c7a0105 100644 --- a/applications/lldp-speaker/pom.xml +++ b/applications/lldp-speaker/pom.xml @@ -27,7 +27,7 @@ mdsal-binding-api - org.opendaylight.controller.model + org.opendaylight.openflowplugin.model model-inventory diff --git a/applications/notification-supplier/pom.xml b/applications/notification-supplier/pom.xml index c21492b7ab..a5a52178f8 100644 --- a/applications/notification-supplier/pom.xml +++ b/applications/notification-supplier/pom.xml @@ -22,7 +22,7 @@ mdsal-binding-api - org.opendaylight.controller.model + org.opendaylight.openflowplugin.model model-inventory diff --git a/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/NotificationProvider.java b/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/NotificationProvider.java index 6545eec549..d6a477e050 100644 --- a/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/NotificationProvider.java +++ b/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/NotificationProvider.java @@ -52,7 +52,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.Met import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.MeterRemoved; import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.MeterUpdated; import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.MeterStatisticsUpdated; -import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.nodes.node.meter.MeterStatistics; +import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.node.meter.statistics.MeterStatistics; import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.NodeConnectorStatisticsUpdate; import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.flow.capable.node.connector.statistics.FlowCapableNodeConnectorStatistics; import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.FlowCapableNodeConnectorQueueStatisticsData; diff --git a/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/MeterStatNotificationSupplierImpl.java b/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/MeterStatNotificationSupplierImpl.java index 6613d6b843..26118fa30f 100644 --- a/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/MeterStatNotificationSupplierImpl.java +++ b/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/MeterStatNotificationSupplierImpl.java @@ -16,7 +16,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.me import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.MeterStatisticsUpdated; import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.MeterStatisticsUpdatedBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.NodeMeterStatistics; -import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.nodes.node.meter.MeterStatistics; +import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.node.meter.statistics.MeterStatistics; import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.statistics.reply.MeterStatsBuilder; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.util.BindingMap; diff --git a/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/MeterStatNotificationSupplierImplTest.java b/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/MeterStatNotificationSupplierImplTest.java index 4944fe732d..64b8868bb4 100644 --- a/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/MeterStatNotificationSupplierImplTest.java +++ b/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/MeterStatNotificationSupplierImplTest.java @@ -34,8 +34,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.N import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.MeterStatisticsUpdated; import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.NodeMeterStatistics; -import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.nodes.node.meter.MeterStatistics; -import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.nodes.node.meter.MeterStatisticsBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.node.meter.statistics.MeterStatistics; +import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.node.meter.statistics.MeterStatisticsBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterId; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.Uint32; @@ -81,8 +81,8 @@ public class MeterStatNotificationSupplierImplTest { @Test public void testCreateChangeEvent() throws InterruptedException { - final TestData testData = new TestData<>(createTestMeterStatPath(),null,createTestMeterStat(), - DataObjectModification.ModificationType.WRITE); + final TestData testData = new TestData<>(createTestMeterStatPath(), null, + createTestMeterStat(), DataObjectModification.ModificationType.WRITE); Collection> collection = new ArrayList<>(); collection.add(testData); notifSupplierImpl.onDataTreeChanged(collection); diff --git a/applications/of-switch-config-pusher/pom.xml b/applications/of-switch-config-pusher/pom.xml index b6ce76534c..16eaa3b202 100644 --- a/applications/of-switch-config-pusher/pom.xml +++ b/applications/of-switch-config-pusher/pom.xml @@ -22,7 +22,7 @@ mdsal-binding-api - org.opendaylight.controller.model + org.opendaylight.openflowplugin.model model-inventory diff --git a/applications/pom.xml b/applications/pom.xml index 097bd820a4..e23e971d07 100644 --- a/applications/pom.xml +++ b/applications/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent-lite - 8.1.1 + 9.0.2 diff --git a/applications/table-miss-enforcer/pom.xml b/applications/table-miss-enforcer/pom.xml index 0ea823f6f7..0e3b9a6f46 100644 --- a/applications/table-miss-enforcer/pom.xml +++ b/applications/table-miss-enforcer/pom.xml @@ -32,7 +32,7 @@ mdsal-binding-api - org.opendaylight.controller.model + org.opendaylight.openflowplugin.model model-inventory diff --git a/applications/topology-lldp-discovery/pom.xml b/applications/topology-lldp-discovery/pom.xml index a265b82537..5adf7b53ea 100644 --- a/applications/topology-lldp-discovery/pom.xml +++ b/applications/topology-lldp-discovery/pom.xml @@ -51,11 +51,11 @@ model-flow-service - org.opendaylight.controller.model + org.opendaylight.openflowplugin.model model-inventory - org.opendaylight.controller.model + org.opendaylight.openflowplugin.model model-topology diff --git a/applications/topology-manager/pom.xml b/applications/topology-manager/pom.xml index d3e688d790..8a540ddd90 100644 --- a/applications/topology-manager/pom.xml +++ b/applications/topology-manager/pom.xml @@ -34,11 +34,11 @@ openflowplugin-common - org.opendaylight.controller.model + org.opendaylight.openflowplugin.model model-inventory - org.opendaylight.controller.model + org.opendaylight.openflowplugin.model model-topology diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 70d07ebf3f..e293536bde 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 8.1.1 + 9.0.2 @@ -115,6 +115,16 @@ model-flow-statistics ${project.version} + + ${project.groupId}.model + model-inventory + ${project.version} + + + ${project.groupId}.model + model-topology + ${project.version} + ${project.groupId} diff --git a/distribution/karaf/pom.xml b/distribution/karaf/pom.xml index 2bd7b81747..09101a5eb4 100644 --- a/distribution/karaf/pom.xml +++ b/distribution/karaf/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent karaf4-parent - 8.1.1 + 9.0.2 org.opendaylight.openflowplugin openflowplugin-karaf diff --git a/drop-test-karaf/pom.xml b/drop-test-karaf/pom.xml index 4f47bf503c..5a78e77fb0 100644 --- a/drop-test-karaf/pom.xml +++ b/drop-test-karaf/pom.xml @@ -39,7 +39,7 @@ model-flow-base - org.opendaylight.controller.model + org.opendaylight.openflowplugin.model model-inventory diff --git a/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml b/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml index df3c8b25c6..216f17a4e9 100644 --- a/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml +++ b/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent feature-repo-parent - 8.1.1 + 9.0.2 diff --git a/extension/features-extension-aggregator/odl-openflowplugin-eric-extensions/pom.xml b/extension/features-extension-aggregator/odl-openflowplugin-eric-extensions/pom.xml index 079562a620..6ac11d1d94 100644 --- a/extension/features-extension-aggregator/odl-openflowplugin-eric-extensions/pom.xml +++ b/extension/features-extension-aggregator/odl-openflowplugin-eric-extensions/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 8.1.1 + 9.0.2 diff --git a/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/pom.xml b/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/pom.xml index e04fe640d5..89f14893d7 100644 --- a/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/pom.xml +++ b/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 8.1.1 + 9.0.2 diff --git a/extension/features-extension-aggregator/odl-openflowplugin-onf-extensions/pom.xml b/extension/features-extension-aggregator/odl-openflowplugin-onf-extensions/pom.xml index c99be38e63..6bb5269c2e 100644 --- a/extension/features-extension-aggregator/odl-openflowplugin-onf-extensions/pom.xml +++ b/extension/features-extension-aggregator/odl-openflowplugin-onf-extensions/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 8.1.1 + 9.0.2 diff --git a/extension/features-extension-aggregator/pom.xml b/extension/features-extension-aggregator/pom.xml index 1e2ebed56a..830a57ec85 100644 --- a/extension/features-extension-aggregator/pom.xml +++ b/extension/features-extension-aggregator/pom.xml @@ -3,7 +3,7 @@ org.opendaylight.odlparent odlparent-lite - 8.1.1 + 9.0.2 4.0.0 diff --git a/extension/openflowjava-extension-eric/src/main/java/org/opendaylight/openflowjava/eric/codec/match/Icmpv6NDOptionsTypeCodec.java b/extension/openflowjava-extension-eric/src/main/java/org/opendaylight/openflowjava/eric/codec/match/Icmpv6NDOptionsTypeCodec.java index 65289e8a75..daa499534e 100644 --- a/extension/openflowjava-extension-eric/src/main/java/org/opendaylight/openflowjava/eric/codec/match/Icmpv6NDOptionsTypeCodec.java +++ b/extension/openflowjava-extension-eric/src/main/java/org/opendaylight/openflowjava/eric/codec/match/Icmpv6NDOptionsTypeCodec.java @@ -20,27 +20,27 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmC import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.Icmpv6NdOptionsType; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.icmpv6.nd.options.type.grouping.Icmpv6NdOptionsTypeValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.oxm.container.match.entry.value.Icmpv6NdOptionsTypeCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.oxm.container.match.entry.value.Icmpv6NdOptionsTypeCaseValueBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.ofj.aug.eric.match.options.Icmpv6NdOptionsTypeCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.ofj.aug.eric.match.options.Icmpv6NdOptionsTypeCaseValueBuilder; public class Icmpv6NDOptionsTypeCodec extends AbstractMatchCodec { private static final int VALUE_LENGTH = 1; public static final MatchEntrySerializerKey SERIALIZER_KEY = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, EricExpClass.class, Icmpv6NdOptionsType.class); + EncodeConstants.OF_VERSION_1_3, EricExpClass.class, Icmpv6NdOptionsType.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, EricConstants.ERICOXM_OF_EXPERIMENTER_ID, + EncodeConstants.OF_VERSION_1_3, EricConstants.ERICOXM_OF_EXPERIMENTER_ID, EricConstants.ERICOXM_OF_ICMPV6_ND_OPTIONS_TYPE); public static final Icmpv6NDOptionsTypeCodec INSTANCE = new Icmpv6NDOptionsTypeCodec(); @Override - public void serialize(MatchEntry input, ByteBuf outBuffer) { + public void serialize(final MatchEntry input, final ByteBuf outBuffer) { serializeHeader(input, outBuffer); Icmpv6NdOptionsTypeCaseValue caseValue = (Icmpv6NdOptionsTypeCaseValue) input.getMatchEntryValue(); outBuffer.writeByte(caseValue.getIcmpv6NdOptionsTypeValues().getIcmpv6NdOptionsType().toJava()); } @Override - public MatchEntry deserialize(ByteBuf message) { + public MatchEntry deserialize(final ByteBuf message) { return deserializeHeaderToBuilder(message) .setMatchEntryValue(new Icmpv6NdOptionsTypeCaseValueBuilder() .setIcmpv6NdOptionsTypeValues(new Icmpv6NdOptionsTypeValuesBuilder() diff --git a/extension/openflowjava-extension-eric/src/main/java/org/opendaylight/openflowjava/eric/codec/match/Icmpv6NDReservedCodec.java b/extension/openflowjava-extension-eric/src/main/java/org/opendaylight/openflowjava/eric/codec/match/Icmpv6NDReservedCodec.java index 8ef6f31e46..64aec791b4 100644 --- a/extension/openflowjava-extension-eric/src/main/java/org/opendaylight/openflowjava/eric/codec/match/Icmpv6NDReservedCodec.java +++ b/extension/openflowjava-extension-eric/src/main/java/org/opendaylight/openflowjava/eric/codec/match/Icmpv6NDReservedCodec.java @@ -20,28 +20,28 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmC import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.Icmpv6NdReserved; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.icmpv6.nd.reserved.grouping.Icmpv6NdReservedValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.oxm.container.match.entry.value.Icmpv6NdReservedCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.oxm.container.match.entry.value.Icmpv6NdReservedCaseValueBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.ofj.aug.eric.match.reserved.Icmpv6NdReservedCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.ofj.aug.eric.match.reserved.Icmpv6NdReservedCaseValueBuilder; public class Icmpv6NDReservedCodec extends AbstractMatchCodec { public static final Icmpv6NDReservedCodec INSTANCE = new Icmpv6NDReservedCodec(); private static final int VALUE_LENGTH = 4; public static final MatchEntrySerializerKey SERIALIZER_KEY = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, EricExpClass.class, Icmpv6NdReserved.class); + EncodeConstants.OF_VERSION_1_3, EricExpClass.class, Icmpv6NdReserved.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, EricConstants.ERICOXM_OF_EXPERIMENTER_ID, + EncodeConstants.OF_VERSION_1_3, EricConstants.ERICOXM_OF_EXPERIMENTER_ID, EricConstants.ERICOXM_OF_ICMPV6_ND_RESERVED); @Override - public void serialize(MatchEntry input, ByteBuf outBuffer) { + public void serialize(final MatchEntry input, final ByteBuf outBuffer) { serializeHeader(input, outBuffer); Icmpv6NdReservedCaseValue caseValue = (Icmpv6NdReservedCaseValue) input.getMatchEntryValue(); outBuffer.writeInt(caseValue.getIcmpv6NdReservedValues().getIcmpv6NdReserved().intValue()); } @Override - public MatchEntry deserialize(ByteBuf message) { + public MatchEntry deserialize(final ByteBuf message) { return deserializeHeaderToBuilder(message) .setMatchEntryValue(new Icmpv6NdReservedCaseValueBuilder() .setIcmpv6NdReservedValues(new Icmpv6NdReservedValuesBuilder() diff --git a/extension/openflowjava-extension-eric/src/main/yang/eric-match.yang b/extension/openflowjava-extension-eric/src/main/yang/eric-match.yang index 1efaa2acef..e05bb56397 100644 --- a/extension/openflowjava-extension-eric/src/main/yang/eric-match.yang +++ b/extension/openflowjava-extension-eric/src/main/yang/eric-match.yang @@ -39,17 +39,16 @@ module eric-match { } augment "/ofoxm:oxm-container/ofoxm:match-entry-value" { - ext:augment-identifier "ofj-aug-eric-match"; + ext:augment-identifier "ofj-aug-eric-match-reserved"; case icmpv6-nd-reserved-case-value { uses icmpv6-nd-reserved-grouping; } } augment "/ofoxm:oxm-container/ofoxm:match-entry-value" { - ext:augment-identifier "ofj-aug-eric-match"; + ext:augment-identifier "ofj-aug-eric-match-options"; case icmpv6-nd-options-type-case-value { uses icmpv6-nd-options-type-grouping; } } - -} \ No newline at end of file +} diff --git a/extension/openflowjava-extension-eric/src/test/java/org/opendaylight/openflowjava/eric/EricExtensionCodecRegistratorImplTest.java b/extension/openflowjava-extension-eric/src/test/java/org/opendaylight/openflowjava/eric/EricExtensionCodecRegistratorImplTest.java index 38bf6eae34..668ce75ce2 100644 --- a/extension/openflowjava-extension-eric/src/test/java/org/opendaylight/openflowjava/eric/EricExtensionCodecRegistratorImplTest.java +++ b/extension/openflowjava-extension-eric/src/test/java/org/opendaylight/openflowjava/eric/EricExtensionCodecRegistratorImplTest.java @@ -24,11 +24,12 @@ import org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionPro import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.EricExpClass; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.MatchField; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; +import org.opendaylight.yangtools.yang.common.Uint8; @RunWith(MockitoJUnitRunner.class) public class EricExtensionCodecRegistratorImplTest { - public static final short VERSION = 4; + public static final Uint8 VERSION = Uint8.valueOf(4); public static final byte VERSION1 = EncodeConstants.OF10_VERSION_ID; public static final byte VERSION2 = EncodeConstants.OF13_VERSION_ID; diff --git a/extension/openflowjava-extension-eric/src/test/java/org/opendaylight/openflowjava/eric/EricExtensionsRegistratorTest.java b/extension/openflowjava-extension-eric/src/test/java/org/opendaylight/openflowjava/eric/EricExtensionsRegistratorTest.java index 26a04a1e7c..058e21ec47 100644 --- a/extension/openflowjava-extension-eric/src/test/java/org/opendaylight/openflowjava/eric/EricExtensionsRegistratorTest.java +++ b/extension/openflowjava-extension-eric/src/test/java/org/opendaylight/openflowjava/eric/EricExtensionsRegistratorTest.java @@ -43,18 +43,18 @@ public class EricExtensionsRegistratorTest { @Test public void registerEricExtensionsTest() { verify(registrator).registerMatchEntrySerializer( - eq(new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, EricExpClass.class, + eq(new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, EricExpClass.class, Icmpv6NdReserved.class)), any(Icmpv6NDReservedCodec.class)); verify(registrator).registerMatchEntryDeserializer( - eq(new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, + eq(new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, EricConstants.ERICOXM_OF_EXPERIMENTER_ID, EricConstants.ERICOXM_OF_ICMPV6_ND_RESERVED)), any(Icmpv6NDReservedCodec.class)); verify(registrator).registerMatchEntrySerializer( - eq(new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, EricExpClass.class, + eq(new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, EricExpClass.class, Icmpv6NdOptionsType.class)), any(Icmpv6NDOptionsTypeCodec.class)); verify(registrator).registerMatchEntryDeserializer( - eq(new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, + eq(new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, EricConstants.ERICOXM_OF_EXPERIMENTER_ID, EricConstants.ERICOXM_OF_ICMPV6_ND_OPTIONS_TYPE)), any(Icmpv6NDOptionsTypeCodec.class)); @@ -65,17 +65,17 @@ public class EricExtensionsRegistratorTest { ericExtensionsRegistrator.close(); verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, EricExpClass.class, + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, EricExpClass.class, Icmpv6NdReserved.class)); verify(registrator).unregisterMatchEntryDeserializer( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, EricConstants.ERICOXM_OF_EXPERIMENTER_ID, + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, EricConstants.ERICOXM_OF_EXPERIMENTER_ID, EricConstants.ERICOXM_OF_ICMPV6_ND_RESERVED)); verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, EricExpClass.class, + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, EricExpClass.class, Icmpv6NdOptionsType.class)); verify(registrator).unregisterMatchEntryDeserializer( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, EricConstants.ERICOXM_OF_EXPERIMENTER_ID, + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, EricConstants.ERICOXM_OF_EXPERIMENTER_ID, EricConstants.ERICOXM_OF_ICMPV6_ND_OPTIONS_TYPE)); } } \ No newline at end of file diff --git a/extension/openflowjava-extension-eric/src/test/java/org/opendaylight/openflowjava/eric/codec/match/Icmpv6NDOptionsTypeCodecTest.java b/extension/openflowjava-extension-eric/src/test/java/org/opendaylight/openflowjava/eric/codec/match/Icmpv6NDOptionsTypeCodecTest.java index 4f137b6f4d..592016754d 100644 --- a/extension/openflowjava-extension-eric/src/test/java/org/opendaylight/openflowjava/eric/codec/match/Icmpv6NDOptionsTypeCodecTest.java +++ b/extension/openflowjava-extension-eric/src/test/java/org/opendaylight/openflowjava/eric/codec/match/Icmpv6NDOptionsTypeCodecTest.java @@ -18,8 +18,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.Icmpv6NdOptionsType; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.icmpv6.nd.options.type.grouping.Icmpv6NdOptionsTypeValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.oxm.container.match.entry.value.Icmpv6NdOptionsTypeCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.oxm.container.match.entry.value.Icmpv6NdOptionsTypeCaseValueBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.ofj.aug.eric.match.options.Icmpv6NdOptionsTypeCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.ofj.aug.eric.match.options.Icmpv6NdOptionsTypeCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint8; public class Icmpv6NDOptionsTypeCodecTest { diff --git a/extension/openflowjava-extension-eric/src/test/java/org/opendaylight/openflowjava/eric/codec/match/Icmpv6NDReservedCodecTest.java b/extension/openflowjava-extension-eric/src/test/java/org/opendaylight/openflowjava/eric/codec/match/Icmpv6NDReservedCodecTest.java index 5db34ae34b..93a8ad8c43 100644 --- a/extension/openflowjava-extension-eric/src/test/java/org/opendaylight/openflowjava/eric/codec/match/Icmpv6NDReservedCodecTest.java +++ b/extension/openflowjava-extension-eric/src/test/java/org/opendaylight/openflowjava/eric/codec/match/Icmpv6NDReservedCodecTest.java @@ -18,8 +18,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.Icmpv6NdReserved; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.icmpv6.nd.reserved.grouping.Icmpv6NdReservedValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.oxm.container.match.entry.value.Icmpv6NdReservedCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.oxm.container.match.entry.value.Icmpv6NdReservedCaseValueBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.ofj.aug.eric.match.reserved.Icmpv6NdReservedCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.ofj.aug.eric.match.reserved.Icmpv6NdReservedCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint32; public class Icmpv6NDReservedCodecTest { diff --git a/extension/openflowjava-extension-nicira-api/src/main/java/org/opendaylight/openflowjava/nx/api/NiciraActionDeserializerKey.java b/extension/openflowjava-extension-nicira-api/src/main/java/org/opendaylight/openflowjava/nx/api/NiciraActionDeserializerKey.java index 5519db06f2..5a7cf5b484 100644 --- a/extension/openflowjava-extension-nicira-api/src/main/java/org/opendaylight/openflowjava/nx/api/NiciraActionDeserializerKey.java +++ b/extension/openflowjava-extension-nicira-api/src/main/java/org/opendaylight/openflowjava/nx/api/NiciraActionDeserializerKey.java @@ -7,6 +7,10 @@ */ package org.opendaylight.openflowjava.nx.api; +import static java.util.Objects.requireNonNull; + +import org.opendaylight.yangtools.yang.common.Uint8; + /** * Deserializer key for a Nicira action. * @@ -14,7 +18,7 @@ package org.opendaylight.openflowjava.nx.api; */ public final class NiciraActionDeserializerKey { - private final short version; + private final Uint8 version; private final int subtype; /** @@ -23,16 +27,16 @@ public final class NiciraActionDeserializerKey { * @param version protocol wire version * @param subtype nx_action_subtype */ - public NiciraActionDeserializerKey(short version, int subtype) { + public NiciraActionDeserializerKey(final Uint8 version, final int subtype) { if (!isValueUint16(subtype)) { throw new IllegalArgumentException( "Nicira subtype is uint16. A value of subtype has to be between 0 and 65535 include."); } - this.version = version; + this.version = requireNonNull(version); this.subtype = subtype; } - public short getVersion() { + public Uint8 getVersion() { return version; } @@ -40,7 +44,7 @@ public final class NiciraActionDeserializerKey { return subtype; } - private static boolean isValueUint16(int value) { + private static boolean isValueUint16(final int value) { if (value >= 0 && value <= 65535L) { return true; } @@ -52,12 +56,12 @@ public final class NiciraActionDeserializerKey { final int prime = 31; int result = 1; result = prime * result + subtype; - result = prime * result + version; + result = prime * result + version.hashCode(); return result; } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } @@ -68,13 +72,7 @@ public final class NiciraActionDeserializerKey { return false; } NiciraActionDeserializerKey other = (NiciraActionDeserializerKey) obj; - if (subtype != other.subtype) { - return false; - } - if (version != other.version) { - return false; - } - return true; + return subtype == other.subtype && version == other.version; } @Override diff --git a/extension/openflowjava-extension-nicira-api/src/main/java/org/opendaylight/openflowjava/nx/api/NiciraActionSerializerKey.java b/extension/openflowjava-extension-nicira-api/src/main/java/org/opendaylight/openflowjava/nx/api/NiciraActionSerializerKey.java index c496a7207d..8c8f9c4541 100644 --- a/extension/openflowjava-extension-nicira-api/src/main/java/org/opendaylight/openflowjava/nx/api/NiciraActionSerializerKey.java +++ b/extension/openflowjava-extension-nicira-api/src/main/java/org/opendaylight/openflowjava/nx/api/NiciraActionSerializerKey.java @@ -7,7 +7,11 @@ */ package org.opendaylight.openflowjava.nx.api; +import static java.util.Objects.requireNonNull; + +import java.util.Objects; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.ActionChoice; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Serializer key for a Nicira action. @@ -16,7 +20,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev1 */ public class NiciraActionSerializerKey { - private final short version; + private final Uint8 version; private final Class subtype; /** @@ -25,12 +29,12 @@ public class NiciraActionSerializerKey { * @param version protocol wire version * @param subtype nx_action_subtype */ - public NiciraActionSerializerKey(final short version, final Class subtype) { - this.version = version; + public NiciraActionSerializerKey(final Uint8 version, final Class subtype) { + this.version = requireNonNull(version); this.subtype = subtype; } - public short getVersion() { + public Uint8 getVersion() { return version; } @@ -42,8 +46,8 @@ public class NiciraActionSerializerKey { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + (subtype == null ? 0 : subtype.hashCode()); - result = prime * result + version; + result = prime * result + Objects.hashCode(subtype); + result = prime * result + version.hashCode(); return result; } @@ -59,17 +63,7 @@ public class NiciraActionSerializerKey { return false; } NiciraActionSerializerKey other = (NiciraActionSerializerKey) obj; - if (subtype == null) { - if (other.subtype != null) { - return false; - } - } else if (!subtype.equals(other.subtype)) { - return false; - } - if (version != other.version) { - return false; - } - return true; + return Objects.equals(subtype, other.subtype) && version.equals(other.version); } @Override diff --git a/extension/openflowjava-extension-nicira-api/src/test/java/org/opendaylight/openflowjava/nx/api/NiciraActionDeserializerKeyTest.java b/extension/openflowjava-extension-nicira-api/src/test/java/org/opendaylight/openflowjava/nx/api/NiciraActionDeserializerKeyTest.java index b337bbaad2..754f607e79 100644 --- a/extension/openflowjava-extension-nicira-api/src/test/java/org/opendaylight/openflowjava/nx/api/NiciraActionDeserializerKeyTest.java +++ b/extension/openflowjava-extension-nicira-api/src/test/java/org/opendaylight/openflowjava/nx/api/NiciraActionDeserializerKeyTest.java @@ -12,14 +12,13 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import org.junit.Test; +import org.opendaylight.yangtools.yang.common.Uint8; public class NiciraActionDeserializerKeyTest { + private static final Uint8 VERSION = Uint8.valueOf(4); NiciraActionDeserializerKey niciraActionDeserializerKey; - private static final short VERSION = 4; - - /** * If SUBTYPE is not Uint16 exception should be thrown. */ @@ -83,7 +82,7 @@ public class NiciraActionDeserializerKeyTest { */ @Test public void equalsTest4() { - NiciraActionDeserializerKey obj = new NiciraActionDeserializerKey((short)5, 10); + NiciraActionDeserializerKey obj = new NiciraActionDeserializerKey(Uint8.valueOf(5), 10); niciraActionDeserializerKey = new NiciraActionDeserializerKey(VERSION, 10); assertFalse(niciraActionDeserializerKey.equals(obj)); diff --git a/extension/openflowjava-extension-nicira-api/src/test/java/org/opendaylight/openflowjava/nx/api/NiciraActionSerializerKeyTest.java b/extension/openflowjava-extension-nicira-api/src/test/java/org/opendaylight/openflowjava/nx/api/NiciraActionSerializerKeyTest.java index 9b5e092a11..5f35eba415 100644 --- a/extension/openflowjava-extension-nicira-api/src/test/java/org/opendaylight/openflowjava/nx/api/NiciraActionSerializerKeyTest.java +++ b/extension/openflowjava-extension-nicira-api/src/test/java/org/opendaylight/openflowjava/nx/api/NiciraActionSerializerKeyTest.java @@ -14,15 +14,13 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.ActionChoice; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.PopVlanCase; +import org.opendaylight.yangtools.yang.common.Uint8; public class NiciraActionSerializerKeyTest { - + private static final Uint8 VERSION = Uint8.valueOf(4); NiciraActionSerializerKey niciraActionSerializerKey; - private static final short VERSION = 4; - - @Test public void niciraActionSerializerKeyTest() { niciraActionSerializerKey = new NiciraActionSerializerKey(VERSION, SubtypeClass.class); @@ -80,7 +78,7 @@ public class NiciraActionSerializerKeyTest { */ @Test public void equalsTest5() { - NiciraActionSerializerKey obj = new NiciraActionSerializerKey((short)5, SubtypeClass.class); + NiciraActionSerializerKey obj = new NiciraActionSerializerKey(Uint8.valueOf(5), SubtypeClass.class); niciraActionSerializerKey = new NiciraActionSerializerKey(VERSION, SubtypeClass.class); assertFalse(niciraActionSerializerKey.equals(obj)); diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/NiciraExtensionCodecRegistratorImpl.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/NiciraExtensionCodecRegistratorImpl.java index d400a5df35..7b037c0caf 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/NiciraExtensionCodecRegistratorImpl.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/NiciraExtensionCodecRegistratorImpl.java @@ -48,15 +48,16 @@ public class NiciraExtensionCodecRegistratorImpl implements NiciraExtensionCodec private final ActionDeserializer of10ActionDeserializer; private final ActionDeserializer of13ActionDeserializer; - public NiciraExtensionCodecRegistratorImpl(List providers) { + public NiciraExtensionCodecRegistratorImpl(final List providers) { this.providers = providers; - of10ActionDeserializer = new ActionDeserializer(EncodeConstants.OF10_VERSION_ID); - of13ActionDeserializer = new ActionDeserializer(EncodeConstants.OF13_VERSION_ID); + of10ActionDeserializer = new ActionDeserializer(EncodeConstants.OF_VERSION_1_0); + of13ActionDeserializer = new ActionDeserializer(EncodeConstants.OF_VERSION_1_3); registerActionDeserializer(ActionDeserializer.OF10_DESERIALIZER_KEY, of10ActionDeserializer); registerActionDeserializer(ActionDeserializer.OF13_DESERIALIZER_KEY, of13ActionDeserializer); } - private void registerActionDeserializer(ExperimenterActionDeserializerKey key, OFGeneralDeserializer deserializer) { + private void registerActionDeserializer(final ExperimenterActionDeserializerKey key, + final OFGeneralDeserializer deserializer) { for (SwitchConnectionProvider provider : providers) { provider.registerActionDeserializer(key, deserializer); } @@ -72,20 +73,21 @@ public class NiciraExtensionCodecRegistratorImpl implements NiciraExtensionCodec * org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer) */ @Override - public void registerActionDeserializer(NiciraActionDeserializerKey key, OFDeserializer deserializer) { + public void registerActionDeserializer(final NiciraActionDeserializerKey key, + final OFDeserializer deserializer) { if (deserializer instanceof DeserializerRegistryInjector) { DeserializerRegistryInjector registryInjectable = (DeserializerRegistryInjector) deserializer; - if (key.getVersion() == EncodeConstants.OF10_VERSION_ID) { + if (EncodeConstants.OF_VERSION_1_0.equals(key.getVersion())) { registryInjectable.injectDeserializerRegistry(of10ActionDeserializer.getDeserializerRegistry()); } - if (key.getVersion() == EncodeConstants.OF13_VERSION_ID) { + if (EncodeConstants.OF_VERSION_1_3.equals(key.getVersion())) { registryInjectable.injectDeserializerRegistry(of13ActionDeserializer.getDeserializerRegistry()); } } ACTION_DESERIALIZERS.put(key, deserializer); } - private void registerActionSerializer(ActionSerializerKey key, OFGeneralSerializer serializer) { + private void registerActionSerializer(final ActionSerializerKey key, final OFGeneralSerializer serializer) { for (SwitchConnectionProvider provider : providers) { provider.registerActionSerializer(key, serializer); } @@ -101,17 +103,17 @@ public class NiciraExtensionCodecRegistratorImpl implements NiciraExtensionCodec * org.opendaylight.openflowjava.protocol.api.extensibility.OFSerializer) */ @Override - public void registerActionSerializer(NiciraActionSerializerKey key, OFSerializer serializer) { + public void registerActionSerializer(final NiciraActionSerializerKey key, final OFSerializer serializer) { registerActionSerializer(NiciraUtil.createOfJavaKeyFrom(key), serializer); } - private void unregisterDeserializer(ExperimenterDeserializerKey key) { + private void unregisterDeserializer(final ExperimenterDeserializerKey key) { for (SwitchConnectionProvider provider : providers) { provider.unregisterDeserializer(key); } } - private void unregisterSerializer(ExperimenterSerializerKey key) { + private void unregisterSerializer(final ExperimenterSerializerKey key) { for (SwitchConnectionProvider provider : providers) { provider.unregisterSerializer(key); } @@ -126,11 +128,11 @@ public class NiciraExtensionCodecRegistratorImpl implements NiciraExtensionCodec * .openflow.extension.nicira.api.NiciraActionDeserializerKey) */ @Override - public void unregisterActionDeserializer(NiciraActionDeserializerKey key) { + public void unregisterActionDeserializer(final NiciraActionDeserializerKey key) { ACTION_DESERIALIZERS.remove(key); } - public static OFDeserializer getActionDeserializer(NiciraActionDeserializerKey key) { + public static OFDeserializer getActionDeserializer(final NiciraActionDeserializerKey key) { return ACTION_DESERIALIZERS.get(key); } @@ -143,7 +145,7 @@ public class NiciraExtensionCodecRegistratorImpl implements NiciraExtensionCodec * .openflow.extension.nicira.api.NiciraActionSerializerKey) */ @Override - public void unregisterActionSerializer(NiciraActionSerializerKey key) { + public void unregisterActionSerializer(final NiciraActionSerializerKey key) { unregisterSerializer(NiciraUtil.createOfJavaKeyFrom(key)); } @@ -157,7 +159,8 @@ public class NiciraExtensionCodecRegistratorImpl implements NiciraExtensionCodec * org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer) */ @Override - public void registerMatchEntryDeserializer(MatchEntryDeserializerKey key, OFDeserializer deserializer) { + public void registerMatchEntryDeserializer(final MatchEntryDeserializerKey key, + final OFDeserializer deserializer) { for (SwitchConnectionProvider provider : providers) { provider.registerMatchEntryDeserializer(key, deserializer); } @@ -172,7 +175,7 @@ public class NiciraExtensionCodecRegistratorImpl implements NiciraExtensionCodec * .openflowjava.protocol.api.keys.MatchEntryDeserializerKey) */ @Override - public void unregisterMatchEntryDeserializer(MatchEntryDeserializerKey key) { + public void unregisterMatchEntryDeserializer(final MatchEntryDeserializerKey key) { unregisterDeserializer(key); } @@ -186,8 +189,9 @@ public class NiciraExtensionCodecRegistratorImpl implements NiciraExtensionCodec * org.opendaylight.openflowjava.protocol.api.extensibility.OFSerializer) */ @Override - public void registerMatchEntrySerializer(MatchEntrySerializerKey key, - OFSerializer serializer) { + public void registerMatchEntrySerializer( + final MatchEntrySerializerKey key, + final OFSerializer serializer) { for (SwitchConnectionProvider provider : providers) { provider.registerMatchEntrySerializer(key, serializer); } @@ -203,7 +207,7 @@ public class NiciraExtensionCodecRegistratorImpl implements NiciraExtensionCodec */ @Override public void unregisterMatchEntrySerializer( - MatchEntrySerializerKey key) { + final MatchEntrySerializerKey key) { unregisterSerializer(key); } diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/ActionDeserializer.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/ActionDeserializer.java index 5bc192a64c..7b0abf0df2 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/ActionDeserializer.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/ActionDeserializer.java @@ -8,6 +8,8 @@ package org.opendaylight.openflowjava.nx.codec.action; +import static java.util.Objects.requireNonNull; + import io.netty.buffer.ByteBuf; import org.opendaylight.openflowjava.nx.NiciraExtensionCodecRegistratorImpl; import org.opendaylight.openflowjava.nx.api.NiciraActionDeserializerKey; @@ -18,6 +20,7 @@ import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer; import org.opendaylight.openflowjava.protocol.api.keys.ExperimenterActionDeserializerKey; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; +import org.opendaylight.yangtools.yang.common.Uint8; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -26,11 +29,12 @@ public class ActionDeserializer implements OFDeserializer, DeserializerR private static final Logger LOG = LoggerFactory.getLogger(ActionDeserializer.class); public static final ExperimenterActionDeserializerKey OF13_DESERIALIZER_KEY = new ExperimenterActionDeserializerKey( - EncodeConstants.OF13_VERSION_ID, NiciraConstants.NX_VENDOR_ID.toJava()); + EncodeConstants.OF_VERSION_1_3, NiciraConstants.NX_VENDOR_ID.toJava()); public static final ExperimenterActionDeserializerKey OF10_DESERIALIZER_KEY = new ExperimenterActionDeserializerKey( - EncodeConstants.OF10_VERSION_ID, NiciraConstants.NX_VENDOR_ID.toJava()); + EncodeConstants.OF_VERSION_1_0, NiciraConstants.NX_VENDOR_ID.toJava()); + + private final Uint8 version; - private final short version; private DeserializerRegistry deserializerRegistry; /** @@ -38,12 +42,12 @@ public class ActionDeserializer implements OFDeserializer, DeserializerR * * @param version protocol wire version */ - public ActionDeserializer(short version) { - this.version = version; + public ActionDeserializer(final Uint8 version) { + this.version = requireNonNull(version); } @Override - public Action deserialize(ByteBuf message) { + public Action deserialize(final ByteBuf message) { final int startPosition = message.readerIndex(); // size of experimenter type message.skipBytes(Short.BYTES); @@ -66,7 +70,7 @@ public class ActionDeserializer implements OFDeserializer, DeserializerR } @Override - public void injectDeserializerRegistry(DeserializerRegistry registry) { + public void injectDeserializerRegistry(final DeserializerRegistry registry) { this.deserializerRegistry = registry; } diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/ConntrackCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/ConntrackCodec.java index 45be868e22..503db82d31 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/ConntrackCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/ConntrackCodec.java @@ -22,8 +22,8 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types. import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.NxActionNatRangePresent; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionConntrack; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionConntrackBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionConntrack; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionConntrackBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.conntrack.grouping.NxActionConntrackBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.conntrack.grouping.nx.action.conntrack.CtActions; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.conntrack.grouping.nx.action.conntrack.CtActionsBuilder; @@ -58,9 +58,9 @@ public class ConntrackCodec extends AbstractActionCodec { public static final byte NXAST_CONNTRACK_SUBTYPE = 35; public static final byte NXAST_NAT_SUBTYPE = 36; public static final NiciraActionSerializerKey SERIALIZER_KEY = - new NiciraActionSerializerKey(EncodeConstants.OF13_VERSION_ID, ActionConntrack.class); + new NiciraActionSerializerKey(EncodeConstants.OF_VERSION_1_3, ActionConntrack.class); public static final NiciraActionDeserializerKey DESERIALIZER_KEY = - new NiciraActionDeserializerKey(EncodeConstants.OF13_VERSION_ID, NXAST_CONNTRACK_SUBTYPE); + new NiciraActionDeserializerKey(EncodeConstants.OF_VERSION_1_3, NXAST_CONNTRACK_SUBTYPE); @Override public void serialize(final Action input, final ByteBuf outBuffer) { diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/CtClearCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/CtClearCodec.java index 4531051274..586e4a1a51 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/CtClearCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/CtClearCodec.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.nx.codec.action; import io.netty.buffer.ByteBuf; @@ -14,8 +13,8 @@ import org.opendaylight.openflowjava.nx.api.NiciraActionSerializerKey; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionCtClear; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionCtClearBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionCtClear; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionCtClearBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.ct.clear.grouping.NxActionCtClearBuilder; /** @@ -25,19 +24,19 @@ public class CtClearCodec extends AbstractActionCodec { private static final int LENGTH = 16; private static final byte NX_CT_CLEAR_SUBTYPE = 43; public static final NiciraActionSerializerKey SERIALIZER_KEY = - new NiciraActionSerializerKey(EncodeConstants.OF13_VERSION_ID, ActionCtClear.class); + new NiciraActionSerializerKey(EncodeConstants.OF_VERSION_1_3, ActionCtClear.class); public static final NiciraActionDeserializerKey DESERIALIZER_KEY = - new NiciraActionDeserializerKey(EncodeConstants.OF13_VERSION_ID, NX_CT_CLEAR_SUBTYPE); + new NiciraActionDeserializerKey(EncodeConstants.OF_VERSION_1_3, NX_CT_CLEAR_SUBTYPE); private static final int PADDING = 6; @Override - public void serialize(Action input, ByteBuf outBuffer) { + public void serialize(final Action input, final ByteBuf outBuffer) { serializeHeader(LENGTH, NX_CT_CLEAR_SUBTYPE, outBuffer); outBuffer.writeZero(PADDING); } @Override - public Action deserialize(ByteBuf message) { + public Action deserialize(final ByteBuf message) { ActionBuilder actionBuilder = deserializeHeader(message); ActionCtClearBuilder builder = new ActionCtClearBuilder(); NxActionCtClearBuilder nxActionCtClearBuilder = new NxActionCtClearBuilder(); diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/DecNshTtlCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/DecNshTtlCodec.java index cda55a8a0d..367d456b91 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/DecNshTtlCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/DecNshTtlCodec.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.nx.codec.action; import io.netty.buffer.ByteBuf; @@ -14,8 +13,8 @@ import org.opendaylight.openflowjava.nx.api.NiciraActionSerializerKey; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionDecNshTtl; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionDecNshTtlBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionDecNshTtl; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionDecNshTtlBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.dec.nsh.ttl.grouping.NxActionDecNshTtlBuilder; public class DecNshTtlCodec extends AbstractActionCodec { @@ -23,13 +22,13 @@ public class DecNshTtlCodec extends AbstractActionCodec { private static final int LENGTH = 16; private static final byte NXAST_DEC_NSH_TTL_SUBTYPE = 48; public static final NiciraActionSerializerKey SERIALIZER_KEY = - new NiciraActionSerializerKey(EncodeConstants.OF13_VERSION_ID, ActionDecNshTtl.class); + new NiciraActionSerializerKey(EncodeConstants.OF_VERSION_1_3, ActionDecNshTtl.class); public static final NiciraActionDeserializerKey DESERIALIZER_KEY = - new NiciraActionDeserializerKey(EncodeConstants.OF13_VERSION_ID, NXAST_DEC_NSH_TTL_SUBTYPE); + new NiciraActionDeserializerKey(EncodeConstants.OF_VERSION_1_3, NXAST_DEC_NSH_TTL_SUBTYPE); private static final int PADDING = 6; @Override - public Action deserialize(ByteBuf message) { + public Action deserialize(final ByteBuf message) { ActionBuilder actionBuilder = deserializeHeader(message); ActionDecNshTtlBuilder builder = new ActionDecNshTtlBuilder(); NxActionDecNshTtlBuilder nxActionDecNshTtlBuilder = new NxActionDecNshTtlBuilder(); @@ -40,7 +39,7 @@ public class DecNshTtlCodec extends AbstractActionCodec { } @Override - public void serialize(Action input, ByteBuf outBuffer) { + public void serialize(final Action input, final ByteBuf outBuffer) { serializeHeader(LENGTH, NXAST_DEC_NSH_TTL_SUBTYPE, outBuffer); outBuffer.writeZero(PADDING); } diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/DecapCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/DecapCodec.java index 1979c6f9a6..79d7121043 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/DecapCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/DecapCodec.java @@ -15,8 +15,8 @@ import org.opendaylight.openflowjava.nx.api.NiciraActionSerializerKey; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionDecap; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionDecapBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionDecap; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionDecapBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.decap.grouping.NxActionDecapBuilder; public class DecapCodec extends AbstractActionCodec { @@ -26,12 +26,12 @@ public class DecapCodec extends AbstractActionCodec { private static final int PADDING = 2; public static final NiciraActionSerializerKey SERIALIZER_KEY = - new NiciraActionSerializerKey(EncodeConstants.OF13_VERSION_ID, ActionDecap.class); + new NiciraActionSerializerKey(EncodeConstants.OF_VERSION_1_3, ActionDecap.class); public static final NiciraActionDeserializerKey DESERIALIZER_KEY = - new NiciraActionDeserializerKey(EncodeConstants.OF13_VERSION_ID, NXAST_DECAP_SUBTYPE); + new NiciraActionDeserializerKey(EncodeConstants.OF_VERSION_1_3, NXAST_DECAP_SUBTYPE); @Override - public Action deserialize(ByteBuf message) { + public Action deserialize(final ByteBuf message) { final ActionBuilder actionBuilder = deserializeHeader(message); // skip padding message.skipBytes(PADDING); @@ -43,7 +43,7 @@ public class DecapCodec extends AbstractActionCodec { } @Override - public void serialize(Action input, ByteBuf outBuffer) { + public void serialize(final Action input, final ByteBuf outBuffer) { serializeHeader(LENGTH, NXAST_DECAP_SUBTYPE, outBuffer); // add padding outBuffer.writeZero(PADDING); diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/EncapCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/EncapCodec.java index bbb0241105..3245bbd51e 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/EncapCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/EncapCodec.java @@ -15,8 +15,8 @@ import org.opendaylight.openflowjava.nx.api.NiciraActionSerializerKey; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionEncap; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionEncapBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionEncap; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionEncapBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.encap.grouping.NxActionEncap; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.encap.grouping.NxActionEncapBuilder; @@ -27,12 +27,12 @@ public class EncapCodec extends AbstractActionCodec { private static final int HEADER_SIZE_NOT_SPECIFIED = 0; public static final NiciraActionSerializerKey SERIALIZER_KEY = - new NiciraActionSerializerKey(EncodeConstants.OF13_VERSION_ID, ActionEncap.class); + new NiciraActionSerializerKey(EncodeConstants.OF_VERSION_1_3, ActionEncap.class); public static final NiciraActionDeserializerKey DESERIALIZER_KEY = - new NiciraActionDeserializerKey(EncodeConstants.OF13_VERSION_ID, NXAST_ENCAP_SUBTYPE); + new NiciraActionDeserializerKey(EncodeConstants.OF_VERSION_1_3, NXAST_ENCAP_SUBTYPE); @Override - public Action deserialize(ByteBuf message) { + public Action deserialize(final ByteBuf message) { final ActionBuilder actionBuilder = deserializeHeader(message); // skip header size, not used message.skipBytes(Short.BYTES); @@ -43,7 +43,7 @@ public class EncapCodec extends AbstractActionCodec { } @Override - public void serialize(Action input, ByteBuf outBuffer) { + public void serialize(final Action input, final ByteBuf outBuffer) { serializeHeader(LENGTH, NXAST_ENCAP_SUBTYPE, outBuffer); outBuffer.writeShort(HEADER_SIZE_NOT_SPECIFIED); ActionEncap actionEncap = (ActionEncap) input.getActionChoice(); diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/FinTimeoutCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/FinTimeoutCodec.java index 63ae37bd1b..6e134f1a5e 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/FinTimeoutCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/FinTimeoutCodec.java @@ -15,8 +15,8 @@ import org.opendaylight.openflowjava.nx.api.NiciraActionSerializerKey; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionFinTimeout; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionFinTimeoutBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionFinTimeout; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionFinTimeoutBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.fin.timeout.grouping.NxActionFinTimeoutBuilder; /** @@ -27,9 +27,9 @@ public class FinTimeoutCodec extends AbstractActionCodec { public static final int LENGTH = 16; public static final byte NXAST_FIN_TIMEOUT_SUBTYPE = 19; public static final NiciraActionSerializerKey SERIALIZER_KEY = - new NiciraActionSerializerKey(EncodeConstants.OF13_VERSION_ID, ActionFinTimeout.class); + new NiciraActionSerializerKey(EncodeConstants.OF_VERSION_1_3, ActionFinTimeout.class); public static final NiciraActionDeserializerKey DESERIALIZER_KEY = - new NiciraActionDeserializerKey(EncodeConstants.OF13_VERSION_ID, NXAST_FIN_TIMEOUT_SUBTYPE); + new NiciraActionDeserializerKey(EncodeConstants.OF_VERSION_1_3, NXAST_FIN_TIMEOUT_SUBTYPE); private static final short OFP_NO_TIMEOUT = (short) 0; private static final int PADDING = 2; // nx_action_fin_timeout : uint8_t pad[2]; diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/LearnCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/LearnCodec.java index 241b1549bd..71dad1a2f0 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/LearnCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/LearnCodec.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.nx.codec.action; import io.netty.buffer.ByteBuf; @@ -16,8 +15,8 @@ import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ExperimenterId; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionLearn; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionLearnBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionLearn; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionLearnBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.learn.grouping.NxActionLearnBuilder; /** @@ -28,9 +27,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev1 public class LearnCodec extends AbstractActionCodec { public static final byte NXAST_LEARN_SUBTYPE = 16; public static final NiciraActionSerializerKey SERIALIZER_KEY = - new NiciraActionSerializerKey(EncodeConstants.OF13_VERSION_ID, ActionLearn.class); + new NiciraActionSerializerKey(EncodeConstants.OF_VERSION_1_3, ActionLearn.class); public static final NiciraActionDeserializerKey DESERIALIZER_KEY = - new NiciraActionDeserializerKey(EncodeConstants.OF13_VERSION_ID, NXAST_LEARN_SUBTYPE); + new NiciraActionDeserializerKey(EncodeConstants.OF_VERSION_1_3, NXAST_LEARN_SUBTYPE); private static final int MUL_LENGTH = 8; @Override diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/LearnCodecUtil.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/LearnCodecUtil.java index 3aba996334..cafed6692e 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/LearnCodecUtil.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/LearnCodecUtil.java @@ -16,7 +16,6 @@ import static org.opendaylight.yangtools.yang.common.netty.ByteBufUtils.readUint import io.netty.buffer.ByteBuf; import java.util.ArrayList; import java.util.List; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionLearn; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.flow.mod.spec.flow.mod.spec.FlowModAddMatchFromFieldCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.flow.mod.spec.flow.mod.spec.FlowModAddMatchFromFieldCaseBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.flow.mod.spec.flow.mod.spec.FlowModAddMatchFromValueCase; @@ -37,6 +36,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev1 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.flow.mod.spec.flow.mod.spec.flow.mod.copy.value.into.field._case.FlowModCopyValueIntoFieldBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.flow.mod.spec.flow.mod.spec.flow.mod.output.to.port._case.FlowModOutputToPort; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.flow.mod.spec.flow.mod.spec.flow.mod.output.to.port._case.FlowModOutputToPortBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionLearn; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.learn.grouping.NxActionLearnBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.learn.grouping.nx.action.learn.FlowMods; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.learn.grouping.nx.action.learn.FlowModsBuilder; diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/MultipathCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/MultipathCodec.java index 4662aa99e9..d946bf03ef 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/MultipathCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/MultipathCodec.java @@ -18,8 +18,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev1 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.OfjNxHashFields; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.OfjNxMpAlgorithm; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionMultipath; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionMultipathBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionMultipath; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionMultipathBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.multipath.grouping.NxActionMultipathBuilder; /** @@ -29,9 +29,9 @@ public class MultipathCodec extends AbstractActionCodec { public static final int LENGTH = 32; public static final byte NXAST_MULTIPATH_SUBTYPE = 10; public static final NiciraActionSerializerKey SERIALIZER_KEY = - new NiciraActionSerializerKey(EncodeConstants.OF13_VERSION_ID, ActionMultipath.class); + new NiciraActionSerializerKey(EncodeConstants.OF_VERSION_1_3, ActionMultipath.class); public static final NiciraActionDeserializerKey DESERIALIZER_KEY = - new NiciraActionDeserializerKey(EncodeConstants.OF13_VERSION_ID, NXAST_MULTIPATH_SUBTYPE); + new NiciraActionDeserializerKey(EncodeConstants.OF_VERSION_1_3, NXAST_MULTIPATH_SUBTYPE); @Override public void serialize(final Action input, final ByteBuf outBuffer) { diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/OutputReg2Codec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/OutputReg2Codec.java index 31588e3490..eb0fabdd96 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/OutputReg2Codec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/OutputReg2Codec.java @@ -14,17 +14,17 @@ import org.opendaylight.openflowjava.nx.api.NiciraActionDeserializerKey; import org.opendaylight.openflowjava.nx.api.NiciraActionSerializerKey; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionOutputReg2; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionOutputReg2Builder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionOutputReg2; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionOutputReg2Builder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.output.reg2.grouping.NxActionOutputReg2Builder; public class OutputReg2Codec extends AbstractActionCodec { public static final byte SUBTYPE = 32; // NXAST_OUTPUT_REG2 public static final NiciraActionSerializerKey SERIALIZER_KEY = - new NiciraActionSerializerKey(EncodeConstants.OF13_VERSION_ID, ActionOutputReg2.class); + new NiciraActionSerializerKey(EncodeConstants.OF_VERSION_1_3, ActionOutputReg2.class); public static final NiciraActionDeserializerKey DESERIALIZER_KEY = - new NiciraActionDeserializerKey(EncodeConstants.OF13_VERSION_ID, SUBTYPE); + new NiciraActionDeserializerKey(EncodeConstants.OF_VERSION_1_3, SUBTYPE); @Override public Action deserialize(final ByteBuf message) { diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/OutputRegCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/OutputRegCodec.java index a10fcf026e..8869a5086a 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/OutputRegCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/OutputRegCodec.java @@ -16,8 +16,8 @@ import org.opendaylight.openflowjava.nx.api.NiciraActionSerializerKey; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionOutputReg; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionOutputRegBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionOutputReg; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionOutputRegBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.output.reg.grouping.NxActionOutputRegBuilder; /** @@ -30,9 +30,9 @@ public class OutputRegCodec extends AbstractActionCodec { public static final byte SUBTYPE = 15; // NXAST_OUTPUT_REG public static final byte PADDING_IN_OUTPUT_REG_ACTION = 6; public static final NiciraActionSerializerKey SERIALIZER_KEY = - new NiciraActionSerializerKey(EncodeConstants.OF13_VERSION_ID, ActionOutputReg.class); + new NiciraActionSerializerKey(EncodeConstants.OF_VERSION_1_3, ActionOutputReg.class); public static final NiciraActionDeserializerKey DESERIALIZER_KEY = - new NiciraActionDeserializerKey(EncodeConstants.OF13_VERSION_ID, SUBTYPE); + new NiciraActionDeserializerKey(EncodeConstants.OF_VERSION_1_3, SUBTYPE); @Override public void serialize(final Action input, final ByteBuf outBuffer) { diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/RegLoad2Codec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/RegLoad2Codec.java index 41537658c4..03c31e1888 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/RegLoad2Codec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/RegLoad2Codec.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.nx.codec.action; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; @@ -23,13 +22,13 @@ import org.opendaylight.openflowjava.protocol.api.extensibility.SerializerRegist import org.opendaylight.openflowjava.protocol.api.keys.MatchEntryDeserializerKey; import org.opendaylight.openflowjava.protocol.api.keys.MatchEntrySerializerKey; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.ExperimenterClass; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionRegLoad2; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionRegLoad2Builder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionRegLoad2; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionRegLoad2Builder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.reg.load2.grouping.NxActionRegLoad2; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.reg.load2.grouping.NxActionRegLoad2Builder; import org.opendaylight.yangtools.yang.common.Uint32; @@ -40,15 +39,15 @@ public class RegLoad2Codec public static final byte SUBTYPE = 33; // NXAST_REG_LOAD2 public static final NiciraActionSerializerKey SERIALIZER_KEY = new NiciraActionSerializerKey( - EncodeConstants.OF13_VERSION_ID, ActionRegLoad2.class); + EncodeConstants.OF_VERSION_1_3, ActionRegLoad2.class); public static final NiciraActionDeserializerKey DESERIALIZER_KEY = new NiciraActionDeserializerKey( - EncodeConstants.OF13_VERSION_ID, SUBTYPE); + EncodeConstants.OF_VERSION_1_3, SUBTYPE); private SerializerRegistry serializerRegistry; private DeserializerRegistry deserializerRegistry; @Override @SuppressFBWarnings("UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR") // FB doesn't recognize Objects.requireNonNull - public Action deserialize(ByteBuf message) { + public Action deserialize(final ByteBuf message) { Objects.requireNonNull(deserializerRegistry); final int startIndex = message.readerIndex(); @@ -57,7 +56,7 @@ public class RegLoad2Codec int oxmClass = message.getUnsignedShort(message.readerIndex()); int oxmField = message.getUnsignedByte(message.readerIndex() + Short.BYTES) >>> 1; MatchEntryDeserializerKey key = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, oxmClass, oxmField); if (oxmClass == EncodeConstants.EXPERIMENTER_VALUE) { @@ -78,7 +77,7 @@ public class RegLoad2Codec @Override @SuppressFBWarnings("UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR") // FB doesn't recognize Objects.requireNonNull - public void serialize(Action input, ByteBuf outBuffer) { + public void serialize(final Action input, final ByteBuf outBuffer) { Objects.requireNonNull(serializerRegistry); final int startIndex = outBuffer.writerIndex(); @@ -88,7 +87,7 @@ public class RegLoad2Codec NxActionRegLoad2 nxActionRegLoad2 = actionRegLoad2.getNxActionRegLoad2(); MatchEntry matchEntry = nxActionRegLoad2.getMatchEntry().get(0); MatchEntrySerializerKey key = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, matchEntry.getOxmClass(), matchEntry.getOxmMatchField()); if (matchEntry.getOxmClass().equals(ExperimenterClass.class)) { @@ -102,12 +101,12 @@ public class RegLoad2Codec } @Override - public void injectSerializerRegistry(SerializerRegistry registry) { + public void injectSerializerRegistry(final SerializerRegistry registry) { this.serializerRegistry = registry; } @Override - public void injectDeserializerRegistry(DeserializerRegistry registry) { + public void injectDeserializerRegistry(final DeserializerRegistry registry) { this.deserializerRegistry = registry; } } diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/RegLoadCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/RegLoadCodec.java index 57ff43cf59..683286d500 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/RegLoadCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/RegLoadCodec.java @@ -16,8 +16,8 @@ import org.opendaylight.openflowjava.nx.api.NiciraActionDeserializerKey; import org.opendaylight.openflowjava.nx.api.NiciraActionSerializerKey; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionRegLoad; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionRegLoadBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionRegLoad; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionRegLoadBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.reg.load.grouping.NxActionRegLoadBuilder; public class RegLoadCodec extends AbstractActionCodec { @@ -25,9 +25,9 @@ public class RegLoadCodec extends AbstractActionCodec { public static final int LENGTH = 24; public static final byte SUBTYPE = 7; // NXAST_REG_LOAD public static final NiciraActionSerializerKey SERIALIZER_KEY = new NiciraActionSerializerKey( - EncodeConstants.OF13_VERSION_ID, ActionRegLoad.class); + EncodeConstants.OF_VERSION_1_3, ActionRegLoad.class); public static final NiciraActionDeserializerKey DESERIALIZER_KEY = new NiciraActionDeserializerKey( - EncodeConstants.OF13_VERSION_ID, SUBTYPE); + EncodeConstants.OF_VERSION_1_3, SUBTYPE); @Override public void serialize(final Action input, final ByteBuf outBuffer) { diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/RegMoveCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/RegMoveCodec.java index fc624173c0..4fcc41bdd5 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/RegMoveCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/RegMoveCodec.java @@ -14,17 +14,17 @@ import org.opendaylight.openflowjava.nx.api.NiciraActionDeserializerKey; import org.opendaylight.openflowjava.nx.api.NiciraActionSerializerKey; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionRegMove; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionRegMoveBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionRegMove; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionRegMoveBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.reg.move.grouping.NxActionRegMoveBuilder; public class RegMoveCodec extends AbstractActionCodec { public static final byte SUBTYPE = 6; // NXAST_REG_MOVE public static final NiciraActionSerializerKey SERIALIZER_KEY = new NiciraActionSerializerKey( - EncodeConstants.OF13_VERSION_ID, ActionRegMove.class); + EncodeConstants.OF_VERSION_1_3, ActionRegMove.class); public static final NiciraActionDeserializerKey DESERIALIZER_KEY = new NiciraActionDeserializerKey( - EncodeConstants.OF13_VERSION_ID, SUBTYPE); + EncodeConstants.OF_VERSION_1_3, SUBTYPE); @Override public void serialize(final Action input, final ByteBuf outBuffer) { diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/ResubmitCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/ResubmitCodec.java index cb8ef17267..800ac98b02 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/ResubmitCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/ResubmitCodec.java @@ -16,8 +16,8 @@ import org.opendaylight.openflowjava.nx.api.NiciraActionSerializerKey; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionResubmit; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionResubmitBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionResubmit; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionResubmitBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.resubmit.grouping.NxActionResubmitBuilder; /** @@ -29,11 +29,11 @@ public class ResubmitCodec extends AbstractActionCodec { public static final byte NXAST_RESUBMIT_SUBTYPE = 1; public static final byte NXAST_RESUBMIT_TABLE_SUBTYPE = 14; public static final NiciraActionSerializerKey SERIALIZER_KEY = - new NiciraActionSerializerKey(EncodeConstants.OF13_VERSION_ID, ActionResubmit.class); + new NiciraActionSerializerKey(EncodeConstants.OF_VERSION_1_3, ActionResubmit.class); public static final NiciraActionDeserializerKey DESERIALIZER_KEY = - new NiciraActionDeserializerKey(EncodeConstants.OF13_VERSION_ID, NXAST_RESUBMIT_SUBTYPE); + new NiciraActionDeserializerKey(EncodeConstants.OF_VERSION_1_3, NXAST_RESUBMIT_SUBTYPE); public static final NiciraActionDeserializerKey TABLE_DESERIALIZER_KEY = - new NiciraActionDeserializerKey(EncodeConstants.OF13_VERSION_ID, NXAST_RESUBMIT_TABLE_SUBTYPE); + new NiciraActionDeserializerKey(EncodeConstants.OF_VERSION_1_3, NXAST_RESUBMIT_TABLE_SUBTYPE); private static final byte OFP_TABLE_ALL = (byte) 255; private static final short OFP_IN_PORT = (short) 0xfff8; diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/AbstractExperimenterMatchCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/AbstractExperimenterMatchCodec.java index eaa7da5a40..4632fa423e 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/AbstractExperimenterMatchCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/AbstractExperimenterMatchCodec.java @@ -12,9 +12,9 @@ import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.openflowjava.protocol.api.keys.MatchEntryDeserializerKey; import org.opendaylight.openflowjava.protocol.api.keys.MatchEntrySerializerKey; import org.opendaylight.openflowjava.protocol.api.util.OxmMatchConstants; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCase; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.experimenter.id._case.ExperimenterBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.experimenter.id._case.ExperimenterBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ExperimenterId; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.ExperimenterClass; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.MatchField; @@ -23,13 +23,14 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.OfjAugNxExpMatch; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.OfjAugNxExpMatchBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.NxExpMatchEntryValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.NxExpMatchEntryValue; import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint8; public abstract class AbstractExperimenterMatchCodec extends AbstractMatchCodec { protected static MatchEntrySerializerKey createSerializerKey( - final short version, final Uint32 expId, final Class oxmField) { + final Uint8 version, final Uint32 expId, final Class oxmField) { MatchEntrySerializerKey key = new MatchEntrySerializerKey<>( version, ExperimenterClass.class, oxmField); key.setExperimenterId(expId); @@ -37,7 +38,7 @@ public abstract class AbstractExperimenterMatchCodec extends AbstractMatchCodec } protected static MatchEntryDeserializerKey createDeserializerKey( - final short version, final Uint32 expId, final int fieldCode) { + final Uint8 version, final Uint32 expId, final int fieldCode) { MatchEntryDeserializerKey key = new MatchEntryDeserializerKey( version, OxmMatchConstants.EXPERIMENTER_CLASS, fieldCode); key.setExperimenterId(expId); diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/AbstractNshcCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/AbstractNshcCodec.java index e66a09a6eb..b40b95056e 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/AbstractNshcCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/AbstractNshcCodec.java @@ -11,14 +11,14 @@ import static org.opendaylight.yangtools.yang.common.netty.ByteBufUtils.readUint import io.netty.buffer.ByteBuf; import org.opendaylight.openflowjava.nx.api.NiciraConstants; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.NxExpMatchEntryValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshcCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshcCaseValueBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.NxExpMatchEntryValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshcCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshcCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint32; public abstract class AbstractNshcCodec extends AbstractExperimenterMatchCodec { @Override - protected void serializeValue(NxExpMatchEntryValue value, boolean hasMask, ByteBuf outBuffer) { + protected void serializeValue(final NxExpMatchEntryValue value, final boolean hasMask, final ByteBuf outBuffer) { NshcCaseValue nshcCaseValue = (NshcCaseValue) value; outBuffer.writeInt(nshcCaseValue.getNshc().intValue()); if (hasMask) { @@ -27,7 +27,7 @@ public abstract class AbstractNshcCodec extends AbstractExperimenterMatchCodec { } @Override - protected NxExpMatchEntryValue deserializeValue(ByteBuf message, boolean hasMask) { + protected NxExpMatchEntryValue deserializeValue(final ByteBuf message, final boolean hasMask) { Uint32 nshc = readUint32(message); Uint32 mask = hasMask ? readUint32(message) : null; return new NshcCaseValueBuilder().setNshc(nshc).setMask(mask).build(); diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/AbstractRegCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/AbstractRegCodec.java index 90610e8594..f592d51959 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/AbstractRegCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/AbstractRegCodec.java @@ -15,9 +15,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmClassBase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.RegCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.RegCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.reg.grouping.RegValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.RegCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.RegCaseValueBuilder; public abstract class AbstractRegCodec extends AbstractMatchCodec { private static final int VALUE_LENGTH = 4; diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/ArpOpCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/ArpOpCodec.java index f747a74a1a..5da1f64db0 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/ArpOpCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/ArpOpCodec.java @@ -19,27 +19,27 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm0 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmClassBase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfArpOp; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.ArpOpCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.ArpOpCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.arp.op.grouping.ArpOpValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.ArpOpCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.ArpOpCaseValueBuilder; public class ArpOpCodec extends AbstractMatchCodec { private static final int VALUE_LENGTH = 2; private static final int NXM_FIELD_CODE = 15; public static final MatchEntrySerializerKey SERIALIZER_KEY = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, Nxm0Class.class, NxmOfArpOp.class); + EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfArpOp.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); @Override - public void serialize(MatchEntry input, ByteBuf outBuffer) { + public void serialize(final MatchEntry input, final ByteBuf outBuffer) { serializeHeader(input, outBuffer); ArpOpCaseValue arpOpCase = (ArpOpCaseValue) input.getMatchEntryValue(); outBuffer.writeShort(arpOpCase.getArpOpValues().getValue().toJava()); } @Override - public MatchEntry deserialize(ByteBuf message) { + public MatchEntry deserialize(final ByteBuf message) { return deserializeHeaderToBuilder(message) .setMatchEntryValue(new ArpOpCaseValueBuilder() .setArpOpValues(new ArpOpValuesBuilder().setValue(readUint16(message)).build()) diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/ArpShaCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/ArpShaCodec.java index 967f55009e..be88d4ec7a 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/ArpShaCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/ArpShaCodec.java @@ -19,27 +19,27 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmC import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxArpSha; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.ArpShaCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.ArpShaCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.arp.sha.grouping.ArpShaValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.ArpShaCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.ArpShaCaseValueBuilder; public class ArpShaCodec extends AbstractMatchCodec { private static final int VALUE_LENGTH = 6; private static final int NXM_FIELD_CODE = 17; public static final MatchEntrySerializerKey SERIALIZER_KEY = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxArpSha.class); + EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxArpSha.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); @Override - public void serialize(MatchEntry input, ByteBuf outBuffer) { + public void serialize(final MatchEntry input, final ByteBuf outBuffer) { serializeHeader(input, outBuffer); ArpShaCaseValue value = (ArpShaCaseValue) input.getMatchEntryValue(); outBuffer.writeBytes(IetfYangUtil.INSTANCE.macAddressBytes(value.getArpShaValues().getMacAddress())); } @Override - public MatchEntry deserialize(ByteBuf message) { + public MatchEntry deserialize(final ByteBuf message) { MatchEntryBuilder matchEntriesBuilder = deserializeHeaderToBuilder(message); byte[] address = new byte[VALUE_LENGTH]; message.readBytes(address); diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/ArpSpaCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/ArpSpaCodec.java index d4e9069af5..274012af17 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/ArpSpaCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/ArpSpaCodec.java @@ -19,27 +19,27 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm0 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmClassBase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfArpSpa; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.ArpSpaCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.ArpSpaCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.arp.spa.grouping.ArpSpaValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.ArpSpaCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.ArpSpaCaseValueBuilder; public class ArpSpaCodec extends AbstractMatchCodec { private static final int VALUE_LENGTH = 4; private static final int NXM_FIELD_CODE = 16; public static final MatchEntrySerializerKey SERIALIZER_KEY = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, Nxm0Class.class, NxmOfArpSpa.class); + EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfArpSpa.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); @Override - public void serialize(MatchEntry input, ByteBuf outBuffer) { + public void serialize(final MatchEntry input, final ByteBuf outBuffer) { serializeHeader(input, outBuffer); ArpSpaCaseValue arpSpaCase = (ArpSpaCaseValue) input.getMatchEntryValue(); outBuffer.writeInt(arpSpaCase.getArpSpaValues().getValue().intValue()); } @Override - public MatchEntry deserialize(ByteBuf message) { + public MatchEntry deserialize(final ByteBuf message) { return deserializeHeaderToBuilder(message) .setMatchEntryValue(new ArpSpaCaseValueBuilder() .setArpSpaValues(new ArpSpaValuesBuilder().setValue(readUint32(message)).build()) diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/ArpThaCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/ArpThaCodec.java index 280bc3a8b2..6fa5223780 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/ArpThaCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/ArpThaCodec.java @@ -19,27 +19,27 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmC import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxArpTha; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.ArpThaCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.ArpThaCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.arp.tha.grouping.ArpThaValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.ArpThaCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.ArpThaCaseValueBuilder; public class ArpThaCodec extends AbstractMatchCodec { private static final int VALUE_LENGTH = 6; private static final int NXM_FIELD_CODE = 18; public static final MatchEntrySerializerKey SERIALIZER_KEY = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxArpTha.class); + EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxArpTha.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); @Override - public void serialize(MatchEntry input, ByteBuf outBuffer) { + public void serialize(final MatchEntry input, final ByteBuf outBuffer) { serializeHeader(input, outBuffer); ArpThaCaseValue arpThaCase = (ArpThaCaseValue) input.getMatchEntryValue(); outBuffer.writeBytes(IetfYangUtil.INSTANCE.macAddressBytes(arpThaCase.getArpThaValues().getMacAddress())); } @Override - public MatchEntry deserialize(ByteBuf message) { + public MatchEntry deserialize(final ByteBuf message) { MatchEntryBuilder matchEntryBuilder = deserializeHeaderToBuilder(message); byte[] address = new byte[VALUE_LENGTH]; message.readBytes(address); diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/ArpTpaCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/ArpTpaCodec.java index e47f34676a..d25d49f995 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/ArpTpaCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/ArpTpaCodec.java @@ -19,27 +19,27 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm0 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmClassBase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfArpTpa; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.ArpTpaCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.ArpTpaCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.arp.tpa.grouping.ArpTpaValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.ArpTpaCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.ArpTpaCaseValueBuilder; public class ArpTpaCodec extends AbstractMatchCodec { private static final int VALUE_LENGTH = 4; private static final int NXM_FIELD_CODE = 17; public static final MatchEntrySerializerKey SERIALIZER_KEY = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, Nxm0Class.class, NxmOfArpTpa.class); + EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfArpTpa.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); @Override - public void serialize(MatchEntry input, ByteBuf outBuffer) { + public void serialize(final MatchEntry input, final ByteBuf outBuffer) { serializeHeader(input, outBuffer); ArpTpaCaseValue arpTpaCase = (ArpTpaCaseValue) input.getMatchEntryValue(); outBuffer.writeInt(arpTpaCase.getArpTpaValues().getValue().intValue()); } @Override - public MatchEntry deserialize(ByteBuf message) { + public MatchEntry deserialize(final ByteBuf message) { return deserializeHeaderToBuilder(message) .setMatchEntryValue(new ArpTpaCaseValueBuilder() .setArpTpaValues(new ArpTpaValuesBuilder().setValue(readUint32(message)).build()) diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/CtMarkCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/CtMarkCodec.java index 18aa86cc6a..83cf1fdc7e 100755 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/CtMarkCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/CtMarkCodec.java @@ -20,9 +20,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmC import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxCtMark; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.CtMarkCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.CtMarkCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.ct.mark.grouping.CtMarkValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.CtMarkCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.CtMarkCaseValueBuilder; /** * Codec for CtMark. @@ -34,9 +34,9 @@ public class CtMarkCodec extends AbstractMatchCodec { private static final int NXM_FIELD_CODE = 107; public static final MatchEntrySerializerKey SERIALIZER_KEY = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxCtMark.class); + EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxCtMark.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); @Override public void serialize(final MatchEntry input, final ByteBuf outBuffer) { diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/CtStateCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/CtStateCodec.java index 1508e58027..7ce1fc74bb 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/CtStateCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/CtStateCodec.java @@ -19,9 +19,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmClassBase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxCtState; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.CtStateCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.CtStateCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.ct.state.grouping.CtStateValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.CtStateCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.CtStateCaseValueBuilder; /** * Codec for CtSate. @@ -33,12 +33,12 @@ public class CtStateCodec extends AbstractMatchCodec { private static final int VALUE_LENGTH = 4; private static final int NXM_FIELD_CODE = 105; public static final MatchEntrySerializerKey SERIALIZER_KEY = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxCtState.class); + EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxCtState.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); @Override - public void serialize(MatchEntry input, ByteBuf outBuffer) { + public void serialize(final MatchEntry input, final ByteBuf outBuffer) { serializeHeader(input, outBuffer); CtStateCaseValue ctStateCase = (CtStateCaseValue) input.getMatchEntryValue(); outBuffer.writeInt(ctStateCase.getCtStateValues().getCtState().intValue()); @@ -46,7 +46,7 @@ public class CtStateCodec extends AbstractMatchCodec { } @Override - public MatchEntry deserialize(ByteBuf message) { + public MatchEntry deserialize(final ByteBuf message) { return deserializeHeaderToBuilder(message) .setHasMask(true) .setMatchEntryValue(new CtStateCaseValueBuilder() diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/CtTpDstCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/CtTpDstCodec.java index f401244a76..986bbd9b6b 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/CtTpDstCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/CtTpDstCodec.java @@ -19,28 +19,28 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmClassBase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxCtTpDst; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.CtTpDstCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.CtTpDstCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.ct.tp.dst.grouping.CtTpDstValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.CtTpDstCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.CtTpDstCaseValueBuilder; public class CtTpDstCodec extends AbstractMatchCodec { private static final int VALUE_LENGTH = 2; private static final int NXM_FIELD_CODE = 125; public static final MatchEntrySerializerKey SERIALIZER_KEY = - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxCtTpDst.class); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxCtTpDst.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); @Override - public void serialize(MatchEntry input, ByteBuf outBuffer) { + public void serialize(final MatchEntry input, final ByteBuf outBuffer) { serializeHeader(input, outBuffer); CtTpDstCaseValue ctTpSrcCase = (CtTpDstCaseValue)input.getMatchEntryValue(); outBuffer.writeShort(ctTpSrcCase.getCtTpDstValues().getCtTpDst().toJava()); } @Override - public MatchEntry deserialize(ByteBuf message) { + public MatchEntry deserialize(final ByteBuf message) { return deserializeHeaderToBuilder(message) .setMatchEntryValue(new CtTpDstCaseValueBuilder() .setCtTpDstValues(new CtTpDstValuesBuilder().setCtTpDst(readUint16(message)).build()) diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/CtTpSrcCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/CtTpSrcCodec.java index 2a15df91cb..06e0843fc3 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/CtTpSrcCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/CtTpSrcCodec.java @@ -19,28 +19,28 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmClassBase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxCtTpSrc; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.CtTpSrcCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.CtTpSrcCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.ct.tp.src.grouping.CtTpSrcValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.CtTpSrcCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.CtTpSrcCaseValueBuilder; public class CtTpSrcCodec extends AbstractMatchCodec { private static final int VALUE_LENGTH = 2; private static final int NXM_FIELD_CODE = 124; public static final MatchEntrySerializerKey SERIALIZER_KEY = - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxCtTpSrc.class); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxCtTpSrc.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); @Override - public void serialize(MatchEntry input, ByteBuf outBuffer) { + public void serialize(final MatchEntry input, final ByteBuf outBuffer) { serializeHeader(input, outBuffer); CtTpSrcCaseValue ctTpSrcCase = (CtTpSrcCaseValue)input.getMatchEntryValue(); outBuffer.writeShort(ctTpSrcCase.getCtTpSrcValues().getCtTpSrc().toJava()); } @Override - public MatchEntry deserialize(ByteBuf message) { + public MatchEntry deserialize(final ByteBuf message) { return deserializeHeaderToBuilder(message) .setMatchEntryValue(new CtTpSrcCaseValueBuilder() .setCtTpSrcValues(new CtTpSrcValuesBuilder().setCtTpSrc(readUint16(message)).build()) diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/CtZoneCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/CtZoneCodec.java index cb452331f9..1771dd95f7 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/CtZoneCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/CtZoneCodec.java @@ -19,9 +19,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmClassBase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxCtZone; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.CtZoneCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.CtZoneCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.ct.zone.grouping.CtZoneValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.CtZoneCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.CtZoneCaseValueBuilder; /** * Codec for CtZone. @@ -33,19 +33,19 @@ public class CtZoneCodec extends AbstractMatchCodec { private static final int VALUE_LENGTH = 2; private static final int NXM_FIELD_CODE = 106; public static final MatchEntrySerializerKey SERIALIZER_KEY = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxCtZone.class); + EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxCtZone.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); @Override - public void serialize(MatchEntry input, ByteBuf outBuffer) { + public void serialize(final MatchEntry input, final ByteBuf outBuffer) { serializeHeader(input, outBuffer); CtZoneCaseValue ctZoneCase = (CtZoneCaseValue) input.getMatchEntryValue(); outBuffer.writeShort(ctZoneCase.getCtZoneValues().getCtZone().toJava()); } @Override - public MatchEntry deserialize(ByteBuf message) { + public MatchEntry deserialize(final ByteBuf message) { return deserializeHeaderToBuilder(message) .setMatchEntryValue(new CtZoneCaseValueBuilder() .setCtZoneValues(new CtZoneValuesBuilder().setCtZone(readUint16(message)).build()) diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/EthDstCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/EthDstCodec.java index 8e5a5b120e..1e1430d95b 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/EthDstCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/EthDstCodec.java @@ -19,27 +19,27 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmC import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfEthDst; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.EthDstCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.EthDstCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.eth.dst.grouping.EthDstValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.EthDstCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.EthDstCaseValueBuilder; public class EthDstCodec extends AbstractMatchCodec { private static final int VALUE_LENGTH = 6; private static final int NXM_FIELD_CODE = 1; public static final MatchEntrySerializerKey SERIALIZER_KEY = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, Nxm0Class.class, NxmOfEthDst.class); + EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfEthDst.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); @Override - public void serialize(MatchEntry input, ByteBuf outBuffer) { + public void serialize(final MatchEntry input, final ByteBuf outBuffer) { serializeHeader(input, outBuffer); EthDstCaseValue ethDstCase = (EthDstCaseValue) input.getMatchEntryValue(); outBuffer.writeBytes(IetfYangUtil.INSTANCE.macAddressBytes(ethDstCase.getEthDstValues().getMacAddress())); } @Override - public MatchEntry deserialize(ByteBuf message) { + public MatchEntry deserialize(final ByteBuf message) { MatchEntryBuilder matchEntryBuilder = deserializeHeaderToBuilder(message); byte[] address = new byte[VALUE_LENGTH]; message.readBytes(address); diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/EthSrcCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/EthSrcCodec.java index 161deb1b1c..d04b22d5de 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/EthSrcCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/EthSrcCodec.java @@ -19,27 +19,27 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmC import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfEthSrc; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.EthSrcCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.EthSrcCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.eth.src.grouping.EthSrcValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.EthSrcCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.EthSrcCaseValueBuilder; public class EthSrcCodec extends AbstractMatchCodec { private static final int VALUE_LENGTH = 6; private static final int NXM_FIELD_CODE = 2; public static final MatchEntrySerializerKey SERIALIZER_KEY = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, Nxm0Class.class, NxmOfEthSrc.class); + EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfEthSrc.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); @Override - public void serialize(MatchEntry input, ByteBuf outBuffer) { + public void serialize(final MatchEntry input, final ByteBuf outBuffer) { serializeHeader(input, outBuffer); EthSrcCaseValue ethSrcCase = (EthSrcCaseValue) input.getMatchEntryValue(); outBuffer.writeBytes(IetfYangUtil.INSTANCE.macAddressBytes(ethSrcCase.getEthSrcValues().getMacAddress())); } @Override - public MatchEntry deserialize(ByteBuf message) { + public MatchEntry deserialize(final ByteBuf message) { MatchEntryBuilder matchEntryBuilder = deserializeHeaderToBuilder(message); byte[] address = new byte[VALUE_LENGTH]; message.readBytes(address); diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/EthTypeCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/EthTypeCodec.java index d5b6494a0a..297939f052 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/EthTypeCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/EthTypeCodec.java @@ -19,27 +19,27 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm0 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmClassBase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfEthType; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.EthTypeCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.EthTypeCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.eth.type.grouping.EthTypeValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.EthTypeCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.EthTypeCaseValueBuilder; public class EthTypeCodec extends AbstractMatchCodec { private static final int VALUE_LENGTH = 2; private static final int NXM_FIELD_CODE = 3; public static final MatchEntrySerializerKey SERIALIZER_KEY = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, Nxm0Class.class, NxmOfEthType.class); + EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfEthType.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); @Override - public void serialize(MatchEntry input, ByteBuf outBuffer) { + public void serialize(final MatchEntry input, final ByteBuf outBuffer) { serializeHeader(input, outBuffer); EthTypeCaseValue value = (EthTypeCaseValue) input.getMatchEntryValue(); outBuffer.writeShort(value.getEthTypeValues().getValue().toJava()); } @Override - public MatchEntry deserialize(ByteBuf message) { + public MatchEntry deserialize(final ByteBuf message) { return deserializeHeaderToBuilder(message) .setMatchEntryValue(new EthTypeCaseValueBuilder() .setEthTypeValues(new EthTypeValuesBuilder().setValue(readUint16(message)).build()) diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/IcmpTypeCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/IcmpTypeCodec.java index d52e7ef1e2..45a6ae91e1 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/IcmpTypeCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/IcmpTypeCodec.java @@ -19,9 +19,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm0 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmClassBase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfIcmpType; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.IcmpTypeCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.IcmpTypeCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.icmp.type.grouping.IcmpTypeValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.IcmpTypeCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.IcmpTypeCaseValueBuilder; /** * Codec for the Icmp type message. @@ -32,12 +32,12 @@ public class IcmpTypeCodec extends AbstractMatchCodec { private static final int VALUE_LENGTH = 1; private static final int NXM_FIELD_CODE = 13; public static final MatchEntrySerializerKey SERIALIZER_KEY = - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm0Class.class, NxmOfIcmpType.class); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfIcmpType.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); @Override - public MatchEntry deserialize(ByteBuf message) { + public MatchEntry deserialize(final ByteBuf message) { return deserializeHeaderToBuilder(message) .setMatchEntryValue(new IcmpTypeCaseValueBuilder() .setIcmpTypeValues(new IcmpTypeValuesBuilder().setValue(readUint8(message)).build()) @@ -47,7 +47,7 @@ public class IcmpTypeCodec extends AbstractMatchCodec { } @Override - public void serialize(MatchEntry input, ByteBuf outBuffer) { + public void serialize(final MatchEntry input, final ByteBuf outBuffer) { serializeHeader(input, outBuffer); IcmpTypeCaseValue icmpTypeValue = (IcmpTypeCaseValue) input.getMatchEntryValue(); outBuffer.writeByte(icmpTypeValue.getIcmpTypeValues().getValue().toJava()); diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/InPortCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/InPortCodec.java index 56d43b2916..e0ddb65951 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/InPortCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/InPortCodec.java @@ -17,9 +17,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm0 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmClassBase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfInPort; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.OfInPortCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.OfInPortCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.in.port.type.grouping.NxmOfInPortValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.OfInPortCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.OfInPortCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint16; public class InPortCodec extends AbstractMatchCodec { @@ -28,12 +28,10 @@ public class InPortCodec extends AbstractMatchCodec { private static final int NXM_FIELD_CODE = 0; public static final MatchEntrySerializerKey SERIALIZER_KEY = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, Nxm0Class.class, - NxmOfInPort.class); + EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfInPort.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_0_CLASS, - NXM_FIELD_CODE); + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); @Override public void serialize(final MatchEntry input, final ByteBuf outBuffer) { diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/IpDstCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/IpDstCodec.java index 4e72293734..d5d4c168ef 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/IpDstCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/IpDstCodec.java @@ -19,9 +19,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm0 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmClassBase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfIpDst; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.IpDstCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.IpDstCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.ip.dst.grouping.IpDstValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.IpDstCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.IpDstCaseValueBuilder; /** * Codec for the IpDst message. @@ -33,12 +33,12 @@ public class IpDstCodec extends AbstractMatchCodec { private static final int VALUE_LENGTH = 4; private static final int NXM_FIELD_CODE = 8; public static final MatchEntrySerializerKey SERIALIZER_KEY = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, Nxm0Class.class, NxmOfIpDst.class); + EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfIpDst.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); @Override - public MatchEntry deserialize(ByteBuf message) { + public MatchEntry deserialize(final ByteBuf message) { return deserializeHeaderToBuilder(message) .setMatchEntryValue(new IpDstCaseValueBuilder() .setIpDstValues(new IpDstValuesBuilder().setValue(readUint32(message)).build()) @@ -47,7 +47,7 @@ public class IpDstCodec extends AbstractMatchCodec { } @Override - public void serialize(MatchEntry input, ByteBuf outBuffer) { + public void serialize(final MatchEntry input, final ByteBuf outBuffer) { serializeHeader(input, outBuffer); IpDstCaseValue ipDstCase = (IpDstCaseValue) input.getMatchEntryValue(); outBuffer.writeInt(ipDstCase.getIpDstValues().getValue().intValue()); diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/IpSrcCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/IpSrcCodec.java index 1aae00a60e..809a5a41c0 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/IpSrcCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/IpSrcCodec.java @@ -19,9 +19,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm0 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmClassBase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfIpSrc; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.IpSrcCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.IpSrcCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.ip.src.grouping.IpSrcValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.IpSrcCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.IpSrcCaseValueBuilder; /** * Codec for the IpSrc message. @@ -33,13 +33,13 @@ public class IpSrcCodec extends AbstractMatchCodec { private static final int VALUE_LENGTH = 4; private static final int NXM_FIELD_CODE = 7; public static final MatchEntrySerializerKey SERIALIZER_KEY = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, Nxm0Class.class, NxmOfIpSrc.class); + EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfIpSrc.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); @Override - public MatchEntry deserialize(ByteBuf message) { + public MatchEntry deserialize(final ByteBuf message) { return deserializeHeaderToBuilder(message) .setMatchEntryValue(new IpSrcCaseValueBuilder() .setIpSrcValues(new IpSrcValuesBuilder().setValue(readUint32(message)).build()) @@ -48,7 +48,7 @@ public class IpSrcCodec extends AbstractMatchCodec { } @Override - public void serialize(MatchEntry input, ByteBuf outBuffer) { + public void serialize(final MatchEntry input, final ByteBuf outBuffer) { serializeHeader(input, outBuffer); IpSrcCaseValue ipSrcCase = (IpSrcCaseValue) input.getMatchEntryValue(); outBuffer.writeInt(ipSrcCase.getIpSrcValues().getValue().intValue()); diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Ipv6DstCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Ipv6DstCodec.java index 7e20b3ad8b..f8b3591d3c 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Ipv6DstCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Ipv6DstCodec.java @@ -19,9 +19,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmClassBase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfIpDst; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.IpDstCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.IpDstCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.ip.dst.grouping.IpDstValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.IpDstCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.IpDstCaseValueBuilder; /** * Codec for the Ipv6Dst message. @@ -33,13 +33,13 @@ public class Ipv6DstCodec extends AbstractMatchCodec { private static final int VALUE_LENGTH = 16; private static final int NXM_FIELD_CODE = 20; public static final MatchEntrySerializerKey SERIALIZER_KEY = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmOfIpDst.class); + EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmOfIpDst.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); @Override - public MatchEntry deserialize(ByteBuf message) { + public MatchEntry deserialize(final ByteBuf message) { return deserializeHeaderToBuilder(message) .setMatchEntryValue(new IpDstCaseValueBuilder() .setIpDstValues(new IpDstValuesBuilder().setValue(readUint32(message)).build()) @@ -48,7 +48,7 @@ public class Ipv6DstCodec extends AbstractMatchCodec { } @Override - public void serialize(MatchEntry input, ByteBuf outBuffer) { + public void serialize(final MatchEntry input, final ByteBuf outBuffer) { serializeHeader(input, outBuffer); IpDstCaseValue ipDstCase = (IpDstCaseValue) input.getMatchEntryValue(); outBuffer.writeInt(ipDstCase.getIpDstValues().getValue().intValue()); diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Ipv6SrcCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Ipv6SrcCodec.java index b98cc75a90..aeeb9194bc 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Ipv6SrcCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Ipv6SrcCodec.java @@ -19,9 +19,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmClassBase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfIpSrc; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.IpSrcCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.IpSrcCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.ip.src.grouping.IpSrcValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.IpSrcCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.IpSrcCaseValueBuilder; /** * Codec for the Ipv6Src message. @@ -33,13 +33,13 @@ public class Ipv6SrcCodec extends AbstractMatchCodec { private static final int VALUE_LENGTH = 16; private static final int NXM_FIELD_CODE = 19; public static final MatchEntrySerializerKey SERIALIZER_KEY = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmOfIpSrc.class); + EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmOfIpSrc.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); @Override - public MatchEntry deserialize(ByteBuf message) { + public MatchEntry deserialize(final ByteBuf message) { return deserializeHeaderToBuilder(message) .setMatchEntryValue(new IpSrcCaseValueBuilder() .setIpSrcValues(new IpSrcValuesBuilder().setValue(readUint32(message)).build()) @@ -48,7 +48,7 @@ public class Ipv6SrcCodec extends AbstractMatchCodec { } @Override - public void serialize(MatchEntry input, ByteBuf outBuffer) { + public void serialize(final MatchEntry input, final ByteBuf outBuffer) { serializeHeader(input, outBuffer); IpSrcCaseValue ipSrcCase = (IpSrcCaseValue) input.getMatchEntryValue(); outBuffer.writeInt(ipSrcCase.getIpSrcValues().getValue().intValue()); diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/MetadataCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/MetadataCodec.java index 1576133b52..566c1c84ff 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/MetadataCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/MetadataCodec.java @@ -23,21 +23,19 @@ public class MetadataCodec extends AbstractMatchCodec { private static final int VALUE_LENGTH = 8; private static final int NXM_FIELD_CODE = 2; - public static final MatchEntrySerializerKey SERIALIZER_KEY = new - MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm0Class.class, - NxmOfMetadata.class); + public static final MatchEntrySerializerKey SERIALIZER_KEY = + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfMetadata.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_0_CLASS, - NXM_FIELD_CODE); + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); @Override - public void serialize(MatchEntry input, ByteBuf outBuffer) { + public void serialize(final MatchEntry input, final ByteBuf outBuffer) { serializeHeader(input, outBuffer); } @Override - public MatchEntry deserialize(ByteBuf message) { + public MatchEntry deserialize(final ByteBuf message) { MatchEntryBuilder matchEntryBuilder = deserializeHeaderToBuilder(message); return matchEntryBuilder.build(); } diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/MplsLabelCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/MplsLabelCodec.java index c9f5b2865e..b503bf7c2d 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/MplsLabelCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/MplsLabelCodec.java @@ -17,9 +17,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm0 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmClassBase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfMplsLabel; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.OfMplsLabelCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.OfMplsLabelCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.oxm.of.mpls.label.grouping.MplsLabelValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.OfMplsLabelCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.OfMplsLabelCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint32; public class MplsLabelCodec extends AbstractMatchCodec { @@ -28,10 +28,10 @@ public class MplsLabelCodec extends AbstractMatchCodec { private static final int NXM_FIELD_CODE = 34; public static final MatchEntrySerializerKey SERIALIZER_KEY = - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm0Class.class, NxmOfMplsLabel.class); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfMplsLabel.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); @Override public void serialize(final MatchEntry input, final ByteBuf outBuffer) { diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/NshFlagsCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/NshFlagsCodec.java index c7b5f1b999..1706be9525 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/NshFlagsCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/NshFlagsCodec.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.nx.codec.match; import static org.opendaylight.yangtools.yang.common.netty.ByteBufUtils.readUint8; @@ -18,11 +17,11 @@ import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.ExperimenterClass; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.MatchField; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNshFlags; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.NxExpMatchEntryValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshFlagsCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshFlagsCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.nsh.flags.grouping.NshFlagsValues; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.nsh.flags.grouping.NshFlagsValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.NxExpMatchEntryValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshFlagsCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshFlagsCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint32; import org.opendaylight.yangtools.yang.common.Uint8; @@ -32,12 +31,12 @@ public class NshFlagsCodec extends AbstractExperimenterMatchCodec { private static final int NXM_FIELD_CODE = 1; public static final MatchEntrySerializerKey SERIALIZER_KEY = createSerializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, NiciraConstants.NX_NSH_VENDOR_ID, NxmNxNshFlags.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = createDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, NiciraConstants.NX_NSH_VENDOR_ID, NXM_FIELD_CODE); @@ -57,7 +56,7 @@ public class NshFlagsCodec extends AbstractExperimenterMatchCodec { } @Override - protected NxExpMatchEntryValue deserializeValue(ByteBuf message, boolean hasMask) { + protected NxExpMatchEntryValue deserializeValue(final ByteBuf message, final boolean hasMask) { Uint8 flagsValue = readUint8(message); Uint8 maskValue = hasMask ? readUint8(message) : null; return new NshFlagsCaseValueBuilder() @@ -71,7 +70,7 @@ public class NshFlagsCodec extends AbstractExperimenterMatchCodec { } @Override - protected void serializeValue(NxExpMatchEntryValue value, boolean hasMask, ByteBuf outBuffer) { + protected void serializeValue(final NxExpMatchEntryValue value, final boolean hasMask, final ByteBuf outBuffer) { NshFlagsCaseValue nshFlagsCaseValue = (NshFlagsCaseValue) value; NshFlagsValues nshFlagsValues = nshFlagsCaseValue.getNshFlagsValues(); outBuffer.writeByte(nshFlagsValues.getNshFlags().toJava()); diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/NshMdtypeCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/NshMdtypeCodec.java index 028b3ef53d..6d584e6310 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/NshMdtypeCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/NshMdtypeCodec.java @@ -17,11 +17,11 @@ import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.ExperimenterClass; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.MatchField; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNshMdtype; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.NxExpMatchEntryValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshMdtypeCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshMdtypeCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.nsh.mdtype.grouping.NshMdtypeValues; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.nsh.mdtype.grouping.NshMdtypeValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.NxExpMatchEntryValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshMdtypeCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshMdtypeCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint32; public class NshMdtypeCodec extends AbstractExperimenterMatchCodec { @@ -30,24 +30,24 @@ public class NshMdtypeCodec extends AbstractExperimenterMatchCodec { private static final int NXM_FIELD_CODE = 2; public static final MatchEntrySerializerKey SERIALIZER_KEY = createSerializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, NiciraConstants.NX_NSH_VENDOR_ID, NxmNxNshMdtype.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = createDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, NiciraConstants.NX_NSH_VENDOR_ID, NXM_FIELD_CODE); @Override - protected void serializeValue(NxExpMatchEntryValue value, boolean hasMask, ByteBuf outBuffer) { + protected void serializeValue(final NxExpMatchEntryValue value, final boolean hasMask, final ByteBuf outBuffer) { NshMdtypeCaseValue nshMdtypeCaseValue = (NshMdtypeCaseValue) value; NshMdtypeValues nshMdtypeValues = nshMdtypeCaseValue.getNshMdtypeValues(); outBuffer.writeByte(nshMdtypeValues.getValue().toJava()); } @Override - protected NxExpMatchEntryValue deserializeValue(ByteBuf message, boolean hasMask) { + protected NxExpMatchEntryValue deserializeValue(final ByteBuf message, final boolean hasMask) { return new NshMdtypeCaseValueBuilder() .setNshMdtypeValues(new NshMdtypeValuesBuilder().setValue(readUint8(message)).build()) .build(); diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/NshNpCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/NshNpCodec.java index 2384a2b417..c39914a692 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/NshNpCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/NshNpCodec.java @@ -17,11 +17,11 @@ import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.ExperimenterClass; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.MatchField; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNshNp; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.NxExpMatchEntryValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshNpCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshNpCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.nsh.np.grouping.NshNpValues; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.nsh.np.grouping.NshNpValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.NxExpMatchEntryValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshNpCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshNpCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint32; public class NshNpCodec extends AbstractExperimenterMatchCodec { @@ -30,24 +30,24 @@ public class NshNpCodec extends AbstractExperimenterMatchCodec { private static final int NXM_FIELD_CODE = 3; public static final MatchEntrySerializerKey SERIALIZER_KEY = createSerializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, NiciraConstants.NX_NSH_VENDOR_ID, NxmNxNshNp.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = createDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, NiciraConstants.NX_NSH_VENDOR_ID, NXM_FIELD_CODE); @Override - protected void serializeValue(NxExpMatchEntryValue value, boolean hasMask, ByteBuf outBuffer) { + protected void serializeValue(final NxExpMatchEntryValue value, final boolean hasMask, final ByteBuf outBuffer) { NshNpCaseValue nshNpCaseValue = (NshNpCaseValue) value; NshNpValues nshNpValues = nshNpCaseValue.getNshNpValues(); outBuffer.writeByte(nshNpValues.getValue().toJava()); } @Override - protected NxExpMatchEntryValue deserializeValue(ByteBuf message, boolean hasMask) { + protected NxExpMatchEntryValue deserializeValue(final ByteBuf message, final boolean hasMask) { return new NshNpCaseValueBuilder() .setNshNpValues(new NshNpValuesBuilder().setValue(readUint8(message)).build()) .build(); diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/NshTtlCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/NshTtlCodec.java index 4260b52155..7d7f37f277 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/NshTtlCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/NshTtlCodec.java @@ -17,10 +17,10 @@ import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.ExperimenterClass; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.MatchField; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNshTtl; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.NxExpMatchEntryValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshTtlCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshTtlCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.nsh.ttl.grouping.NshTtlValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.NxExpMatchEntryValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshTtlCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshTtlCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint32; public class NshTtlCodec extends AbstractExperimenterMatchCodec { @@ -28,9 +28,9 @@ public class NshTtlCodec extends AbstractExperimenterMatchCodec { private static final int VALUE_LENGTH = Byte.BYTES; private static final int NXM_FIELD_CODE = 10; public static final MatchEntrySerializerKey SERIALIZER_KEY = - createSerializerKey(EncodeConstants.OF13_VERSION_ID, NiciraConstants.NX_NSH_VENDOR_ID, NxmNxNshTtl.class); + createSerializerKey(EncodeConstants.OF_VERSION_1_3, NiciraConstants.NX_NSH_VENDOR_ID, NxmNxNshTtl.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = - createDeserializerKey(EncodeConstants.OF13_VERSION_ID, NiciraConstants.NX_NSH_VENDOR_ID, NXM_FIELD_CODE); + createDeserializerKey(EncodeConstants.OF_VERSION_1_3, NiciraConstants.NX_NSH_VENDOR_ID, NXM_FIELD_CODE); @Override protected void serializeValue(final NxExpMatchEntryValue value, final boolean hasMask, final ByteBuf outBuffer) { diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Nshc1Codec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Nshc1Codec.java index 3aaf771f85..05c923ff03 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Nshc1Codec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Nshc1Codec.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.nx.codec.match; import org.opendaylight.openflowjava.nx.api.NiciraConstants; @@ -21,12 +20,12 @@ public class Nshc1Codec extends AbstractNshcCodec { private static final int NXM_FIELD_CODE = 6; public static final MatchEntrySerializerKey SERIALIZER_KEY = createSerializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, NiciraConstants.NX_NSH_VENDOR_ID, NxmNxNshc1.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = createDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, NiciraConstants.NX_NSH_VENDOR_ID, NXM_FIELD_CODE); diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Nshc2Codec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Nshc2Codec.java index 01f3c6b2cc..7f8533b39e 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Nshc2Codec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Nshc2Codec.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.nx.codec.match; import org.opendaylight.openflowjava.nx.api.NiciraConstants; @@ -21,12 +20,12 @@ public class Nshc2Codec extends AbstractNshcCodec { private static final int NXM_FIELD_CODE = 7; public static final MatchEntrySerializerKey SERIALIZER_KEY = createSerializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, NiciraConstants.NX_NSH_VENDOR_ID, NxmNxNshc2.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = createDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, NiciraConstants.NX_NSH_VENDOR_ID, NXM_FIELD_CODE); diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Nshc3Codec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Nshc3Codec.java index 8f939fef2a..9450157226 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Nshc3Codec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Nshc3Codec.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.nx.codec.match; import org.opendaylight.openflowjava.nx.api.NiciraConstants; @@ -21,12 +20,12 @@ public class Nshc3Codec extends AbstractNshcCodec { private static final int NXM_FIELD_CODE = 8; public static final MatchEntrySerializerKey SERIALIZER_KEY = createSerializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, NiciraConstants.NX_NSH_VENDOR_ID, NxmNxNshc3.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = createDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, NiciraConstants.NX_NSH_VENDOR_ID, NXM_FIELD_CODE); diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Nshc4Codec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Nshc4Codec.java index d4d33fa871..abd26d86e1 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Nshc4Codec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Nshc4Codec.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.nx.codec.match; import org.opendaylight.openflowjava.nx.api.NiciraConstants; @@ -21,12 +20,12 @@ public class Nshc4Codec extends AbstractNshcCodec { private static final int NXM_FIELD_CODE = 9; public static final MatchEntrySerializerKey SERIALIZER_KEY = createSerializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, NiciraConstants.NX_NSH_VENDOR_ID, NxmNxNshc4.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = createDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, NiciraConstants.NX_NSH_VENDOR_ID, NXM_FIELD_CODE); diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/NsiCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/NsiCodec.java index f708df8a5a..b2eee1a348 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/NsiCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/NsiCodec.java @@ -17,11 +17,11 @@ import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.ExperimenterClass; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.MatchField; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNsi; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.NxExpMatchEntryValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NsiCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NsiCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.nsi.grouping.NsiValues; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.nsi.grouping.NsiValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.NxExpMatchEntryValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NsiCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NsiCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint32; import org.opendaylight.yangtools.yang.common.Uint8; @@ -31,12 +31,12 @@ public class NsiCodec extends AbstractExperimenterMatchCodec { private static final int NXM_FIELD_CODE = 5; public static final MatchEntrySerializerKey SERIALIZER_KEY = createSerializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, NiciraConstants.NX_NSH_VENDOR_ID, NxmNxNsi.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = createDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, NiciraConstants.NX_NSH_VENDOR_ID, NXM_FIELD_CODE); diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/NspCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/NspCodec.java index 209ad306b0..ec5ba3bdb9 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/NspCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/NspCodec.java @@ -17,11 +17,11 @@ import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.ExperimenterClass; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.MatchField; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNsp; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.NxExpMatchEntryValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NspCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NspCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.nsp.grouping.NspValues; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.nsp.grouping.NspValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.NxExpMatchEntryValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NspCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NspCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint32; public class NspCodec extends AbstractExperimenterMatchCodec { @@ -30,17 +30,17 @@ public class NspCodec extends AbstractExperimenterMatchCodec { private static final int NXM_FIELD_CODE = 4; public static final MatchEntrySerializerKey SERIALIZER_KEY = createSerializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, NiciraConstants.NX_NSH_VENDOR_ID, NxmNxNsp.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = createDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, NiciraConstants.NX_NSH_VENDOR_ID, NXM_FIELD_CODE); @Override - protected void serializeValue(NxExpMatchEntryValue value, boolean hasMask, ByteBuf outBuffer) { + protected void serializeValue(final NxExpMatchEntryValue value, final boolean hasMask, final ByteBuf outBuffer) { NspCaseValue nspCaseValue = (NspCaseValue) value; NspValues nspValues = nspCaseValue.getNspValues(); outBuffer.writeInt(nspValues.getNsp().intValue()); @@ -50,7 +50,7 @@ public class NspCodec extends AbstractExperimenterMatchCodec { } @Override - protected NxExpMatchEntryValue deserializeValue(ByteBuf message, boolean hasMask) { + protected NxExpMatchEntryValue deserializeValue(final ByteBuf message, final boolean hasMask) { Uint32 nspValue = readUint32(message); Uint32 maskValue = hasMask ? readUint32(message) : null; return new NspCaseValueBuilder() diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/PktMarkCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/PktMarkCodec.java index 0692bb0536..6331618e3d 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/PktMarkCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/PktMarkCodec.java @@ -19,21 +19,21 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmClassBase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxPktMark; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.PktMarkCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.PktMarkCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.pkt.mark.grouping.PktMarkValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.PktMarkCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.PktMarkCaseValueBuilder; public class PktMarkCodec extends AbstractMatchCodec { private static final int VALUE_LENGTH = 4; private static final int NXM_FIELD_CODE = 33; public static final MatchEntrySerializerKey SERIALIZER_KEY = - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxPktMark.class); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxPktMark.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); @Override - public void serialize(MatchEntry input, ByteBuf outBuffer) { + public void serialize(final MatchEntry input, final ByteBuf outBuffer) { serializeHeader(input, outBuffer); PktMarkCaseValue pktMarkCase = (PktMarkCaseValue)input.getMatchEntryValue(); outBuffer.writeInt(pktMarkCase.getPktMarkValues().getPktMark().intValue()); @@ -41,7 +41,7 @@ public class PktMarkCodec extends AbstractMatchCodec { } @Override - public MatchEntry deserialize(ByteBuf message) { + public MatchEntry deserialize(final ByteBuf message) { return deserializeHeaderToBuilder(message) .setMatchEntryValue(new PktMarkCaseValueBuilder() .setPktMarkValues(new PktMarkValuesBuilder().setPktMark(readUint32(message)).build()) diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Reg0Codec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Reg0Codec.java index cc12077a71..c86b3f9c48 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Reg0Codec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Reg0Codec.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.nx.codec.match; import org.opendaylight.openflowjava.protocol.api.keys.MatchEntryDeserializerKey; @@ -20,9 +19,9 @@ public class Reg0Codec extends AbstractRegCodec { private static final int NXM_FIELD_CODE = 0; public static final MatchEntrySerializerKey SERIALIZER_KEY = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxReg0.class); + EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg0.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); @Override public int getNxmFieldCode() { @@ -33,5 +32,4 @@ public class Reg0Codec extends AbstractRegCodec { public Class getNxmField() { return NxmNxReg0.class; } - } diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Reg1Codec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Reg1Codec.java index 1550e7fbc1..85c963e71d 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Reg1Codec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Reg1Codec.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.nx.codec.match; import org.opendaylight.openflowjava.protocol.api.keys.MatchEntryDeserializerKey; @@ -20,9 +19,9 @@ public class Reg1Codec extends AbstractRegCodec { private static final int NXM_FIELD_CODE = 1; public static final MatchEntrySerializerKey SERIALIZER_KEY = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxReg1.class); + EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg1.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); @Override public int getNxmFieldCode() { @@ -33,5 +32,4 @@ public class Reg1Codec extends AbstractRegCodec { public Class getNxmField() { return NxmNxReg1.class; } - } diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Reg2Codec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Reg2Codec.java index 58ad9262d4..5375905715 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Reg2Codec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Reg2Codec.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.nx.codec.match; import org.opendaylight.openflowjava.protocol.api.keys.MatchEntryDeserializerKey; @@ -20,9 +19,9 @@ public class Reg2Codec extends AbstractRegCodec { private static final int NXM_FIELD_CODE = 2; public static final MatchEntrySerializerKey SERIALIZER_KEY = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxReg2.class); + EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg2.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); @Override public int getNxmFieldCode() { @@ -33,5 +32,4 @@ public class Reg2Codec extends AbstractRegCodec { public Class getNxmField() { return NxmNxReg2.class; } - } diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Reg3Codec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Reg3Codec.java index 5aaee93d33..4ef2e150e0 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Reg3Codec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Reg3Codec.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.nx.codec.match; import org.opendaylight.openflowjava.protocol.api.keys.MatchEntryDeserializerKey; @@ -20,9 +19,9 @@ public class Reg3Codec extends AbstractRegCodec { private static final int NXM_FIELD_CODE = 3; public static final MatchEntrySerializerKey SERIALIZER_KEY = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxReg3.class); + EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg3.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); @Override public int getNxmFieldCode() { @@ -33,5 +32,4 @@ public class Reg3Codec extends AbstractRegCodec { public Class getNxmField() { return NxmNxReg3.class; } - } diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Reg4Codec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Reg4Codec.java index 41790631b8..0972ad591d 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Reg4Codec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Reg4Codec.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.nx.codec.match; import org.opendaylight.openflowjava.protocol.api.keys.MatchEntryDeserializerKey; @@ -20,9 +19,9 @@ public class Reg4Codec extends AbstractRegCodec { private static final int NXM_FIELD_CODE = 4; public static final MatchEntrySerializerKey SERIALIZER_KEY = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxReg4.class); + EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg4.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); @Override public int getNxmFieldCode() { @@ -33,5 +32,4 @@ public class Reg4Codec extends AbstractRegCodec { public Class getNxmField() { return NxmNxReg4.class; } - } diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Reg5Codec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Reg5Codec.java index 2171eb52d5..e388c544e3 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Reg5Codec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Reg5Codec.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.nx.codec.match; import org.opendaylight.openflowjava.protocol.api.keys.MatchEntryDeserializerKey; @@ -20,9 +19,9 @@ public class Reg5Codec extends AbstractRegCodec { private static final int NXM_FIELD_CODE = 5; public static final MatchEntrySerializerKey SERIALIZER_KEY = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxReg5.class); + EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg5.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); @Override public int getNxmFieldCode() { @@ -33,5 +32,4 @@ public class Reg5Codec extends AbstractRegCodec { public Class getNxmField() { return NxmNxReg5.class; } - } diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Reg6Codec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Reg6Codec.java index 925e649dce..5620211a5a 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Reg6Codec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Reg6Codec.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.nx.codec.match; import org.opendaylight.openflowjava.protocol.api.keys.MatchEntryDeserializerKey; @@ -20,9 +19,9 @@ public class Reg6Codec extends AbstractRegCodec { private static final int NXM_FIELD_CODE = 6; public static final MatchEntrySerializerKey SERIALIZER_KEY = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxReg6.class); + EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg6.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); @Override public int getNxmFieldCode() { diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Reg7Codec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Reg7Codec.java index ba6684a8e8..b06e94a311 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Reg7Codec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Reg7Codec.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.nx.codec.match; import org.opendaylight.openflowjava.protocol.api.keys.MatchEntryDeserializerKey; @@ -20,9 +19,9 @@ public class Reg7Codec extends AbstractRegCodec { private static final int NXM_FIELD_CODE = 7; public static final MatchEntrySerializerKey SERIALIZER_KEY = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxReg7.class); + EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg7.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); @Override public int getNxmFieldCode() { @@ -33,5 +32,4 @@ public class Reg7Codec extends AbstractRegCodec { public Class getNxmField() { return NxmNxReg7.class; } - } diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/TcpDstCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/TcpDstCodec.java index f9202f51cd..e8aeed3577 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/TcpDstCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/TcpDstCodec.java @@ -18,9 +18,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm0 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmClassBase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfTcpDst; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.TcpDstCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.TcpDstCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.tcp.dst.grouping.TcpDstValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.TcpDstCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.TcpDstCaseValueBuilder; import org.opendaylight.yangtools.yang.common.netty.ByteBufUtils; /** @@ -33,9 +33,9 @@ public class TcpDstCodec extends AbstractMatchCodec { private static final int VALUE_LENGTH = 2; private static final int NXM_FIELD_CODE = 10; public static final MatchEntrySerializerKey SERIALIZER_KEY = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, Nxm0Class.class, NxmOfTcpDst.class); + EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfTcpDst.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); @Override public void serialize(final MatchEntry input, final ByteBuf outBuffer) { diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/TcpSrcCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/TcpSrcCodec.java index 0ac34ab066..bde3b8c63d 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/TcpSrcCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/TcpSrcCodec.java @@ -20,9 +20,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm0 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmClassBase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfTcpSrc; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.TcpSrcCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.TcpSrcCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.tcp.src.grouping.TcpSrcValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.TcpSrcCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.TcpSrcCaseValueBuilder; /** * Codec for the TcpSrc message.. @@ -34,12 +34,12 @@ public class TcpSrcCodec extends AbstractMatchCodec { private static final int VALUE_LENGTH = 2; private static final int NXM_FIELD_CODE = 9; public static final MatchEntrySerializerKey SERIALIZER_KEY = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, Nxm0Class.class, NxmOfTcpSrc.class); + EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfTcpSrc.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); @Override - public void serialize(MatchEntry input, ByteBuf outBuffer) { + public void serialize(final MatchEntry input, final ByteBuf outBuffer) { serializeHeader(input, outBuffer); TcpSrcCaseValue tcpSrcCase = (TcpSrcCaseValue) input.getMatchEntryValue(); outBuffer.writeShort(tcpSrcCase.getTcpSrcValues().getPort().getValue().toJava()); @@ -47,7 +47,7 @@ public class TcpSrcCodec extends AbstractMatchCodec { } @Override - public MatchEntry deserialize(ByteBuf message) { + public MatchEntry deserialize(final ByteBuf message) { return deserializeHeaderToBuilder(message) .setHasMask(true) .setMatchEntryValue(new TcpSrcCaseValueBuilder() diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/TunIdCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/TunIdCodec.java index b890451651..ac6f9e84d7 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/TunIdCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/TunIdCodec.java @@ -19,17 +19,17 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmClassBase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxTunId; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.TunIdCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.TunIdCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.tun.id.grouping.TunIdValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.TunIdCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.TunIdCaseValueBuilder; public class TunIdCodec extends AbstractMatchCodec { private static final int VALUE_LENGTH = 8; private static final int NXM_FIELD_CODE = 16; public static final MatchEntrySerializerKey SERIALIZER_KEY = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxTunId.class); + EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxTunId.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); @Override public void serialize(final MatchEntry input, final ByteBuf outBuffer) { diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/TunIpv4DstCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/TunIpv4DstCodec.java index 90c8af24b4..35452f7c7e 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/TunIpv4DstCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/TunIpv4DstCodec.java @@ -19,28 +19,28 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmClassBase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxTunIpv4Dst; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.TunIpv4DstCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.TunIpv4DstCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.tun.ipv4.dst.grouping.TunIpv4DstValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.TunIpv4DstCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.TunIpv4DstCaseValueBuilder; public class TunIpv4DstCodec extends AbstractMatchCodec { private static final int VALUE_LENGTH = 4; private static final int NXM_FIELD_CODE = 32; public static final MatchEntrySerializerKey SERIALIZER_KEY = - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxTunIpv4Dst.class); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxTunIpv4Dst.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); @Override - public void serialize(MatchEntry input, ByteBuf outBuffer) { + public void serialize(final MatchEntry input, final ByteBuf outBuffer) { serializeHeader(input, outBuffer); TunIpv4DstCaseValue caseValue = (TunIpv4DstCaseValue) input.getMatchEntryValue(); outBuffer.writeInt(caseValue.getTunIpv4DstValues().getValue().intValue()); } @Override - public MatchEntry deserialize(ByteBuf message) { + public MatchEntry deserialize(final ByteBuf message) { return deserializeHeaderToBuilder(message) .setMatchEntryValue(new TunIpv4DstCaseValueBuilder() .setTunIpv4DstValues(new TunIpv4DstValuesBuilder().setValue(readUint32(message)).build()) @@ -72,5 +72,4 @@ public class TunIpv4DstCodec extends AbstractMatchCodec { public Class getOxmClass() { return Nxm1Class.class; } - } diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/TunIpv4SrcCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/TunIpv4SrcCodec.java index a1b6877ebc..7925b3fc37 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/TunIpv4SrcCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/TunIpv4SrcCodec.java @@ -19,28 +19,28 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmClassBase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxTunIpv4Src; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.TunIpv4SrcCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.TunIpv4SrcCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.tun.ipv4.src.grouping.TunIpv4SrcValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.TunIpv4SrcCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.TunIpv4SrcCaseValueBuilder; public class TunIpv4SrcCodec extends AbstractMatchCodec { private static final int VALUE_LENGTH = 4; private static final int NXM_FIELD_CODE = 31; public static final MatchEntrySerializerKey SERIALIZER_KEY = - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxTunIpv4Src.class); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxTunIpv4Src.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); @Override - public void serialize(MatchEntry input, ByteBuf outBuffer) { + public void serialize(final MatchEntry input, final ByteBuf outBuffer) { serializeHeader(input, outBuffer); TunIpv4SrcCaseValue caseValue = (TunIpv4SrcCaseValue) input.getMatchEntryValue(); outBuffer.writeInt(caseValue.getTunIpv4SrcValues().getValue().intValue()); } @Override - public MatchEntry deserialize(ByteBuf message) { + public MatchEntry deserialize(final ByteBuf message) { return deserializeHeaderToBuilder(message) .setMatchEntryValue(new TunIpv4SrcCaseValueBuilder() .setTunIpv4SrcValues(new TunIpv4SrcValuesBuilder().setValue(readUint32(message)).build()) @@ -72,5 +72,4 @@ public class TunIpv4SrcCodec extends AbstractMatchCodec { public Class getOxmClass() { return Nxm1Class.class; } - } diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/UdpDstCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/UdpDstCodec.java index ec732adf3e..9f32dda23f 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/UdpDstCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/UdpDstCodec.java @@ -20,9 +20,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm0 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmClassBase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfUdpDst; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.UdpDstCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.UdpDstCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.udp.dst.grouping.UdpDstValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.UdpDstCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.UdpDstCaseValueBuilder; /** * Codec for the UdpDst message. @@ -34,12 +34,12 @@ public class UdpDstCodec extends AbstractMatchCodec { private static final int VALUE_LENGTH = 2; private static final int NXM_FIELD_CODE = 12; public static final MatchEntrySerializerKey SERIALIZER_KEY = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, Nxm0Class.class, NxmOfUdpDst.class); + EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfUdpDst.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); @Override - public void serialize(MatchEntry input, ByteBuf outBuffer) { + public void serialize(final MatchEntry input, final ByteBuf outBuffer) { serializeHeader(input, outBuffer); UdpDstCaseValue udpDstCase = (UdpDstCaseValue) input.getMatchEntryValue(); outBuffer.writeShort(udpDstCase.getUdpDstValues().getPort().getValue().toJava()); @@ -47,7 +47,7 @@ public class UdpDstCodec extends AbstractMatchCodec { } @Override - public MatchEntry deserialize(ByteBuf message) { + public MatchEntry deserialize(final ByteBuf message) { return deserializeHeaderToBuilder(message) .setHasMask(true) .setMatchEntryValue(new UdpDstCaseValueBuilder() diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/UdpSrcCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/UdpSrcCodec.java index da0f41790b..d3e917e7c0 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/UdpSrcCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/UdpSrcCodec.java @@ -20,9 +20,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm0 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmClassBase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfUdpSrc; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.UdpSrcCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.UdpSrcCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.udp.src.grouping.UdpSrcValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.UdpSrcCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.UdpSrcCaseValueBuilder; /** * Codec for the UdpSrc message. @@ -34,12 +34,12 @@ public class UdpSrcCodec extends AbstractMatchCodec { private static final int VALUE_LENGTH = 2; private static final int NXM_FIELD_CODE = 11; public static final MatchEntrySerializerKey SERIALIZER_KEY = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, Nxm0Class.class, NxmOfUdpSrc.class); + EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfUdpSrc.class); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); @Override - public void serialize(MatchEntry input, ByteBuf outBuffer) { + public void serialize(final MatchEntry input, final ByteBuf outBuffer) { serializeHeader(input, outBuffer); UdpSrcCaseValue udpSrcCase = (UdpSrcCaseValue) input.getMatchEntryValue(); outBuffer.writeShort(udpSrcCase.getUdpSrcValues().getPort().getValue().toJava()); @@ -47,7 +47,7 @@ public class UdpSrcCodec extends AbstractMatchCodec { } @Override - public MatchEntry deserialize(ByteBuf message) { + public MatchEntry deserialize(final ByteBuf message) { return deserializeHeaderToBuilder(message) .setHasMask(true) .setMatchEntryValue(new UdpSrcCaseValueBuilder() diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/NiciraExtensionCodecRegistratorImplTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/NiciraExtensionCodecRegistratorImplTest.java index a3a564ae09..a93b7c80c7 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/NiciraExtensionCodecRegistratorImplTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/NiciraExtensionCodecRegistratorImplTest.java @@ -38,6 +38,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev1 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.MatchField; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm0Class; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; +import org.opendaylight.yangtools.yang.common.Uint8; @RunWith(MockitoJUnitRunner.class) public class NiciraExtensionCodecRegistratorImplTest { @@ -57,7 +58,7 @@ public class NiciraExtensionCodecRegistratorImplTest { @Mock OFDeserializer matchDeserializer; - public static final short VERSION = 4; + public static final Uint8 VERSION = Uint8.valueOf(4); public static final byte VERSION1 = EncodeConstants.OF10_VERSION_ID; public static final byte VERSION2 = EncodeConstants.OF13_VERSION_ID; diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/NiciraExtensionsRegistratorTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/NiciraExtensionsRegistratorTest.java index b98ea1d26a..e07032242d 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/NiciraExtensionsRegistratorTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/NiciraExtensionsRegistratorTest.java @@ -76,17 +76,17 @@ import org.opendaylight.openflowjava.protocol.api.util.OxmMatchConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.ExperimenterClass; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm0Class; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1Class; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionConntrack; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionDecNshTtl; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionDecap; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionEncap; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionMultipath; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionOutputReg; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionOutputReg2; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionRegLoad; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionRegLoad2; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionRegMove; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionResubmit; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionConntrack; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionDecNshTtl; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionDecap; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionEncap; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionMultipath; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionOutputReg; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionOutputReg2; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionRegLoad; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionRegLoad2; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionRegMove; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionResubmit; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxArpSha; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxArpTha; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxCtMark; @@ -143,246 +143,246 @@ public class NiciraExtensionsRegistratorTest { @Test public void registerNiciraExtensionsTest() { Mockito.verify(registrator).registerActionDeserializer( - eq(new NiciraActionDeserializerKey(EncodeConstants.OF13_VERSION_ID, 7)), + eq(new NiciraActionDeserializerKey(EncodeConstants.OF_VERSION_1_3, 7)), any(RegLoadCodec.class)); Mockito.verify(registrator).registerActionSerializer( - eq(new NiciraActionSerializerKey(EncodeConstants.OF13_VERSION_ID, ActionRegLoad.class)), + eq(new NiciraActionSerializerKey(EncodeConstants.OF_VERSION_1_3, ActionRegLoad.class)), any(RegLoadCodec.class)); Mockito.verify(registrator).registerActionDeserializer( - eq(new NiciraActionDeserializerKey(EncodeConstants.OF13_VERSION_ID, 33)), + eq(new NiciraActionDeserializerKey(EncodeConstants.OF_VERSION_1_3, 33)), any(RegLoad2Codec.class)); Mockito.verify(registrator).registerActionSerializer( - eq(new NiciraActionSerializerKey(EncodeConstants.OF13_VERSION_ID, ActionRegLoad2.class)), + eq(new NiciraActionSerializerKey(EncodeConstants.OF_VERSION_1_3, ActionRegLoad2.class)), any(RegLoad2Codec.class)); Mockito.verify(registrator).registerActionDeserializer( - eq(new NiciraActionDeserializerKey(EncodeConstants.OF13_VERSION_ID, 6)), + eq(new NiciraActionDeserializerKey(EncodeConstants.OF_VERSION_1_3, 6)), any(RegMoveCodec.class)); Mockito.verify(registrator).registerActionSerializer( - eq(new NiciraActionSerializerKey(EncodeConstants.OF13_VERSION_ID, ActionRegMove.class)), + eq(new NiciraActionSerializerKey(EncodeConstants.OF_VERSION_1_3, ActionRegMove.class)), any(RegMoveCodec.class)); Mockito.verify(registrator).registerActionDeserializer( - eq(new NiciraActionDeserializerKey(EncodeConstants.OF13_VERSION_ID, 15)), + eq(new NiciraActionDeserializerKey(EncodeConstants.OF_VERSION_1_3, 15)), any(OutputRegCodec.class)); Mockito.verify(registrator).registerActionSerializer( - eq(new NiciraActionSerializerKey(EncodeConstants.OF13_VERSION_ID, ActionOutputReg.class)), + eq(new NiciraActionSerializerKey(EncodeConstants.OF_VERSION_1_3, ActionOutputReg.class)), any(OutputRegCodec.class)); Mockito.verify(registrator).registerActionDeserializer( - eq(new NiciraActionDeserializerKey(EncodeConstants.OF13_VERSION_ID, 32)), + eq(new NiciraActionDeserializerKey(EncodeConstants.OF_VERSION_1_3, 32)), any(OutputReg2Codec.class)); Mockito.verify(registrator).registerActionSerializer( - eq(new NiciraActionSerializerKey(EncodeConstants.OF13_VERSION_ID, ActionOutputReg2.class)), + eq(new NiciraActionSerializerKey(EncodeConstants.OF_VERSION_1_3, ActionOutputReg2.class)), any(OutputReg2Codec.class)); Mockito.verify(registrator).registerActionSerializer( - eq(new NiciraActionSerializerKey(EncodeConstants.OF13_VERSION_ID, ActionResubmit.class)), + eq(new NiciraActionSerializerKey(EncodeConstants.OF_VERSION_1_3, ActionResubmit.class)), any(ResubmitCodec.class)); Mockito.verify(registrator).registerActionDeserializer( - eq(new NiciraActionDeserializerKey(EncodeConstants.OF13_VERSION_ID, 1)), + eq(new NiciraActionDeserializerKey(EncodeConstants.OF_VERSION_1_3, 1)), any(ResubmitCodec.class)); Mockito.verify(registrator).registerActionDeserializer( - eq(new NiciraActionDeserializerKey(EncodeConstants.OF13_VERSION_ID, 14)), + eq(new NiciraActionDeserializerKey(EncodeConstants.OF_VERSION_1_3, 14)), any(ResubmitCodec.class)); Mockito.verify(registrator).registerActionSerializer( - eq(new NiciraActionSerializerKey(EncodeConstants.OF13_VERSION_ID, ActionMultipath.class)), + eq(new NiciraActionSerializerKey(EncodeConstants.OF_VERSION_1_3, ActionMultipath.class)), any(MultipathCodec.class)); Mockito.verify(registrator).registerActionDeserializer( - eq(new NiciraActionDeserializerKey(EncodeConstants.OF13_VERSION_ID, 10)), + eq(new NiciraActionDeserializerKey(EncodeConstants.OF_VERSION_1_3, 10)), any(MultipathCodec.class)); Mockito.verify(registrator).registerActionDeserializer( - eq(new NiciraActionDeserializerKey(EncodeConstants.OF13_VERSION_ID, 46)), + eq(new NiciraActionDeserializerKey(EncodeConstants.OF_VERSION_1_3, 46)), any(EncapCodec.class)); Mockito.verify(registrator).registerActionSerializer( - eq(new NiciraActionSerializerKey(EncodeConstants.OF13_VERSION_ID, ActionEncap.class)), + eq(new NiciraActionSerializerKey(EncodeConstants.OF_VERSION_1_3, ActionEncap.class)), any(EncapCodec.class)); Mockito.verify(registrator).registerActionDeserializer( - eq(new NiciraActionDeserializerKey(EncodeConstants.OF13_VERSION_ID, 47)), + eq(new NiciraActionDeserializerKey(EncodeConstants.OF_VERSION_1_3, 47)), any(DecapCodec.class)); Mockito.verify(registrator).registerActionSerializer( - eq(new NiciraActionSerializerKey(EncodeConstants.OF13_VERSION_ID, ActionDecap.class)), + eq(new NiciraActionSerializerKey(EncodeConstants.OF_VERSION_1_3, ActionDecap.class)), any(DecapCodec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxReg0.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg0.class)), any(Reg0Codec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, 0)), + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 0)), any(Reg0Codec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxReg1.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg1.class)), any(Reg1Codec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, 1)), + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 1)), any(Reg1Codec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxReg2.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg2.class)), any(Reg2Codec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, 2)), + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 2)), any(Reg2Codec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxReg3.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg3.class)), any(Reg3Codec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, 3)), + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 3)), any(Reg3Codec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxReg4.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg4.class)), any(Reg4Codec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, 4)), + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 4)), any(Reg4Codec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxReg5.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg5.class)), any(Reg5Codec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, 5)), + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 5)), any(Reg5Codec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxReg6.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg6.class)), any(Reg6Codec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, 6)), + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 6)), any(Reg6Codec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxReg7.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg7.class)), any(Reg7Codec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, 7)), + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 7)), any(Reg7Codec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxTunId.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxTunId.class)), any(TunIdCodec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, 16)), + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 16)), any(TunIdCodec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm0Class.class, NxmOfArpOp.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfArpOp.class)), any(ArpOpCodec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_0_CLASS, 15)), + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 15)), any(ArpOpCodec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxArpSha.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxArpSha.class)), any(ArpShaCodec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, 17)), + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 17)), any(ArpShaCodec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm0Class.class, NxmOfArpSpa.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfArpSpa.class)), any(ArpSpaCodec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_0_CLASS, 16)), + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 16)), any(ArpSpaCodec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxArpTha.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxArpTha.class)), any(ArpThaCodec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, 18)), + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 18)), any(ArpThaCodec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm0Class.class, NxmOfArpTpa.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfArpTpa.class)), any(ArpTpaCodec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_0_CLASS, 17)), + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 17)), any(ArpTpaCodec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm0Class.class, NxmOfEthDst.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfEthDst.class)), any(EthDstCodec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_0_CLASS, 1)), + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 1)), any(EthDstCodec.class)); Mockito.verify(registrator).registerMatchEntrySerializer( - eq(new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm0Class.class, NxmOfEthSrc.class)), + eq(new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfEthSrc.class)), any(EthSrcCodec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_0_CLASS, 2)), + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 2)), any(EthSrcCodec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm0Class.class, NxmOfEthType.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfEthType.class)), any(EthTypeCodec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_0_CLASS, 3)), + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 3)), any(EthTypeCodec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxTunIpv4Dst.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxTunIpv4Dst.class)), any(TunIpv4DstCodec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, 32)), + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 32)), any(TunIpv4DstCodec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxTunIpv4Src.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxTunIpv4Src.class)), any(TunIpv4SrcCodec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, 31)), + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 31)), any(TunIpv4SrcCodec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm0Class.class, NxmOfTcpSrc.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfTcpSrc.class)), any(TcpSrcCodec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_0_CLASS, 9)), + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 9)), any(TcpSrcCodec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm0Class.class, NxmOfTcpDst.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfTcpDst.class)), any(TcpDstCodec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_0_CLASS, 10)), + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 10)), any(TcpDstCodec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm0Class.class, NxmOfUdpSrc.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfUdpSrc.class)), any(UdpSrcCodec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_0_CLASS, 11)), + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 11)), any(UdpSrcCodec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm0Class.class, NxmOfUdpDst.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfUdpDst.class)), any(UdpDstCodec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_0_CLASS, 12)), + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 12)), any(UdpDstCodec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxCtState.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxCtState.class)), any(CtStateCodec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, 105)), + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 105)), any(CtStateCodec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxCtZone.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxCtZone.class)), any(CtZoneCodec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, 106)), + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 106)), any(CtZoneCodec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxCtMark.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxCtMark.class)), any(CtMarkCodec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, 107)), + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 107)), any(CtMarkCodec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxCtTpSrc.class)), any(CtTpSrcCodec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 124)), any(CtTpSrcCodec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxCtTpDst.class)), any(CtTpDstCodec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 125)), any(CtTpDstCodec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxPktMark.class)), any(PktMarkCodec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 33)), any(PktMarkCodec.class)); Mockito.verify(registrator).registerActionDeserializer( - eq(new NiciraActionDeserializerKey(EncodeConstants.OF13_VERSION_ID, 48)), + eq(new NiciraActionDeserializerKey(EncodeConstants.OF_VERSION_1_3, 48)), any(DecNshTtlCodec.class)); Mockito.verify(registrator).registerActionSerializer( - eq(new NiciraActionSerializerKey(EncodeConstants.OF13_VERSION_ID, ActionDecNshTtl.class)), + eq(new NiciraActionSerializerKey(EncodeConstants.OF_VERSION_1_3, ActionDecNshTtl.class)), any(DecNshTtlCodec.class)); // experimenters MatchEntrySerializerKey nshFlagsSerializerKey = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, ExperimenterClass.class, NxmNxNshFlags.class); nshFlagsSerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); @@ -390,7 +390,7 @@ public class NiciraExtensionsRegistratorTest { eq(nshFlagsSerializerKey), any(NshFlagsCodec.class)); MatchEntryDeserializerKey nshFlagsDeserializerKey = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.EXPERIMENTER_CLASS, 1); nshFlagsDeserializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); @@ -398,7 +398,7 @@ public class NiciraExtensionsRegistratorTest { eq(nshFlagsDeserializerKey), any(NshFlagsCodec.class)); MatchEntrySerializerKey mdtypeSerializerKey = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, ExperimenterClass.class, NxmNxNshMdtype.class); mdtypeSerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); @@ -406,7 +406,7 @@ public class NiciraExtensionsRegistratorTest { eq(mdtypeSerializerKey), any(NshMdtypeCodec.class)); MatchEntryDeserializerKey mdtypeDeserializerKey = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.EXPERIMENTER_CLASS, 2); mdtypeDeserializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); @@ -414,7 +414,7 @@ public class NiciraExtensionsRegistratorTest { eq(mdtypeDeserializerKey), any(NshMdtypeCodec.class)); MatchEntrySerializerKey nshNpSerializerKey = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, ExperimenterClass.class, NxmNxNshNp.class); nshNpSerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); @@ -422,7 +422,7 @@ public class NiciraExtensionsRegistratorTest { eq(nshNpSerializerKey), any(NshNpCodec.class)); MatchEntryDeserializerKey nshNpDeserializerKey = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.EXPERIMENTER_CLASS, 3); nshNpDeserializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); @@ -430,7 +430,7 @@ public class NiciraExtensionsRegistratorTest { eq(nshNpDeserializerKey), any(NshNpCodec.class)); MatchEntrySerializerKey nspSerializerKey = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, ExperimenterClass.class, NxmNxNsp.class); nspSerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); @@ -438,7 +438,7 @@ public class NiciraExtensionsRegistratorTest { eq(nspSerializerKey), any(NspCodec.class)); MatchEntryDeserializerKey nspDeserializerKey = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.EXPERIMENTER_CLASS, 4); nspDeserializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); @@ -446,7 +446,7 @@ public class NiciraExtensionsRegistratorTest { eq(nspDeserializerKey), any(NspCodec.class)); MatchEntrySerializerKey nsiSerializerKey = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, ExperimenterClass.class, NxmNxNsi.class); nsiSerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); @@ -454,7 +454,7 @@ public class NiciraExtensionsRegistratorTest { eq(nsiSerializerKey), any(NsiCodec.class)); MatchEntryDeserializerKey nsiDeserializerKey = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.EXPERIMENTER_CLASS, 5); nsiDeserializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); @@ -462,7 +462,7 @@ public class NiciraExtensionsRegistratorTest { eq(nsiDeserializerKey), any(NsiCodec.class)); MatchEntrySerializerKey nshc1SerializerKey = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, ExperimenterClass.class, NxmNxNshc1.class); nshc1SerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); @@ -470,7 +470,7 @@ public class NiciraExtensionsRegistratorTest { eq(nshc1SerializerKey), any(Nshc1Codec.class)); MatchEntryDeserializerKey nshc1DeserializerKey = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.EXPERIMENTER_CLASS, 6); nshc1DeserializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); @@ -478,7 +478,7 @@ public class NiciraExtensionsRegistratorTest { eq(nshc1DeserializerKey), any(Nshc1Codec.class)); MatchEntrySerializerKey nshc2SerializerKey = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, ExperimenterClass.class, NxmNxNshc2.class); nshc2SerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); @@ -486,7 +486,7 @@ public class NiciraExtensionsRegistratorTest { eq(nshc2SerializerKey), any(Nshc2Codec.class)); MatchEntryDeserializerKey nshc2DeserializerKey = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.EXPERIMENTER_CLASS, 7); nshc2DeserializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); @@ -494,7 +494,7 @@ public class NiciraExtensionsRegistratorTest { eq(nshc2DeserializerKey), any(Nshc2Codec.class)); MatchEntrySerializerKey nshc3SerializerKey = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, ExperimenterClass.class, NxmNxNshc3.class); nshc3SerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); @@ -502,7 +502,7 @@ public class NiciraExtensionsRegistratorTest { eq(nshc3SerializerKey), any(Nshc3Codec.class)); MatchEntryDeserializerKey nshc3DeserializerKey = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.EXPERIMENTER_CLASS, 8); nshc3DeserializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); @@ -510,7 +510,7 @@ public class NiciraExtensionsRegistratorTest { eq(nshc3DeserializerKey), any(Nshc3Codec.class)); MatchEntrySerializerKey nshc4SerializerKey = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, ExperimenterClass.class, NxmNxNshc4.class); nshc4SerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); @@ -518,7 +518,7 @@ public class NiciraExtensionsRegistratorTest { eq(nshc4SerializerKey), any(Nshc4Codec.class)); MatchEntryDeserializerKey nshc4DeserializerKey = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.EXPERIMENTER_CLASS, 9); nshc4DeserializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); @@ -526,7 +526,7 @@ public class NiciraExtensionsRegistratorTest { eq(nshc4DeserializerKey), any(Nshc4Codec.class)); MatchEntrySerializerKey nshTtlSerializerKey = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, ExperimenterClass.class, NxmNxNshTtl.class); nshTtlSerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); @@ -534,7 +534,7 @@ public class NiciraExtensionsRegistratorTest { eq(nshTtlSerializerKey), any(NshTtlCodec.class)); MatchEntryDeserializerKey nshTtlDeserializerKey = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.EXPERIMENTER_CLASS, 10); nshTtlDeserializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); @@ -548,283 +548,283 @@ public class NiciraExtensionsRegistratorTest { niciraExtensionsRegistrator.close(); Mockito.verify(registrator) - .unregisterActionDeserializer(new NiciraActionDeserializerKey(EncodeConstants.OF13_VERSION_ID, 7)); + .unregisterActionDeserializer(new NiciraActionDeserializerKey(EncodeConstants.OF_VERSION_1_3, 7)); Mockito.verify(registrator).unregisterActionSerializer( - new NiciraActionSerializerKey(EncodeConstants.OF13_VERSION_ID, ActionRegLoad.class)); + new NiciraActionSerializerKey(EncodeConstants.OF_VERSION_1_3, ActionRegLoad.class)); Mockito.verify(registrator) - .unregisterActionDeserializer(new NiciraActionDeserializerKey(EncodeConstants.OF13_VERSION_ID, 33)); + .unregisterActionDeserializer(new NiciraActionDeserializerKey(EncodeConstants.OF_VERSION_1_3, 33)); Mockito.verify(registrator).unregisterActionSerializer( - new NiciraActionSerializerKey(EncodeConstants.OF13_VERSION_ID, ActionRegLoad2.class)); + new NiciraActionSerializerKey(EncodeConstants.OF_VERSION_1_3, ActionRegLoad2.class)); Mockito.verify(registrator) - .unregisterActionDeserializer(new NiciraActionDeserializerKey(EncodeConstants.OF13_VERSION_ID, 6)); + .unregisterActionDeserializer(new NiciraActionDeserializerKey(EncodeConstants.OF_VERSION_1_3, 6)); Mockito.verify(registrator).unregisterActionSerializer( - new NiciraActionSerializerKey(EncodeConstants.OF13_VERSION_ID, ActionRegMove.class)); + new NiciraActionSerializerKey(EncodeConstants.OF_VERSION_1_3, ActionRegMove.class)); Mockito.verify(registrator) - .unregisterActionDeserializer(new NiciraActionDeserializerKey(EncodeConstants.OF13_VERSION_ID, 15)); + .unregisterActionDeserializer(new NiciraActionDeserializerKey(EncodeConstants.OF_VERSION_1_3, 15)); Mockito.verify(registrator).unregisterActionSerializer( - new NiciraActionSerializerKey(EncodeConstants.OF13_VERSION_ID, ActionOutputReg.class)); + new NiciraActionSerializerKey(EncodeConstants.OF_VERSION_1_3, ActionOutputReg.class)); Mockito.verify(registrator) - .unregisterActionDeserializer(new NiciraActionDeserializerKey(EncodeConstants.OF13_VERSION_ID, 32)); + .unregisterActionDeserializer(new NiciraActionDeserializerKey(EncodeConstants.OF_VERSION_1_3, 32)); Mockito.verify(registrator).unregisterActionSerializer( - new NiciraActionSerializerKey(EncodeConstants.OF13_VERSION_ID, ActionOutputReg2.class)); + new NiciraActionSerializerKey(EncodeConstants.OF_VERSION_1_3, ActionOutputReg2.class)); Mockito.verify(registrator) - .unregisterActionDeserializer(new NiciraActionDeserializerKey(EncodeConstants.OF13_VERSION_ID, 1)); + .unregisterActionDeserializer(new NiciraActionDeserializerKey(EncodeConstants.OF_VERSION_1_3, 1)); Mockito.verify(registrator) - .unregisterActionDeserializer(new NiciraActionDeserializerKey(EncodeConstants.OF13_VERSION_ID, 14)); + .unregisterActionDeserializer(new NiciraActionDeserializerKey(EncodeConstants.OF_VERSION_1_3, 14)); Mockito.verify(registrator).unregisterActionSerializer( - new NiciraActionSerializerKey(EncodeConstants.OF13_VERSION_ID, ActionResubmit.class)); + new NiciraActionSerializerKey(EncodeConstants.OF_VERSION_1_3, ActionResubmit.class)); Mockito.verify(registrator) - .unregisterActionDeserializer(new NiciraActionDeserializerKey(EncodeConstants.OF13_VERSION_ID, 10)); + .unregisterActionDeserializer(new NiciraActionDeserializerKey(EncodeConstants.OF_VERSION_1_3, 10)); Mockito.verify(registrator).unregisterActionSerializer( - new NiciraActionSerializerKey(EncodeConstants.OF13_VERSION_ID, ActionMultipath.class)); + new NiciraActionSerializerKey(EncodeConstants.OF_VERSION_1_3, ActionMultipath.class)); Mockito.verify(registrator).unregisterActionSerializer( - new NiciraActionSerializerKey(EncodeConstants.OF13_VERSION_ID, ActionConntrack.class)); + new NiciraActionSerializerKey(EncodeConstants.OF_VERSION_1_3, ActionConntrack.class)); Mockito.verify(registrator) - .unregisterActionDeserializer(new NiciraActionDeserializerKey(EncodeConstants.OF13_VERSION_ID, 46)); + .unregisterActionDeserializer(new NiciraActionDeserializerKey(EncodeConstants.OF_VERSION_1_3, 46)); Mockito.verify(registrator).unregisterActionSerializer( - new NiciraActionSerializerKey(EncodeConstants.OF13_VERSION_ID, ActionEncap.class)); + new NiciraActionSerializerKey(EncodeConstants.OF_VERSION_1_3, ActionEncap.class)); Mockito.verify(registrator) - .unregisterActionDeserializer(new NiciraActionDeserializerKey(EncodeConstants.OF13_VERSION_ID, 47)); + .unregisterActionDeserializer(new NiciraActionDeserializerKey(EncodeConstants.OF_VERSION_1_3, 47)); Mockito.verify(registrator).unregisterActionSerializer( - new NiciraActionSerializerKey(EncodeConstants.OF13_VERSION_ID, ActionDecap.class)); + new NiciraActionSerializerKey(EncodeConstants.OF_VERSION_1_3, ActionDecap.class)); Mockito.verify(registrator) - .unregisterActionDeserializer(new NiciraActionDeserializerKey(EncodeConstants.OF13_VERSION_ID, 48)); + .unregisterActionDeserializer(new NiciraActionDeserializerKey(EncodeConstants.OF_VERSION_1_3, 48)); Mockito.verify(registrator).unregisterActionSerializer( - new NiciraActionSerializerKey(EncodeConstants.OF13_VERSION_ID, ActionDecNshTtl.class)); + new NiciraActionSerializerKey(EncodeConstants.OF_VERSION_1_3, ActionDecNshTtl.class)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxReg0.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg0.class)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, 0)); + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 0)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxReg1.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg1.class)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, 1)); + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 1)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxReg2.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg2.class)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, 2)); + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 2)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxReg3.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg3.class)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, 3)); + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 3)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxReg4.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg4.class)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, 4)); + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 4)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxReg5.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg5.class)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, 5)); + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 5)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxReg6.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg6.class)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, 6)); + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 6)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxReg7.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg7.class)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, 7)); + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 7)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxTunId.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxTunId.class)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, 16)); + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 16)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm0Class.class, NxmOfArpOp.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfArpOp.class)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_0_CLASS, 15)); + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 15)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxArpSha.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxArpSha.class)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, 17)); + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 17)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm0Class.class, NxmOfArpSpa.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfArpSpa.class)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_0_CLASS, 16)); + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 16)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxArpTha.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxArpTha.class)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, 18)); + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 18)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm0Class.class, NxmOfArpTpa.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfArpTpa.class)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_0_CLASS, 17)); + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 17)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm0Class.class, NxmOfEthDst.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfEthDst.class)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_0_CLASS, 1)); + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 1)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm0Class.class, NxmOfEthSrc.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfEthSrc.class)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_0_CLASS, 2)); + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 2)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm0Class.class, NxmOfEthType.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfEthType.class)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_0_CLASS, 3)); + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 3)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxTunIpv4Dst.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxTunIpv4Dst.class)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, 32)); + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 32)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxTunIpv4Src.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxTunIpv4Src.class)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, 31)); + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 31)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm0Class.class, NxmOfTcpSrc.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfTcpSrc.class)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_0_CLASS, 9)); + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 9)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm0Class.class, NxmOfTcpDst.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfTcpDst.class)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_0_CLASS, 10)); + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 10)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm0Class.class, NxmOfUdpSrc.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfUdpSrc.class)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_0_CLASS, 11)); + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 11)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm0Class.class, NxmOfUdpDst.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfUdpDst.class)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_0_CLASS, 12)); + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 12)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxCtState.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxCtState.class)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, 105)); + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 105)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxCtZone.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxCtZone.class)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, 106)); + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 106)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxCtMark.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxCtMark.class)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, 107)); + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 107)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxCtTpSrc.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxCtTpSrc.class)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, 124)); + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 124)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxCtTpDst.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxCtTpDst.class)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, 125)); + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 125)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxPktMark.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxPktMark.class)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, 33)); + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 33)); // experimenters MatchEntrySerializerKey nshFlagsSerializerKey = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, ExperimenterClass.class, NxmNxNshFlags.class); nshFlagsSerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); Mockito.verify(registrator).unregisterMatchEntrySerializer(nshFlagsSerializerKey); MatchEntryDeserializerKey nshFlagsDeserializerKey = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.EXPERIMENTER_CLASS, 1); nshFlagsDeserializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); Mockito.verify(registrator).unregisterMatchEntryDeserializer(nshFlagsDeserializerKey); MatchEntrySerializerKey mdtypeSerializerKey = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, ExperimenterClass.class, NxmNxNshMdtype.class); mdtypeSerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); Mockito.verify(registrator).unregisterMatchEntrySerializer(mdtypeSerializerKey); MatchEntryDeserializerKey mdtypeDeserializerKey = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.EXPERIMENTER_CLASS, 2); mdtypeDeserializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); Mockito.verify(registrator).unregisterMatchEntryDeserializer(mdtypeDeserializerKey); MatchEntrySerializerKey nshNpSerializerKey = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, ExperimenterClass.class, NxmNxNshNp.class); nshNpSerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); Mockito.verify(registrator).unregisterMatchEntrySerializer(nshNpSerializerKey); MatchEntryDeserializerKey nshNpDeserializerKey = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.EXPERIMENTER_CLASS, 3); nshNpDeserializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); Mockito.verify(registrator).unregisterMatchEntryDeserializer(nshNpDeserializerKey); MatchEntrySerializerKey nspSerializerKey = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, ExperimenterClass.class, NxmNxNsp.class); nspSerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); Mockito.verify(registrator).unregisterMatchEntrySerializer(nspSerializerKey); MatchEntryDeserializerKey nspDeserializerKey = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.EXPERIMENTER_CLASS, 4); nspDeserializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); Mockito.verify(registrator).unregisterMatchEntryDeserializer(nspDeserializerKey); MatchEntrySerializerKey nsiSerializerKey = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, ExperimenterClass.class, NxmNxNsi.class); nsiSerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); Mockito.verify(registrator).unregisterMatchEntrySerializer(nsiSerializerKey); MatchEntryDeserializerKey nsiDeserializerKey = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.EXPERIMENTER_CLASS, 5); nsiDeserializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); Mockito.verify(registrator).unregisterMatchEntryDeserializer(nsiDeserializerKey); MatchEntrySerializerKey nshc1SerializerKey = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, ExperimenterClass.class, NxmNxNshc1.class); nshc1SerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); Mockito.verify(registrator).unregisterMatchEntrySerializer(nshc1SerializerKey); MatchEntryDeserializerKey nshc1DeserializerKey = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.EXPERIMENTER_CLASS, 6); nshc1DeserializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); Mockito.verify(registrator).unregisterMatchEntryDeserializer(nshc1DeserializerKey); MatchEntrySerializerKey nshc2SerializerKey = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, ExperimenterClass.class, NxmNxNshc2.class); nshc2SerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); Mockito.verify(registrator).unregisterMatchEntrySerializer(nshc2SerializerKey); MatchEntryDeserializerKey nshc2DeserializerKey = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.EXPERIMENTER_CLASS, 7); nshc2DeserializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); Mockito.verify(registrator).unregisterMatchEntryDeserializer(nshc2DeserializerKey); MatchEntrySerializerKey nshc3SerializerKey = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, ExperimenterClass.class, NxmNxNshc3.class); nshc3SerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); Mockito.verify(registrator).unregisterMatchEntrySerializer(nshc3SerializerKey); MatchEntryDeserializerKey nshc3DeserializerKey = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.EXPERIMENTER_CLASS, 8); nshc3DeserializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); Mockito.verify(registrator).unregisterMatchEntryDeserializer(nshc3DeserializerKey); MatchEntrySerializerKey nshc4SerializerKey = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, ExperimenterClass.class, NxmNxNshc4.class); nshc4SerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); Mockito.verify(registrator).unregisterMatchEntrySerializer(nshc1SerializerKey); MatchEntryDeserializerKey nshc4DeserializerKey = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.EXPERIMENTER_CLASS, 9); nshc4DeserializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); Mockito.verify(registrator).unregisterMatchEntryDeserializer(nshc4DeserializerKey); MatchEntrySerializerKey nshTtlSerializerKey = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, ExperimenterClass.class, NxmNxNshTtl.class); nshTtlSerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); Mockito.verify(registrator).unregisterMatchEntrySerializer(nshTtlSerializerKey); MatchEntryDeserializerKey nshTtlDeserializerKey = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.EXPERIMENTER_CLASS, 10); nshTtlDeserializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/ActionDeserializerTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/ActionDeserializerTest.java index 0fa709408e..8bfc50cba0 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/ActionDeserializerTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/ActionDeserializerTest.java @@ -26,6 +26,7 @@ import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer; import org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProvider; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint8; @RunWith(MockitoJUnitRunner.class) public class ActionDeserializerTest { @@ -44,9 +45,7 @@ public class ActionDeserializerTest { OFDeserializer ofDeserializer; - - - private static final short VERSION = 4; + private static final Uint8 VERSION = Uint8.valueOf(4); private static final Uint32 EXPERIMENT_ID = NiciraConstants.NX_VENDOR_ID; private static final byte SUBTYPE = 10; @@ -86,7 +85,7 @@ public class ActionDeserializerTest { Mockito.verify(deserializer).deserialize(buffer); } - private static void createBuffer(ByteBuf message) { + private static void createBuffer(final ByteBuf message) { //size of experiment type message.writeShort(1); //size of length @@ -97,7 +96,7 @@ public class ActionDeserializerTest { message.writeShort(SUBTYPE); } - private static void createBufferWithWrongExperimentId(ByteBuf message) { + private static void createBufferWithWrongExperimentId(final ByteBuf message) { //size of experiment type message.writeShort(1); //size of length diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/ConntrackCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/ConntrackCodecTest.java index 44444f4ac4..873380cee9 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/ConntrackCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/ConntrackCodecTest.java @@ -22,8 +22,8 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types. import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ExperimenterId; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionConntrack; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionConntrackBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionConntrack; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionConntrackBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.conntrack.grouping.NxActionConntrackBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.conntrack.grouping.nx.action.conntrack.CtActions; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.conntrack.grouping.nx.action.conntrack.CtActionsBuilder; diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/CtClearCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/CtClearCodecTest.java index 8656f05d85..5a383bfd17 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/CtClearCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/CtClearCodecTest.java @@ -19,8 +19,8 @@ import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ExperimenterId; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionCtClear; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionCtClearBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionCtClear; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionCtClearBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.ct.clear.grouping.NxActionCtClear; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.ct.clear.grouping.NxActionCtClearBuilder; @@ -76,7 +76,7 @@ public class CtClearCodecTest { return actionBuilder.build(); } - private void createBuffer(ByteBuf message) { + private void createBuffer(final ByteBuf message) { message.writeShort(EncodeConstants.EXPERIMENTER_VALUE); message.writeShort(length); message.writeInt(NiciraConstants.NX_VENDOR_ID.intValue()); diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/DecNshTtlCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/DecNshTtlCodecTest.java index 984b5cd077..ae4d766787 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/DecNshTtlCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/DecNshTtlCodecTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.nx.codec.action; import static org.junit.Assert.assertEquals; @@ -21,8 +20,8 @@ import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ExperimenterId; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionDecNshTtl; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionDecNshTtlBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionDecNshTtl; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionDecNshTtlBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.dec.nsh.ttl.grouping.NxActionDecNshTtl; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.dec.nsh.ttl.grouping.NxActionDecNshTtlBuilder; @@ -76,7 +75,7 @@ public class DecNshTtlCodecTest { return actionBuilder.build(); } - private static void createBuffer(ByteBuf message) { + private static void createBuffer(final ByteBuf message) { message.writeShort(EncodeConstants.EXPERIMENTER_VALUE); message.writeShort(LENGTH); message.writeInt(NiciraConstants.NX_VENDOR_ID.intValue()); diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/DecapCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/DecapCodecTest.java index 05804e9812..e72da8ec7f 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/DecapCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/DecapCodecTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.nx.codec.action; import static org.junit.Assert.assertEquals; @@ -20,8 +19,8 @@ import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ExperimenterId; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionDecap; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionDecapBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionDecap; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionDecapBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.decap.grouping.NxActionDecapBuilder; import org.opendaylight.yangtools.yang.common.Uint32; @@ -70,7 +69,7 @@ public class DecapCodecTest { assertFalse(buffer.isReadable()); } - private static void createBuffer(ByteBuf message) { + private static void createBuffer(final ByteBuf message) { message.writeShort(EncodeConstants.EXPERIMENTER_VALUE); message.writeShort(LENGTH); message.writeInt(NiciraConstants.NX_VENDOR_ID.intValue()); diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/EncapCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/EncapCodecTest.java index 1293904120..0bce26df10 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/EncapCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/EncapCodecTest.java @@ -20,8 +20,8 @@ import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ExperimenterId; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionEncap; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionEncapBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionEncap; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionEncapBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.encap.grouping.NxActionEncapBuilder; import org.opendaylight.yangtools.yang.common.Uint32; @@ -71,7 +71,7 @@ public class EncapCodecTest { assertFalse(buffer.isReadable()); } - private static void createBuffer(ByteBuf message) { + private static void createBuffer(final ByteBuf message) { message.writeShort(EncodeConstants.EXPERIMENTER_VALUE); message.writeShort(LENGTH); message.writeInt(NiciraConstants.NX_VENDOR_ID.intValue()); diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/FinTimeoutCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/FinTimeoutCodecTest.java index 7a1da16b14..9f9e506d21 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/FinTimeoutCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/FinTimeoutCodecTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.nx.codec.action; import static org.junit.Assert.assertEquals; @@ -19,8 +18,8 @@ import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ExperimenterId; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionFinTimeout; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionFinTimeoutBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionFinTimeout; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionFinTimeoutBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.fin.timeout.grouping.NxActionFinTimeoutBuilder; import org.opendaylight.yangtools.yang.common.Uint16; @@ -89,7 +88,7 @@ public class FinTimeoutCodecTest { assertEquals(0, buffer.readableBytes()); } - private static Action createAction(Uint16 idleTimeout, Uint16 hardTimeout) { + private static Action createAction(final Uint16 idleTimeout, final Uint16 hardTimeout) { ExperimenterId experimenterId = new ExperimenterId(NiciraConstants.NX_VENDOR_ID); ActionBuilder actionBuilder = new ActionBuilder(); actionBuilder.setExperimenterId(experimenterId); @@ -109,7 +108,7 @@ public class FinTimeoutCodecTest { return actionBuilder.build(); } - private static void createBuffer(ByteBuf message) { + private static void createBuffer(final ByteBuf message) { message.writeShort(EncodeConstants.EXPERIMENTER_VALUE); message.writeShort(LENGTH); message.writeInt(NiciraConstants.NX_VENDOR_ID.intValue()); diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/LearnCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/LearnCodecTest.java index 870cfd246f..a18a6c100d 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/LearnCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/LearnCodecTest.java @@ -19,8 +19,6 @@ import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ExperimenterId; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionLearn; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionLearnBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.flow.mod.spec.flow.mod.spec.FlowModAddMatchFromFieldCaseBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.flow.mod.spec.flow.mod.spec.FlowModAddMatchFromValueCaseBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.flow.mod.spec.flow.mod.spec.FlowModCopyFieldIntoFieldCaseBuilder; @@ -31,6 +29,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev1 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.flow.mod.spec.flow.mod.spec.flow.mod.copy.field.into.field._case.FlowModCopyFieldIntoFieldBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.flow.mod.spec.flow.mod.spec.flow.mod.copy.value.into.field._case.FlowModCopyValueIntoFieldBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.flow.mod.spec.flow.mod.spec.flow.mod.output.to.port._case.FlowModOutputToPortBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionLearn; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionLearnBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.learn.grouping.NxActionLearnBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.learn.grouping.nx.action.learn.FlowMods; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.learn.grouping.nx.action.learn.FlowModsBuilder; @@ -213,7 +213,7 @@ public class LearnCodecTest { return flowMods; } - private static void createBuffer(ByteBuf message) { + private static void createBuffer(final ByteBuf message) { message.writeShort(EncodeConstants.EXPERIMENTER_VALUE); message.writeShort(LEARN_HEADER_LEN + 56); message.writeInt(NiciraConstants.NX_VENDOR_ID.intValue()); @@ -256,7 +256,7 @@ public class LearnCodecTest { message.writeShort(10); } - private static void toFlowModSpecHeader(ByteBuf message, int src, int dst) { + private static void toFlowModSpecHeader(final ByteBuf message, final int src, final int dst) { short value = 0; short bitNum = 48; value |= src << 13; diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/MultipathCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/MultipathCodecTest.java index 2cd56a85e2..230a97bebf 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/MultipathCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/MultipathCodecTest.java @@ -20,8 +20,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev1 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ExperimenterId; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.OfjNxHashFields; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.OfjNxMpAlgorithm; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionMultipath; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionMultipathBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionMultipath; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionMultipathBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.multipath.grouping.NxActionMultipathBuilder; import org.opendaylight.yangtools.yang.common.Uint16; import org.opendaylight.yangtools.yang.common.Uint32; @@ -40,7 +40,6 @@ public class MultipathCodecTest { buffer = ByteBufAllocator.DEFAULT.buffer(); } - @Test public void serializeTest() { action = createAction(); @@ -106,7 +105,7 @@ public class MultipathCodecTest { return actionBuilder.build(); } - private static void createBuffer(ByteBuf message) { + private static void createBuffer(final ByteBuf message) { message.writeShort(EncodeConstants.EXPERIMENTER_VALUE); message.writeShort(LENGTH); message.writeInt(NiciraConstants.NX_VENDOR_ID.intValue()); diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/OutputReg2CodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/OutputReg2CodecTest.java index 7a8fce60c5..5fb36e7b35 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/OutputReg2CodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/OutputReg2CodecTest.java @@ -21,8 +21,8 @@ import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ExperimenterId; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionOutputReg2; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionOutputReg2Builder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionOutputReg2; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionOutputReg2Builder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.output.reg2.grouping.NxActionOutputReg2Builder; import org.opendaylight.yangtools.yang.common.Uint16; import org.opendaylight.yangtools.yang.common.Uint64; diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/OutputRegCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/OutputRegCodecTest.java index de7b3adf8a..cb0b807e72 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/OutputRegCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/OutputRegCodecTest.java @@ -18,8 +18,8 @@ import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ExperimenterId; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionOutputReg; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionOutputRegBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionOutputReg; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionOutputRegBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.output.reg.grouping.NxActionOutputRegBuilder; import org.opendaylight.yangtools.yang.common.Uint16; import org.opendaylight.yangtools.yang.common.Uint32; @@ -90,7 +90,7 @@ public class OutputRegCodecTest { return actionBuilder.build(); } - private static void createBuffer(ByteBuf message) { + private static void createBuffer(final ByteBuf message) { message.writeShort(EncodeConstants.EXPERIMENTER_VALUE); message.writeShort(LENGTH); message.writeInt(NiciraConstants.NX_VENDOR_ID.intValue()); diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/RegLoad2CodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/RegLoad2CodecTest.java index fdf26c34f0..ae57b6176c 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/RegLoad2CodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/RegLoad2CodecTest.java @@ -31,8 +31,8 @@ import org.opendaylight.openflowjava.protocol.api.keys.MatchEntryDeserializerKey import org.opendaylight.openflowjava.protocol.api.keys.MatchEntrySerializerKey; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.openflowjava.util.ByteBufUtils; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.experimenter.id._case.ExperimenterBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.experimenter.id._case.ExperimenterBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ExperimenterId; @@ -40,8 +40,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Expe import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.MatchField; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionRegLoad2; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionRegLoad2Builder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionRegLoad2; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionRegLoad2Builder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.reg.load2.grouping.NxActionRegLoad2; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.reg.load2.grouping.NxActionRegLoad2Builder; @@ -73,7 +73,7 @@ public class RegLoad2CodecTest { + " FF FF 02 00 00 5A D6 50" // OXM field + " 00 00 00 00 00 00"); // padding MatchEntryDeserializerKey key = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, EncodeConstants.EXPERIMENTER_VALUE, 1); key.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); @@ -96,7 +96,7 @@ public class RegLoad2CodecTest { final ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer(); final Action action = createAction(); MatchEntrySerializerKey key = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, ExperimenterClass.class, OxmMatchFieldClass.class); key.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/RegLoadCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/RegLoadCodecTest.java index ef7f2846ee..15a2b5b89f 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/RegLoadCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/RegLoadCodecTest.java @@ -18,8 +18,8 @@ import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ExperimenterId; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionRegLoad; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionRegLoadBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionRegLoad; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionRegLoadBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.reg.load.grouping.NxActionRegLoadBuilder; import org.opendaylight.yangtools.yang.common.Uint16; import org.opendaylight.yangtools.yang.common.Uint32; @@ -87,7 +87,7 @@ public class RegLoadCodecTest { return actionBuilder.build(); } - private static void createBuffer(ByteBuf message) { + private static void createBuffer(final ByteBuf message) { message.writeShort(EncodeConstants.EXPERIMENTER_VALUE); message.writeShort(LENGTH); message.writeInt(NiciraConstants.NX_VENDOR_ID.intValue()); diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/RegMoveCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/RegMoveCodecTest.java index 26a99be7b1..cfce08382f 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/RegMoveCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/RegMoveCodecTest.java @@ -21,8 +21,8 @@ import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ExperimenterId; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionRegMove; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionRegMoveBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionRegMove; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionRegMoveBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.reg.move.grouping.NxActionRegMoveBuilder; import org.opendaylight.yangtools.yang.common.Uint16; import org.opendaylight.yangtools.yang.common.Uint64; @@ -156,7 +156,7 @@ public class RegMoveCodecTest { assertEquals(0, buffer.readableBytes()); } - private static Action createAction(Uint64 src, Uint64 dst) { + private static Action createAction(final Uint64 src, final Uint64 dst) { ExperimenterId experimenterId = new ExperimenterId(NiciraConstants.NX_VENDOR_ID); ActionBuilder actionBuilder = new ActionBuilder(); actionBuilder.setExperimenterId(experimenterId); @@ -175,7 +175,7 @@ public class RegMoveCodecTest { return actionBuilder.build(); } - private static void createBuffer(ByteBuf message, boolean withExpSrc, boolean withExpDst) { + private static void createBuffer(final ByteBuf message, final boolean withExpSrc, final boolean withExpDst) { message.writeShort(EncodeConstants.EXPERIMENTER_VALUE); int length = withExpSrc || withExpDst ? 32 : 24; message.writeShort(length); diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/ResubmitCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/ResubmitCodecTest.java index 7eae832736..356d2d5d55 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/ResubmitCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/ResubmitCodecTest.java @@ -18,8 +18,8 @@ import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ExperimenterId; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionResubmit; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionResubmitBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionResubmit; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionResubmitBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.resubmit.grouping.NxActionResubmitBuilder; import org.opendaylight.yangtools.yang.common.Uint16; import org.opendaylight.yangtools.yang.common.Uint8; @@ -125,7 +125,7 @@ public class ResubmitCodecTest { assertEquals(0, buffer.readableBytes()); } - private static Action createAction(Uint16 inPort, Uint8 table) { + private static Action createAction(final Uint16 inPort, final Uint8 table) { ExperimenterId experimenterId = new ExperimenterId(NiciraConstants.NX_VENDOR_ID); ActionBuilder actionBuilder = new ActionBuilder(); actionBuilder.setExperimenterId(experimenterId); @@ -145,7 +145,7 @@ public class ResubmitCodecTest { return actionBuilder.build(); } - private static void createBuffer(ByteBuf message) { + private static void createBuffer(final ByteBuf message) { message.writeShort(EncodeConstants.EXPERIMENTER_VALUE); message.writeShort(LENGTH); message.writeInt(NiciraConstants.NX_VENDOR_ID.intValue()); diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/AbstractExperimenterMatchCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/AbstractExperimenterMatchCodecTest.java index 4771953772..13442c27d0 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/AbstractExperimenterMatchCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/AbstractExperimenterMatchCodecTest.java @@ -19,17 +19,17 @@ import org.junit.Test; import org.opendaylight.openflowjava.nx.api.NiciraConstants; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.openflowjava.protocol.api.util.OxmMatchConstants; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCase; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.experimenter.id._case.Experimenter; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.experimenter.id._case.ExperimenterBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.experimenter.id._case.Experimenter; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.experimenter.id._case.ExperimenterBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ExperimenterId; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.ExperimenterClass; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.MatchField; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.OfjAugNxExpMatchBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.NxExpMatchEntryValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.NxExpMatchEntryValue; import org.opendaylight.yangtools.yang.common.Uint32; public class AbstractExperimenterMatchCodecTest { diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/AbstractNshcCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/AbstractNshcCodecTest.java index d0b1a38bf6..56b5a6c7b3 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/AbstractNshcCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/AbstractNshcCodecTest.java @@ -15,9 +15,9 @@ import io.netty.buffer.ByteBufAllocator; import org.junit.Before; import org.junit.Test; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.MatchField; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.NxExpMatchEntryValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshcCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshcCaseValueBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.NxExpMatchEntryValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshcCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshcCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint32; public class AbstractNshcCodecTest { diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/ArpOpCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/ArpOpCodecTest.java index 253351df37..a12f2ae141 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/ArpOpCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/ArpOpCodecTest.java @@ -18,9 +18,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm0 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfArpOp; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.ArpOpCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.ArpOpCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.arp.op.grouping.ArpOpValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.ArpOpCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.ArpOpCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint16; public class ArpOpCodecTest { diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/ArpShaCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/ArpShaCodecTest.java index 5aea6d9f14..2df0c3e1d5 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/ArpShaCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/ArpShaCodecTest.java @@ -21,9 +21,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxArpSha; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.ArpShaCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.ArpShaCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.arp.sha.grouping.ArpShaValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.ArpShaCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.ArpShaCaseValueBuilder; public class ArpShaCodecTest { ArpShaCodec arpShaCodec; diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/ArpSpaCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/ArpSpaCodecTest.java index 9b8e31ae87..7edbb1fa11 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/ArpSpaCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/ArpSpaCodecTest.java @@ -17,9 +17,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm0 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfArpSpa; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.ArpSpaCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.ArpSpaCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.arp.spa.grouping.ArpSpaValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.ArpSpaCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.ArpSpaCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint32; public class ArpSpaCodecTest { diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/ArpThaCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/ArpThaCodecTest.java index 276bd43c90..4081007afb 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/ArpThaCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/ArpThaCodecTest.java @@ -21,9 +21,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxArpTha; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.ArpThaCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.ArpThaCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.arp.tha.grouping.ArpThaValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.ArpThaCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.ArpThaCaseValueBuilder; public class ArpThaCodecTest { diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/ArpTpaCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/ArpTpaCodecTest.java index 9d90b14df8..bf9e05fec5 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/ArpTpaCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/ArpTpaCodecTest.java @@ -17,9 +17,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm0 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfArpTpa; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.ArpTpaCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.ArpTpaCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.arp.tpa.grouping.ArpTpaValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.ArpTpaCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.ArpTpaCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint32; public class ArpTpaCodecTest { diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/CtStateCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/CtStateCodecTest.java index 49d1c68e3b..21fdc4127f 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/CtStateCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/CtStateCodecTest.java @@ -17,9 +17,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxCtState; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.CtStateCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.CtStateCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.ct.state.grouping.CtStateValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.CtStateCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.CtStateCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint32; public class CtStateCodecTest { diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/CtTpDstCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/CtTpDstCodecTest.java index 8036100f5f..574ba3f74d 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/CtTpDstCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/CtTpDstCodecTest.java @@ -17,9 +17,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxCtTpDst; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.CtTpDstCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.CtTpDstCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.ct.tp.dst.grouping.CtTpDstValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.CtTpDstCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.CtTpDstCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint16; public class CtTpDstCodecTest { diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/CtTpSrcCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/CtTpSrcCodecTest.java index bd4d859d92..3cb307904b 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/CtTpSrcCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/CtTpSrcCodecTest.java @@ -18,9 +18,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxCtTpSrc; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.CtTpSrcCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.CtTpSrcCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.ct.tp.src.grouping.CtTpSrcValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.CtTpSrcCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.CtTpSrcCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint16; public class CtTpSrcCodecTest { diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/CtZoneCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/CtZoneCodecTest.java index 1d12a8ae28..e9328ae618 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/CtZoneCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/CtZoneCodecTest.java @@ -17,9 +17,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxCtZone; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.CtZoneCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.CtZoneCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.ct.zone.grouping.CtZoneValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.CtZoneCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.CtZoneCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint16; public class CtZoneCodecTest { diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/EthDstCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/EthDstCodecTest.java index cbe14449df..04a06aa15a 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/EthDstCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/EthDstCodecTest.java @@ -20,9 +20,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm0 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfEthDst; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.EthDstCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.EthDstCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.eth.dst.grouping.EthDstValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.EthDstCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.EthDstCaseValueBuilder; public class EthDstCodecTest { private final ByteBuf buffer = ByteBufAllocator.DEFAULT.buffer(); diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/EthSrcCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/EthSrcCodecTest.java index 2c5d14dec7..52de35f74f 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/EthSrcCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/EthSrcCodecTest.java @@ -21,9 +21,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfEthDst; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfEthSrc; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.EthSrcCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.EthSrcCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.eth.src.grouping.EthSrcValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.EthSrcCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.EthSrcCaseValueBuilder; public class EthSrcCodecTest { private final ByteBuf buffer = ByteBufAllocator.DEFAULT.buffer(); diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/EthTypeCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/EthTypeCodecTest.java index 08f5dbec80..83a85ec055 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/EthTypeCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/EthTypeCodecTest.java @@ -17,9 +17,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm0 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfEthType; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.EthTypeCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.EthTypeCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.eth.type.grouping.EthTypeValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.EthTypeCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.EthTypeCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint16; public class EthTypeCodecTest { diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/IcmpTypeCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/IcmpTypeCodecTest.java index 02990cd761..610dd5d7bf 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/IcmpTypeCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/IcmpTypeCodecTest.java @@ -17,9 +17,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm0 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfIcmpType; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.IcmpTypeCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.IcmpTypeCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.icmp.type.grouping.IcmpTypeValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.IcmpTypeCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.IcmpTypeCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint8; public class IcmpTypeCodecTest { diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/IpDstCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/IpDstCodecTest.java index d185c82f43..1e9c46550f 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/IpDstCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/IpDstCodecTest.java @@ -17,9 +17,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm0 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfIpDst; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.IpDstCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.IpDstCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.ip.dst.grouping.IpDstValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.IpDstCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.IpDstCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint32; public class IpDstCodecTest { diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/IpSrcCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/IpSrcCodecTest.java index 617fc417be..d2805bd52f 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/IpSrcCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/IpSrcCodecTest.java @@ -17,9 +17,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm0 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfIpSrc; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.IpSrcCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.IpSrcCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.ip.src.grouping.IpSrcValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.IpSrcCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.IpSrcCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint32; public class IpSrcCodecTest { diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/Ipv6DstCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/Ipv6DstCodecTest.java index 6f25fd9f0d..757eb4921f 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/Ipv6DstCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/Ipv6DstCodecTest.java @@ -17,9 +17,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfIpDst; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.IpDstCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.IpDstCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.ip.dst.grouping.IpDstValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.IpDstCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.IpDstCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint32; public class Ipv6DstCodecTest { diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/Ipv6SrcCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/Ipv6SrcCodecTest.java index c6b7bb06e2..d11b4b2df4 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/Ipv6SrcCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/Ipv6SrcCodecTest.java @@ -17,9 +17,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfIpSrc; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.IpSrcCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.IpSrcCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.ip.src.grouping.IpSrcValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.IpSrcCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.IpSrcCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint32; public class Ipv6SrcCodecTest { diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/MetadataCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/MetadataCodecTest.java index 51f4e2abd1..7090842423 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/MetadataCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/MetadataCodecTest.java @@ -17,8 +17,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm0 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfMetadata; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.OfMetadataCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.oxm.of.metadata.grouping.MetadataValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.OfMetadataCaseValueBuilder; public class MetadataCodecTest { private final ByteBuf buffer = ByteBufAllocator.DEFAULT.buffer(); diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/NshFlagsCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/NshFlagsCodecTest.java index 0fbba0004b..d15b5852df 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/NshFlagsCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/NshFlagsCodecTest.java @@ -14,11 +14,11 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; import org.junit.Before; import org.junit.Test; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.NxExpMatchEntryValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshFlagsCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshFlagsCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.nsh.flags.grouping.NshFlagsValues; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.nsh.flags.grouping.NshFlagsValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.NxExpMatchEntryValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshFlagsCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshFlagsCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint8; public class NshFlagsCodecTest { @@ -77,12 +77,12 @@ public class NshFlagsCodecTest { assertFalse(buffer.isReadable()); } - private static NxExpMatchEntryValue createMatchEntryValue(Uint8 value, Uint8 mask) { + private static NxExpMatchEntryValue createMatchEntryValue(final Uint8 value, final Uint8 mask) { NshFlagsValues nshFlagsValues = new NshFlagsValuesBuilder().setNshFlags(value).setMask(mask).build(); return new NshFlagsCaseValueBuilder().setNshFlagsValues(nshFlagsValues).build(); } - private static void writeBuffer(ByteBuf message, Uint8 value, Uint8 mask) { + private static void writeBuffer(final ByteBuf message, final Uint8 value, final Uint8 mask) { message.writeByte(value.intValue()); if (mask != null) { message.writeByte(mask.intValue()); diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/NshMdtypeCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/NshMdtypeCodecTest.java index 0263d0eb6b..74d475a5a4 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/NshMdtypeCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/NshMdtypeCodecTest.java @@ -14,11 +14,11 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; import org.junit.Before; import org.junit.Test; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.NxExpMatchEntryValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshMdtypeCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshMdtypeCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.nsh.mdtype.grouping.NshMdtypeValues; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.nsh.mdtype.grouping.NshMdtypeValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.NxExpMatchEntryValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshMdtypeCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshMdtypeCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint8; public class NshMdtypeCodecTest { @@ -54,12 +54,12 @@ public class NshMdtypeCodecTest { assertFalse(buffer.isReadable()); } - private static NxExpMatchEntryValue createMatchEntryValue(Uint8 value) { + private static NxExpMatchEntryValue createMatchEntryValue(final Uint8 value) { NshMdtypeValues nshMdtypeValues = new NshMdtypeValuesBuilder().setValue(value).build(); return new NshMdtypeCaseValueBuilder().setNshMdtypeValues(nshMdtypeValues).build(); } - private static void writeBuffer(ByteBuf message, Uint8 value) { + private static void writeBuffer(final ByteBuf message, final Uint8 value) { message.writeByte(value.intValue()); } } \ No newline at end of file diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/NshNpCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/NshNpCodecTest.java index 85a8b2dac7..0e1a72cc06 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/NshNpCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/NshNpCodecTest.java @@ -14,11 +14,11 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; import org.junit.Before; import org.junit.Test; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.NxExpMatchEntryValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshNpCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshNpCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.nsh.np.grouping.NshNpValues; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.nsh.np.grouping.NshNpValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.NxExpMatchEntryValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshNpCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshNpCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint8; public class NshNpCodecTest { @@ -54,12 +54,12 @@ public class NshNpCodecTest { assertFalse(buffer.isReadable()); } - private static NxExpMatchEntryValue createMatchEntryValue(Uint8 value) { + private static NxExpMatchEntryValue createMatchEntryValue(final Uint8 value) { NshNpValues nshNpValues = new NshNpValuesBuilder().setValue(value).build(); return new NshNpCaseValueBuilder().setNshNpValues(nshNpValues).build(); } - private static void writeBuffer(ByteBuf message, Uint8 value) { + private static void writeBuffer(final ByteBuf message, final Uint8 value) { message.writeByte(value.intValue()); } } \ No newline at end of file diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/NshTtlCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/NshTtlCodecTest.java index f494f4e5f0..db270fc98e 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/NshTtlCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/NshTtlCodecTest.java @@ -14,11 +14,11 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; import org.junit.Before; import org.junit.Test; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.NxExpMatchEntryValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshTtlCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshTtlCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.nsh.ttl.grouping.NshTtlValues; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.nsh.ttl.grouping.NshTtlValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.NxExpMatchEntryValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshTtlCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshTtlCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint8; public class NshTtlCodecTest { diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/NsiCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/NsiCodecTest.java index 96b3cbeaae..985054dd79 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/NsiCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/NsiCodecTest.java @@ -14,11 +14,11 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; import org.junit.Before; import org.junit.Test; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.NxExpMatchEntryValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NsiCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NsiCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.nsi.grouping.NsiValues; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.nsi.grouping.NsiValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.NxExpMatchEntryValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NsiCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NsiCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint8; public class NsiCodecTest { @@ -77,12 +77,12 @@ public class NsiCodecTest { assertFalse(buffer.isReadable()); } - private static NxExpMatchEntryValue createMatchEntryValue(Uint8 value, Uint8 mask) { + private static NxExpMatchEntryValue createMatchEntryValue(final Uint8 value, final Uint8 mask) { NsiValues nsiValues = new NsiValuesBuilder().setNsi(value).setMask(mask).build(); return new NsiCaseValueBuilder().setNsiValues(nsiValues).build(); } - private static void writeBuffer(ByteBuf message, Uint8 value, Uint8 mask) { + private static void writeBuffer(final ByteBuf message, final Uint8 value, final Uint8 mask) { message.writeByte(value.intValue()); if (mask != null) { message.writeByte(mask.intValue()); diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/NspCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/NspCodecTest.java index 44b69105bf..e317e0d19b 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/NspCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/NspCodecTest.java @@ -14,11 +14,11 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; import org.junit.Before; import org.junit.Test; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.NxExpMatchEntryValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NspCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NspCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.nsp.grouping.NspValues; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.nsp.grouping.NspValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.NxExpMatchEntryValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NspCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NspCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint32; public class NspCodecTest { diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/PktMarkCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/PktMarkCodecTest.java index 00f8dcfd12..b213283516 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/PktMarkCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/PktMarkCodecTest.java @@ -17,9 +17,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxPktMark; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.PktMarkCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.PktMarkCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.pkt.mark.grouping.PktMarkValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.PktMarkCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.PktMarkCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint32; public class PktMarkCodecTest { diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/Reg0CodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/Reg0CodecTest.java index 20d6bbb5e5..e69eb1528e 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/Reg0CodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/Reg0CodecTest.java @@ -17,9 +17,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxReg0; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.RegCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.RegCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.reg.grouping.RegValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.RegCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.RegCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint32; public class Reg0CodecTest { diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/Reg1CodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/Reg1CodecTest.java index 94c363daa4..6e077dfeac 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/Reg1CodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/Reg1CodecTest.java @@ -17,9 +17,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxReg1; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.RegCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.RegCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.reg.grouping.RegValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.RegCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.RegCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint32; public class Reg1CodecTest { diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/Reg2CodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/Reg2CodecTest.java index bc51caccfa..2b1bb576f3 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/Reg2CodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/Reg2CodecTest.java @@ -17,9 +17,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxReg2; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.RegCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.RegCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.reg.grouping.RegValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.RegCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.RegCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint32; public class Reg2CodecTest { diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/Reg3CodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/Reg3CodecTest.java index 34ed88ef5f..f7d29809c8 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/Reg3CodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/Reg3CodecTest.java @@ -17,9 +17,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxReg3; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.RegCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.RegCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.reg.grouping.RegValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.RegCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.RegCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint32; public class Reg3CodecTest { diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/Reg4CodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/Reg4CodecTest.java index 53a675096d..1b1c2e42e7 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/Reg4CodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/Reg4CodecTest.java @@ -17,9 +17,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxReg4; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.RegCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.RegCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.reg.grouping.RegValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.RegCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.RegCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint32; public class Reg4CodecTest { diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/Reg5CodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/Reg5CodecTest.java index 245b1d0537..7711bdda52 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/Reg5CodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/Reg5CodecTest.java @@ -17,9 +17,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxReg5; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.RegCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.RegCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.reg.grouping.RegValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.RegCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.RegCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint32; public class Reg5CodecTest { diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/Reg6CodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/Reg6CodecTest.java index 2178d2695b..651613b7eb 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/Reg6CodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/Reg6CodecTest.java @@ -17,9 +17,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxReg6; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.RegCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.RegCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.reg.grouping.RegValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.RegCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.RegCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint32; public class Reg6CodecTest { diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/Reg7CodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/Reg7CodecTest.java index 549cdb172a..174b3e1e76 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/Reg7CodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/Reg7CodecTest.java @@ -17,9 +17,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxReg7; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.RegCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.RegCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.reg.grouping.RegValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.RegCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.RegCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint32; public class Reg7CodecTest { diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/TcpDstCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/TcpDstCodecTest.java index e7b7b1c08f..6b0d753ab4 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/TcpDstCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/TcpDstCodecTest.java @@ -18,9 +18,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm0 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfTcpDst; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.TcpDstCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.TcpDstCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.tcp.dst.grouping.TcpDstValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.TcpDstCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.TcpDstCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint16; public class TcpDstCodecTest { diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/TcpSrcCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/TcpSrcCodecTest.java index 9e727351fd..1c74f0efa2 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/TcpSrcCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/TcpSrcCodecTest.java @@ -18,9 +18,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm0 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfTcpSrc; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.TcpSrcCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.TcpSrcCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.tcp.src.grouping.TcpSrcValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.TcpSrcCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.TcpSrcCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint16; public class TcpSrcCodecTest { diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/TunIdCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/TunIdCodecTest.java index ad3694b820..7479e54b94 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/TunIdCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/TunIdCodecTest.java @@ -18,9 +18,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxTunId; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.TunIdCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.TunIdCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.tun.id.grouping.TunIdValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.TunIdCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.TunIdCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint64; public class TunIdCodecTest { diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/TunIpv4DstCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/TunIpv4DstCodecTest.java index 6e72c1e6ad..69c36e6eda 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/TunIpv4DstCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/TunIpv4DstCodecTest.java @@ -17,9 +17,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxTunIpv4Dst; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.TunIpv4DstCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.TunIpv4DstCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.tun.ipv4.dst.grouping.TunIpv4DstValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.TunIpv4DstCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.TunIpv4DstCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint32; public class TunIpv4DstCodecTest { diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/TunIpv4SrcCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/TunIpv4SrcCodecTest.java index fec87dba38..c4494af62e 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/TunIpv4SrcCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/TunIpv4SrcCodecTest.java @@ -17,9 +17,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxTunIpv4Src; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.TunIpv4SrcCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.TunIpv4SrcCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.tun.ipv4.src.grouping.TunIpv4SrcValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.TunIpv4SrcCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.TunIpv4SrcCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint32; public class TunIpv4SrcCodecTest { diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/UdpDstCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/UdpDstCodecTest.java index 780625cb6c..5b8ec214b6 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/UdpDstCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/UdpDstCodecTest.java @@ -18,9 +18,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm0 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfUdpDst; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.UdpDstCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.UdpDstCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.udp.dst.grouping.UdpDstValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.UdpDstCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.UdpDstCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint16; public class UdpDstCodecTest { diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/UdpSrcCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/UdpSrcCodecTest.java index 8dfdc5cbd3..73af6a670b 100644 --- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/UdpSrcCodecTest.java +++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/UdpSrcCodecTest.java @@ -18,9 +18,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm0 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfUdpSrc; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.UdpSrcCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.UdpSrcCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.udp.src.grouping.UdpSrcValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.UdpSrcCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.UdpSrcCaseValueBuilder; import org.opendaylight.yangtools.yang.common.Uint16; public class UdpSrcCodecTest { diff --git a/extension/openflowplugin-extension-api/pom.xml b/extension/openflowplugin-extension-api/pom.xml index fb89e9099d..cbd02e7730 100644 --- a/extension/openflowplugin-extension-api/pom.xml +++ b/extension/openflowplugin-extension-api/pom.xml @@ -38,7 +38,7 @@ model-flow-statistics - org.opendaylight.controller.model + org.opendaylight.openflowplugin.model model-inventory diff --git a/extension/openflowplugin-extension-api/src/main/java/org/opendaylight/openflowplugin/extension/api/ConverterExtensionKey.java b/extension/openflowplugin-extension-api/src/main/java/org/opendaylight/openflowplugin/extension/api/ConverterExtensionKey.java index 88a8384aa0..33cc8b2398 100644 --- a/extension/openflowplugin-extension-api/src/main/java/org/opendaylight/openflowplugin/extension/api/ConverterExtensionKey.java +++ b/extension/openflowplugin-extension-api/src/main/java/org/opendaylight/openflowplugin/extension/api/ConverterExtensionKey.java @@ -8,6 +8,7 @@ package org.opendaylight.openflowplugin.extension.api; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.ExtensionKey; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Lookup and register key for extension converters, basic case expects this to @@ -16,8 +17,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.ge * @param type of key */ public class ConverterExtensionKey extends TypeVersionKey { - - public ConverterExtensionKey(Class type, short ofVersion) { + public ConverterExtensionKey(final Class type, final Uint8 ofVersion) { super(type, ofVersion); } } diff --git a/extension/openflowplugin-extension-api/src/main/java/org/opendaylight/openflowplugin/extension/api/ConverterMessageToOFJava.java b/extension/openflowplugin-extension-api/src/main/java/org/opendaylight/openflowplugin/extension/api/ConverterMessageToOFJava.java index d36ef2c097..c7717ae107 100644 --- a/extension/openflowplugin-extension-api/src/main/java/org/opendaylight/openflowplugin/extension/api/ConverterMessageToOFJava.java +++ b/extension/openflowplugin-extension-api/src/main/java/org/opendaylight/openflowplugin/extension/api/ConverterMessageToOFJava.java @@ -11,6 +11,7 @@ import org.opendaylight.openflowplugin.extension.api.exception.ConversionExcepti import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ExperimenterId; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.experimenter.types.rev151020.experimenter.core.message.ExperimenterMessageOfChoice; import org.opendaylight.yangtools.yang.binding.DataContainer; +import org.opendaylight.yangtools.yang.common.Uint32; /** * Convert message from MD-SAL model into OFJava-API model. @@ -41,5 +42,5 @@ public interface ConverterMessageToOFJava { private final Class type; - private final short ofVersion; + private final Uint8 ofVersion; - public TypeVersionKey(Class type, short ofVersion) { + public TypeVersionKey(final Class type, final Uint8 ofVersion) { this.type = type; - this.ofVersion = ofVersion; + this.ofVersion = requireNonNull(ofVersion); } /** @@ -35,13 +40,13 @@ public class TypeVersionKey { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ofVersion; + result = prime * result + ofVersion.hashCode(); result = prime * result + (type == null ? 0 : type.hashCode()); return result; } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } @@ -52,14 +57,10 @@ public class TypeVersionKey { return false; } TypeVersionKey other = (TypeVersionKey) obj; - if (ofVersion != other.ofVersion) { + if (!ofVersion.equals(other.ofVersion)) { return false; } - if (type == null) { - if (other.type != null) { - return false; - } - } else if (!type.equals(other.type)) { + if (!Objects.equals(type, other.type)) { return false; } return true; diff --git a/extension/openflowplugin-extension-api/src/test/java/org/opendaylight/openflowplugin/extension/api/TypeVersionKeyTest.java b/extension/openflowplugin-extension-api/src/test/java/org/opendaylight/openflowplugin/extension/api/TypeVersionKeyTest.java index 2b78cab4d3..baf6a750cf 100644 --- a/extension/openflowplugin-extension-api/src/test/java/org/opendaylight/openflowplugin/extension/api/TypeVersionKeyTest.java +++ b/extension/openflowplugin-extension-api/src/test/java/org/opendaylight/openflowplugin/extension/api/TypeVersionKeyTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.extension.api; import org.junit.Assert; @@ -28,17 +27,17 @@ public class TypeVersionKeyTest { @Test public void test() { TypeVersionKey key1 = - new TypeVersionKey<>(HelloMessage.class, EncodeConstants.OF13_VERSION_ID); + new TypeVersionKey<>(HelloMessage.class, EncodeConstants.OF_VERSION_1_3); TypeVersionKey key2 = - new TypeVersionKey<>(HelloMessage.class, EncodeConstants.OF13_VERSION_ID); + new TypeVersionKey<>(HelloMessage.class, EncodeConstants.OF_VERSION_1_3); Assert.assertTrue("Wrong equals()", key1.equals(key2)); Assert.assertEquals("Wrong hashCode()", key1.hashCode(), key2.hashCode()); - key2 = new TypeVersionKey<>(HelloMessage.class, EncodeConstants.OF10_VERSION_ID); + key2 = new TypeVersionKey<>(HelloMessage.class, EncodeConstants.OF_VERSION_1_0); Assert.assertFalse("Wrong equals()", key1.equals(key2)); Assert.assertFalse("Wrong hashCode()", key1.hashCode() == key2.hashCode()); - key2 = new TypeVersionKey<>(BarrierReply.class, EncodeConstants.OF13_VERSION_ID); + key2 = new TypeVersionKey<>(BarrierReply.class, EncodeConstants.OF_VERSION_1_3); Assert.assertFalse("Wrong equals()", key1.equals(key2)); Assert.assertFalse("Wrong hashCode()", key1.hashCode() == key2.hashCode()); } diff --git a/extension/openflowplugin-extension-eric/pom.xml b/extension/openflowplugin-extension-eric/pom.xml index 76bfa32ab5..d2343e442d 100644 --- a/extension/openflowplugin-extension-eric/pom.xml +++ b/extension/openflowplugin-extension-eric/pom.xml @@ -35,7 +35,7 @@ model-flow-statistics - org.opendaylight.controller.model + ${project.groupId}.model model-inventory diff --git a/extension/openflowplugin-extension-eric/src/main/java/org/opendaylight/openflowplugin/extension/vendor/eric/EricExtensionProvider.java b/extension/openflowplugin-extension-eric/src/main/java/org/opendaylight/openflowplugin/extension/vendor/eric/EricExtensionProvider.java index b33295e8b0..64902e7137 100644 --- a/extension/openflowplugin-extension-eric/src/main/java/org/opendaylight/openflowplugin/extension/vendor/eric/EricExtensionProvider.java +++ b/extension/openflowplugin-extension-eric/src/main/java/org/opendaylight/openflowplugin/extension/vendor/eric/EricExtensionProvider.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.extension.vendor.eric; import static java.util.Objects.requireNonNull; @@ -42,11 +41,11 @@ public class EricExtensionProvider implements AutoCloseable { this.extensionConverterRegistrator = requireNonNull(provider.getExtensionConverterRegistrator()); registrations = List.of( extensionConverterRegistrator.registerMatchConvertor(new ConverterExtensionKey<>( - Icmpv6NdReservedKey.class, EncodeConstants.OF13_VERSION_ID), ICMPV6_ND_RESERVED_CONVERTOR), + Icmpv6NdReservedKey.class, EncodeConstants.OF_VERSION_1_3), ICMPV6_ND_RESERVED_CONVERTOR), extensionConverterRegistrator.registerMatchConvertor( Icmpv6NDReservedCodec.SERIALIZER_KEY, ICMPV6_ND_RESERVED_CONVERTOR), extensionConverterRegistrator.registerMatchConvertor(new ConverterExtensionKey<>( - Icmpv6NdOptionsTypeKey.class, EncodeConstants.OF13_VERSION_ID), ICMPV6_ND_OPTIONS_TYPE_CONVERTOR), + Icmpv6NdOptionsTypeKey.class, EncodeConstants.OF_VERSION_1_3), ICMPV6_ND_OPTIONS_TYPE_CONVERTOR), extensionConverterRegistrator.registerMatchConvertor( Icmpv6NDOptionsTypeCodec.SERIALIZER_KEY, ICMPV6_ND_OPTIONS_TYPE_CONVERTOR)); } @@ -63,5 +62,4 @@ public class EricExtensionProvider implements AutoCloseable { }); registrations.clear(); } - } \ No newline at end of file diff --git a/extension/openflowplugin-extension-eric/src/main/java/org/opendaylight/openflowplugin/extension/vendor/eric/convertor/match/Icmpv6NDOptionsTypeConvertor.java b/extension/openflowplugin-extension-eric/src/main/java/org/opendaylight/openflowplugin/extension/vendor/eric/convertor/match/Icmpv6NDOptionsTypeConvertor.java index 525a6f6065..99f51b6b25 100644 --- a/extension/openflowplugin-extension-eric/src/main/java/org/opendaylight/openflowplugin/extension/vendor/eric/convertor/match/Icmpv6NDOptionsTypeConvertor.java +++ b/extension/openflowplugin-extension-eric/src/main/java/org/opendaylight/openflowplugin/extension/vendor/eric/convertor/match/Icmpv6NDOptionsTypeConvertor.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.extension.vendor.eric.convertor.match; import java.util.Optional; @@ -18,8 +17,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Eric import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.Icmpv6NdOptionsType; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.icmpv6.nd.options.type.grouping.Icmpv6NdOptionsTypeValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.oxm.container.match.entry.value.Icmpv6NdOptionsTypeCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.oxm.container.match.entry.value.Icmpv6NdOptionsTypeCaseValueBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.ofj.aug.eric.match.options.Icmpv6NdOptionsTypeCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.ofj.aug.eric.match.options.Icmpv6NdOptionsTypeCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.eric.match.rev180730.EricAugMatchNodesNodeTableFlow; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.eric.match.rev180730.EricAugMatchNodesNodeTableFlowBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.eric.match.rev180730.EricAugMatchNotifPacketIn; @@ -46,7 +45,7 @@ public class Icmpv6NDOptionsTypeConvertor implements ConvertorToOFJava { @Override - public ExtensionAugment> convert(MatchEntry input, MatchPath path) { + public ExtensionAugment> convert(final MatchEntry input, final MatchPath path) { Icmpv6NdOptionsTypeCaseValue icmpv6NdOptionsTypeCaseValue = (Icmpv6NdOptionsTypeCaseValue)input.getMatchEntryValue(); return resolveAugmentation(new EricOfIcmpv6NdOptionsTypeBuilder() @@ -55,7 +54,7 @@ public class Icmpv6NDOptionsTypeConvertor implements ConvertorToOFJava matchGrouping = MatchUtil.ICMPV6_ND_OPTIONS_TYPE_RESOLVER .getExtension(extension); if (!matchGrouping.isPresent()) { @@ -71,7 +70,7 @@ public class Icmpv6NDOptionsTypeConvertor implements ConvertorToOFJava> resolveAugmentation( - EricOfIcmpv6NdOptionsType value, MatchPath path, Class key) { + final EricOfIcmpv6NdOptionsType value, final MatchPath path, final Class key) { switch (path) { case FLOWS_STATISTICS_UPDATE_MATCH: return new ExtensionAugment<>(EricAugMatchNodesNodeTableFlow.class, @@ -92,5 +91,4 @@ public class Icmpv6NDOptionsTypeConvertor implements ConvertorToOFJava, ConvertorFromOFJava { @Override - public ExtensionAugment> convert(MatchEntry input, MatchPath path) { + public ExtensionAugment> convert(final MatchEntry input, final MatchPath path) { Icmpv6NdReservedCaseValue icmpv6NdReservedCaseValue = (Icmpv6NdReservedCaseValue) input.getMatchEntryValue(); return resolveAugmentation(new EricOfIcmpv6NdReservedBuilder().setIcmpv6NdReserved( icmpv6NdReservedCaseValue.getIcmpv6NdReservedValues().getIcmpv6NdReserved()).build(), path, @@ -54,7 +53,7 @@ public class Icmpv6NDReservedConvertor implements ConvertorToOFJava, } @Override - public MatchEntry convert(Extension extension) { + public MatchEntry convert(final Extension extension) { Optional matchGrouping = MatchUtil.ICMPV6_ND_RESERVED_RESOLVER.getExtension(extension); if (!matchGrouping.isPresent()) { @@ -68,8 +67,8 @@ public class Icmpv6NDReservedConvertor implements ConvertorToOFJava, icmpv6NdReservedCaseValueBuilder.build()).build(); } - private static ExtensionAugment> resolveAugmentation(EricOfIcmpv6NdReserved value, - MatchPath path, Class key) { + private static ExtensionAugment> resolveAugmentation( + final EricOfIcmpv6NdReserved value, final MatchPath path, final Class key) { switch (path) { case FLOWS_STATISTICS_UPDATE_MATCH: return new ExtensionAugment<>(EricAugMatchNodesNodeTableFlow.class, @@ -90,5 +89,4 @@ public class Icmpv6NDReservedConvertor implements ConvertorToOFJava, throw new CodecPreconditionException(path); } } - } \ No newline at end of file diff --git a/extension/openflowplugin-extension-eric/src/main/java/org/opendaylight/openflowplugin/extension/vendor/eric/convertor/match/MatchUtil.java b/extension/openflowplugin-extension-eric/src/main/java/org/opendaylight/openflowplugin/extension/vendor/eric/convertor/match/MatchUtil.java index 23c43d2d16..9eff658d28 100644 --- a/extension/openflowplugin-extension-eric/src/main/java/org/opendaylight/openflowplugin/extension/vendor/eric/convertor/match/MatchUtil.java +++ b/extension/openflowplugin-extension-eric/src/main/java/org/opendaylight/openflowplugin/extension/vendor/eric/convertor/match/MatchUtil.java @@ -18,6 +18,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.er import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.eric.match.rev180730.EricAugMatchNodesNodeTableFlowApplyActionsSetField; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.eric.match.rev180730.EricAugMatchNotifPacketIn; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.eric.match.rev180730.EricAugMatchNotifSwitchFlowRemoved; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.eric.match.rev180730.EricAugMatchNotifUpdateFlowStats; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.eric.match.rev180730.EricAugMatchPacketInMessage; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.eric.match.rev180730.EricAugMatchRpcAddFlow; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.eric.match.rev180730.EricAugMatchRpcRemoveFlow; @@ -46,6 +47,7 @@ public final class MatchUtil { AUGMENTATIONS_OF_EXTENSION.add(EricAugMatchNodesNodeTableFlow.class); AUGMENTATIONS_OF_EXTENSION.add(EricAugMatchNotifSwitchFlowRemoved.class); AUGMENTATIONS_OF_EXTENSION.add(EricAugMatchNotifPacketIn.class); + AUGMENTATIONS_OF_EXTENSION.add(EricAugMatchNotifUpdateFlowStats.class); AUGMENTATIONS_OF_EXTENSION.add(EricAugMatchPacketInMessage.class); AUGMENTATIONS_OF_EXTENSION.add(EricAugMatchNodesNodeTableFlowApplyActionsSetField.class); ICMPV6_ND_RESERVED_RESOLVER.setAugmentations(AUGMENTATIONS_OF_EXTENSION); @@ -55,9 +57,9 @@ public final class MatchUtil { private MatchUtil() { } - public static MatchEntryBuilder createDefaultMatchEntryBuilder(Class matchField, - Class oxmClass, - MatchEntryValue matchEntryValue) { + public static MatchEntryBuilder createDefaultMatchEntryBuilder(final Class matchField, + final Class oxmClass, + final MatchEntryValue matchEntryValue) { MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder(); matchEntryBuilder.setHasMask(false); matchEntryBuilder.setOxmMatchField(matchField); diff --git a/extension/openflowplugin-extension-eric/src/main/yang/openflowplugin-extension-eric-match.yang b/extension/openflowplugin-extension-eric/src/main/yang/openflowplugin-extension-eric-match.yang index 9cc1255e29..260e7ea150 100644 --- a/extension/openflowplugin-extension-eric/src/main/yang/openflowplugin-extension-eric-match.yang +++ b/extension/openflowplugin-extension-eric/src/main/yang/openflowplugin-extension-eric-match.yang @@ -88,7 +88,7 @@ module openflowplugin-extension-eric-match { uses all-matches-grouping; } augment "/odl-flow-stats:flows-statistics-update/odl-flow-stats:flow-and-statistics-map-list/odl-flow-stats:match/ext-gen:extension-list/ext-gen:extension" { - ext:augment-identifier "eric-aug-match-nodes-node-table-flow"; + ext:augment-identifier "eric-aug-match-notif-update-flow-stats"; uses all-matches-grouping; } augment "/odl-direct-stats:get-flow-statistics/odl-direct-stats:output/odl-direct-stats:flow-and-statistics-map-list/odl-direct-stats:match/ext-gen:extension-list/ext-gen:extension" { @@ -108,4 +108,4 @@ module openflowplugin-extension-eric-match { ext:augment-identifier "eric-aug-match-nodes-node-table-flow-apply-actions-set-field"; uses all-matches-grouping; } -} \ No newline at end of file +} diff --git a/extension/openflowplugin-extension-eric/src/test/java/org/opendaylight/openflowplugin/extension/vendor/eric/convertor/match/Icmpv6NDOptionsTypeConvertorTest.java b/extension/openflowplugin-extension-eric/src/test/java/org/opendaylight/openflowplugin/extension/vendor/eric/convertor/match/Icmpv6NDOptionsTypeConvertorTest.java index 366cf2e89c..95dfac1cc9 100644 --- a/extension/openflowplugin-extension-eric/src/test/java/org/opendaylight/openflowplugin/extension/vendor/eric/convertor/match/Icmpv6NDOptionsTypeConvertorTest.java +++ b/extension/openflowplugin-extension-eric/src/test/java/org/opendaylight/openflowplugin/extension/vendor/eric/convertor/match/Icmpv6NDOptionsTypeConvertorTest.java @@ -23,8 +23,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.acti import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.field._case.SetFieldBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.icmpv6.nd.options.type.grouping.Icmpv6NdOptionsTypeValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.oxm.container.match.entry.value.Icmpv6NdOptionsTypeCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.oxm.container.match.entry.value.Icmpv6NdOptionsTypeCaseValueBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.ofj.aug.eric.match.options.Icmpv6NdOptionsTypeCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.ofj.aug.eric.match.options.Icmpv6NdOptionsTypeCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.eric.match.rev180730.EricAugMatchNodesNodeTableFlow; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.eric.match.rev180730.EricAugMatchNodesNodeTableFlowBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.eric.match.rev180730.EricAugMatchNotifPacketIn; @@ -141,5 +141,4 @@ public class Icmpv6NDOptionsTypeConvertorTest { assertEquals(Icmpv6NdOptionsTypeKey.class, eqGroup.getExtension(setField).get().nonnullExtensionList() .values().iterator().next().getExtensionKey()); } - } diff --git a/extension/openflowplugin-extension-eric/src/test/java/org/opendaylight/openflowplugin/extension/vendor/eric/convertor/match/Icmpv6NDReservedConvertorTest.java b/extension/openflowplugin-extension-eric/src/test/java/org/opendaylight/openflowplugin/extension/vendor/eric/convertor/match/Icmpv6NDReservedConvertorTest.java index 043959232e..37a872fe99 100644 --- a/extension/openflowplugin-extension-eric/src/test/java/org/opendaylight/openflowplugin/extension/vendor/eric/convertor/match/Icmpv6NDReservedConvertorTest.java +++ b/extension/openflowplugin-extension-eric/src/test/java/org/opendaylight/openflowplugin/extension/vendor/eric/convertor/match/Icmpv6NDReservedConvertorTest.java @@ -23,8 +23,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.acti import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.field._case.SetFieldBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.icmpv6.nd.reserved.grouping.Icmpv6NdReservedValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.oxm.container.match.entry.value.Icmpv6NdReservedCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.oxm.container.match.entry.value.Icmpv6NdReservedCaseValueBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.ofj.aug.eric.match.reserved.Icmpv6NdReservedCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.ofj.aug.eric.match.reserved.Icmpv6NdReservedCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.eric.match.rev180730.EricAugMatchNodesNodeTableFlow; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.eric.match.rev180730.EricAugMatchNodesNodeTableFlowBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.eric.match.rev180730.EricAugMatchNotifPacketIn; diff --git a/extension/openflowplugin-extension-nicira/pom.xml b/extension/openflowplugin-extension-nicira/pom.xml index f295c35e81..1f3e706c0f 100644 --- a/extension/openflowplugin-extension-nicira/pom.xml +++ b/extension/openflowplugin-extension-nicira/pom.xml @@ -44,7 +44,7 @@ model-flow-statistics - org.opendaylight.controller.model + ${project.groupId}.model model-inventory diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/NiciraExtensionProvider.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/NiciraExtensionProvider.java index 014dfffc71..3382922836 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/NiciraExtensionProvider.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/NiciraExtensionProvider.java @@ -126,20 +126,20 @@ import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.match.U import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.match.UdpSrcConvertor; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.ActionChoice; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionConntrack; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionCtClear; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionDecNshTtl; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionDecap; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionEncap; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionFinTimeout; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionLearn; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionMultipath; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionOutputReg; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionOutputReg2; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionRegLoad; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionRegLoad2; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionRegMove; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionResubmit; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionConntrack; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionCtClear; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionDecNshTtl; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionDecap; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionEncap; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionFinTimeout; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionLearn; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionMultipath; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionOutputReg; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionOutputReg2; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionRegLoad; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionRegLoad2; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionRegMove; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionResubmit; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.add.flow.input.instructions.instruction.instruction.apply.actions._case.apply.actions.action.action.NxActionConntrackRpcAddFlowApplyActionsCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.add.flow.input.instructions.instruction.instruction.apply.actions._case.apply.actions.action.action.NxActionCtClearRpcAddFlowApplyActionsCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.add.flow.input.instructions.instruction.instruction.apply.actions._case.apply.actions.action.action.NxActionDecNshTtlRpcAddFlowApplyActionsCase; @@ -538,21 +538,21 @@ public class NiciraExtensionProvider implements AutoCloseable { NiciraUtil.createOfJavaKeyFrom(DecNshTtlCodec.SERIALIZER_KEY), DEC_NSH_TTL_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmNxReg0Key.class, EncodeConstants.OF13_VERSION_ID), REG_CONVERTOR)); + new ConverterExtensionKey<>(NxmNxReg0Key.class, EncodeConstants.OF_VERSION_1_3), REG_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmNxReg1Key.class, EncodeConstants.OF13_VERSION_ID), REG_CONVERTOR)); + new ConverterExtensionKey<>(NxmNxReg1Key.class, EncodeConstants.OF_VERSION_1_3), REG_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmNxReg2Key.class, EncodeConstants.OF13_VERSION_ID), REG_CONVERTOR)); + new ConverterExtensionKey<>(NxmNxReg2Key.class, EncodeConstants.OF_VERSION_1_3), REG_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmNxReg3Key.class, EncodeConstants.OF13_VERSION_ID), REG_CONVERTOR)); + new ConverterExtensionKey<>(NxmNxReg3Key.class, EncodeConstants.OF_VERSION_1_3), REG_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmNxReg4Key.class, EncodeConstants.OF13_VERSION_ID), REG_CONVERTOR)); + new ConverterExtensionKey<>(NxmNxReg4Key.class, EncodeConstants.OF_VERSION_1_3), REG_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmNxReg5Key.class, EncodeConstants.OF13_VERSION_ID), REG_CONVERTOR)); + new ConverterExtensionKey<>(NxmNxReg5Key.class, EncodeConstants.OF_VERSION_1_3), REG_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmNxReg6Key.class, EncodeConstants.OF13_VERSION_ID), REG_CONVERTOR)); + new ConverterExtensionKey<>(NxmNxReg6Key.class, EncodeConstants.OF_VERSION_1_3), REG_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmNxReg7Key.class, EncodeConstants.OF13_VERSION_ID), REG_CONVERTOR)); + new ConverterExtensionKey<>(NxmNxReg7Key.class, EncodeConstants.OF_VERSION_1_3), REG_CONVERTOR)); registrations .add(extensionConverterRegistrator.registerMatchConvertor(Reg0Codec.SERIALIZER_KEY, REG_CONVERTOR)); @@ -571,139 +571,139 @@ public class NiciraExtensionProvider implements AutoCloseable { registrations .add(extensionConverterRegistrator.registerMatchConvertor(Reg7Codec.SERIALIZER_KEY, REG_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmNxTunIdKey.class, EncodeConstants.OF13_VERSION_ID), TUN_ID_CONVERTOR)); + new ConverterExtensionKey<>(NxmNxTunIdKey.class, EncodeConstants.OF_VERSION_1_3), TUN_ID_CONVERTOR)); registrations .add(extensionConverterRegistrator.registerMatchConvertor(TunIdCodec.SERIALIZER_KEY, TUN_ID_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmNxArpShaKey.class, EncodeConstants.OF13_VERSION_ID), ARP_SHA_CONVERTOR)); + new ConverterExtensionKey<>(NxmNxArpShaKey.class, EncodeConstants.OF_VERSION_1_3), ARP_SHA_CONVERTOR)); registrations.add( extensionConverterRegistrator.registerMatchConvertor(ArpShaCodec.SERIALIZER_KEY, ARP_SHA_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmNxArpThaKey.class, EncodeConstants.OF13_VERSION_ID), ARP_THA_CONVERTOR)); + new ConverterExtensionKey<>(NxmNxArpThaKey.class, EncodeConstants.OF_VERSION_1_3), ARP_THA_CONVERTOR)); registrations.add( extensionConverterRegistrator.registerMatchConvertor(ArpThaCodec.SERIALIZER_KEY, ARP_THA_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmOfArpOpKey.class, EncodeConstants.OF13_VERSION_ID), ARP_OP_CONVERTOR)); + new ConverterExtensionKey<>(NxmOfArpOpKey.class, EncodeConstants.OF_VERSION_1_3), ARP_OP_CONVERTOR)); registrations .add(extensionConverterRegistrator.registerMatchConvertor(ArpOpCodec.SERIALIZER_KEY, ARP_OP_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmOfArpSpaKey.class, EncodeConstants.OF13_VERSION_ID), ARP_SPA_CONVERTOR)); + new ConverterExtensionKey<>(NxmOfArpSpaKey.class, EncodeConstants.OF_VERSION_1_3), ARP_SPA_CONVERTOR)); registrations.add( extensionConverterRegistrator.registerMatchConvertor(ArpSpaCodec.SERIALIZER_KEY, ARP_SPA_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmOfArpTpaKey.class, EncodeConstants.OF13_VERSION_ID), ARP_TPA_CONVERTOR)); + new ConverterExtensionKey<>(NxmOfArpTpaKey.class, EncodeConstants.OF_VERSION_1_3), ARP_TPA_CONVERTOR)); registrations.add( extensionConverterRegistrator.registerMatchConvertor(ArpTpaCodec.SERIALIZER_KEY, ARP_TPA_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmOfInPortKey.class, EncodeConstants.OF13_VERSION_ID), + new ConverterExtensionKey<>(NxmOfInPortKey.class, EncodeConstants.OF_VERSION_1_3), NXM_IN_PORT_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor(InPortCodec.SERIALIZER_KEY, NXM_IN_PORT_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmOfEthSrcKey.class, EncodeConstants.OF13_VERSION_ID), ETH_SRC_CONVERTOR)); + new ConverterExtensionKey<>(NxmOfEthSrcKey.class, EncodeConstants.OF_VERSION_1_3), ETH_SRC_CONVERTOR)); registrations.add( extensionConverterRegistrator.registerMatchConvertor(EthSrcCodec.SERIALIZER_KEY, ETH_SRC_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmOfEthDstKey.class, EncodeConstants.OF13_VERSION_ID), ETH_DST_CONVERTOR)); + new ConverterExtensionKey<>(NxmOfEthDstKey.class, EncodeConstants.OF_VERSION_1_3), ETH_DST_CONVERTOR)); registrations.add( extensionConverterRegistrator.registerMatchConvertor(EthDstCodec.SERIALIZER_KEY, ETH_DST_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmOfEthTypeKey.class, EncodeConstants.OF13_VERSION_ID), + new ConverterExtensionKey<>(NxmOfEthTypeKey.class, EncodeConstants.OF_VERSION_1_3), ETH_TYPE_CONVERTOR)); registrations.add( extensionConverterRegistrator.registerMatchConvertor(EthTypeCodec.SERIALIZER_KEY, ETH_TYPE_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmNxNspKey.class, EncodeConstants.OF13_VERSION_ID), NSP_CONVERTOR)); + new ConverterExtensionKey<>(NxmNxNspKey.class, EncodeConstants.OF_VERSION_1_3), NSP_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor(NspCodec.SERIALIZER_KEY, NSP_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmNxNsiKey.class, EncodeConstants.OF13_VERSION_ID), NSI_CONVERTOR)); + new ConverterExtensionKey<>(NxmNxNsiKey.class, EncodeConstants.OF_VERSION_1_3), NSI_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor(NsiCodec.SERIALIZER_KEY, NSI_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmNxNshc1Key.class, EncodeConstants.OF13_VERSION_ID), NSC1_CONVERTOR)); + new ConverterExtensionKey<>(NxmNxNshc1Key.class, EncodeConstants.OF_VERSION_1_3), NSC1_CONVERTOR)); registrations .add(extensionConverterRegistrator.registerMatchConvertor(Nshc1Codec.SERIALIZER_KEY, NSC1_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmNxNshc2Key.class, EncodeConstants.OF13_VERSION_ID), NSC2_CONVERTOR)); + new ConverterExtensionKey<>(NxmNxNshc2Key.class, EncodeConstants.OF_VERSION_1_3), NSC2_CONVERTOR)); registrations .add(extensionConverterRegistrator.registerMatchConvertor(Nshc2Codec.SERIALIZER_KEY, NSC2_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmNxNshc3Key.class, EncodeConstants.OF13_VERSION_ID), NSC3_CONVERTOR)); + new ConverterExtensionKey<>(NxmNxNshc3Key.class, EncodeConstants.OF_VERSION_1_3), NSC3_CONVERTOR)); registrations .add(extensionConverterRegistrator.registerMatchConvertor(Nshc3Codec.SERIALIZER_KEY, NSC3_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmNxNshc4Key.class, EncodeConstants.OF13_VERSION_ID), NSC4_CONVERTOR)); + new ConverterExtensionKey<>(NxmNxNshc4Key.class, EncodeConstants.OF_VERSION_1_3), NSC4_CONVERTOR)); registrations .add(extensionConverterRegistrator.registerMatchConvertor(Nshc4Codec.SERIALIZER_KEY, NSC4_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmNxNshFlagsKey.class, EncodeConstants.OF13_VERSION_ID), + new ConverterExtensionKey<>(NxmNxNshFlagsKey.class, EncodeConstants.OF_VERSION_1_3), NSH_FLAGS_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor(NshFlagsCodec.SERIALIZER_KEY, NSH_FLAGS_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmNxNshTtlKey.class, EncodeConstants.OF13_VERSION_ID), + new ConverterExtensionKey<>(NxmNxNshTtlKey.class, EncodeConstants.OF_VERSION_1_3), NSH_TTL_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor(NshTtlCodec.SERIALIZER_KEY, NSH_TTL_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmNxTunIpv4SrcKey.class, EncodeConstants.OF13_VERSION_ID), + new ConverterExtensionKey<>(NxmNxTunIpv4SrcKey.class, EncodeConstants.OF_VERSION_1_3), TUN_IPV4_SRC_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor(TunIpv4SrcCodec.SERIALIZER_KEY, TUN_IPV4_SRC_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmNxTunIpv4DstKey.class, EncodeConstants.OF13_VERSION_ID), + new ConverterExtensionKey<>(NxmNxTunIpv4DstKey.class, EncodeConstants.OF_VERSION_1_3), TUN_IPV4_DST_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor(TunIpv4DstCodec.SERIALIZER_KEY, TUN_IPV4_DST_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmNxNshMdtypeKey.class, EncodeConstants.OF13_VERSION_ID), + new ConverterExtensionKey<>(NxmNxNshMdtypeKey.class, EncodeConstants.OF_VERSION_1_3), NSH_MDTYPE_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor(NshMdtypeCodec.SERIALIZER_KEY, NSH_MDTYPE_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmNxNshNpKey.class, EncodeConstants.OF13_VERSION_ID), NSH_NP_CONVERTOR)); + new ConverterExtensionKey<>(NxmNxNshNpKey.class, EncodeConstants.OF_VERSION_1_3), NSH_NP_CONVERTOR)); registrations.add( extensionConverterRegistrator.registerMatchConvertor(NshNpCodec.SERIALIZER_KEY, NSH_NP_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmOfTcpSrcKey.class, EncodeConstants.OF13_VERSION_ID), TCP_SRC_CONVERTOR)); + new ConverterExtensionKey<>(NxmOfTcpSrcKey.class, EncodeConstants.OF_VERSION_1_3), TCP_SRC_CONVERTOR)); registrations.add( extensionConverterRegistrator.registerMatchConvertor(TcpSrcCodec.SERIALIZER_KEY, TCP_SRC_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmOfTcpDstKey.class, EncodeConstants.OF13_VERSION_ID), TCP_DST_CONVERTOR)); + new ConverterExtensionKey<>(NxmOfTcpDstKey.class, EncodeConstants.OF_VERSION_1_3), TCP_DST_CONVERTOR)); registrations.add( extensionConverterRegistrator.registerMatchConvertor(TcpDstCodec.SERIALIZER_KEY, TCP_DST_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmOfUdpSrcKey.class, EncodeConstants.OF13_VERSION_ID), UDP_SRC_CONVERTOR)); + new ConverterExtensionKey<>(NxmOfUdpSrcKey.class, EncodeConstants.OF_VERSION_1_3), UDP_SRC_CONVERTOR)); registrations.add( extensionConverterRegistrator.registerMatchConvertor(UdpSrcCodec.SERIALIZER_KEY, UDP_SRC_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmOfUdpDstKey.class, EncodeConstants.OF13_VERSION_ID), UDP_DST_CONVERTOR)); + new ConverterExtensionKey<>(NxmOfUdpDstKey.class, EncodeConstants.OF_VERSION_1_3), UDP_DST_CONVERTOR)); registrations.add( extensionConverterRegistrator.registerMatchConvertor(UdpDstCodec.SERIALIZER_KEY, UDP_DST_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmNxCtStateKey.class, EncodeConstants.OF13_VERSION_ID), + new ConverterExtensionKey<>(NxmNxCtStateKey.class, EncodeConstants.OF_VERSION_1_3), CT_STATE_CONVERTOR)); registrations.add( extensionConverterRegistrator.registerMatchConvertor(CtStateCodec.SERIALIZER_KEY, CT_STATE_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmNxCtZoneKey.class, EncodeConstants.OF13_VERSION_ID), CT_ZONE_CONVERTOR)); + new ConverterExtensionKey<>(NxmNxCtZoneKey.class, EncodeConstants.OF_VERSION_1_3), CT_ZONE_CONVERTOR)); registrations.add( extensionConverterRegistrator.registerMatchConvertor(CtZoneCodec.SERIALIZER_KEY, CT_ZONE_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmNxCtMarkKey.class, EncodeConstants.OF13_VERSION_ID), CT_MARK_CONVERTOR)); + new ConverterExtensionKey<>(NxmNxCtMarkKey.class, EncodeConstants.OF_VERSION_1_3), CT_MARK_CONVERTOR)); registrations.add( extensionConverterRegistrator.registerMatchConvertor(CtMarkCodec.SERIALIZER_KEY, CT_MARK_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmNxCtTpSrcKey.class, EncodeConstants.OF13_VERSION_ID), + new ConverterExtensionKey<>(NxmNxCtTpSrcKey.class, EncodeConstants.OF_VERSION_1_3), CT_TP_SRC_CONVERTOR)); registrations.add( extensionConverterRegistrator.registerMatchConvertor(CtTpSrcCodec.SERIALIZER_KEY, CT_TP_SRC_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmNxCtTpDstKey.class, EncodeConstants.OF13_VERSION_ID), + new ConverterExtensionKey<>(NxmNxCtTpDstKey.class, EncodeConstants.OF_VERSION_1_3), CT_TP_DST_CONVERTOR)); registrations.add( extensionConverterRegistrator.registerMatchConvertor(CtTpDstCodec.SERIALIZER_KEY, CT_TP_DST_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmNxPktMarkKey.class, EncodeConstants.OF13_VERSION_ID), + new ConverterExtensionKey<>(NxmNxPktMarkKey.class, EncodeConstants.OF_VERSION_1_3), PKT_MARK_CONVERTOR)); registrations.add( extensionConverterRegistrator.registerMatchConvertor(PktMarkCodec.SERIALIZER_KEY, PKT_MARK_CONVERTOR)); @@ -727,7 +727,7 @@ public class NiciraExtensionProvider implements AutoCloseable { org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action, org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action> actionConvertor) { - TypeVersionKey key = new TypeVersionKey<>(actionCaseType, EncodeConstants.OF13_VERSION_ID); + TypeVersionKey key = new TypeVersionKey<>(actionCaseType, EncodeConstants.OF_VERSION_1_3); registrations.add(extensionConverterRegistrator.registerActionConvertor(key, actionConvertor)); } @@ -735,7 +735,7 @@ public class NiciraExtensionProvider implements AutoCloseable { final ConvertorActionFromOFJava< org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action, ActionPath> actionConvertor) { - ActionSerializerKey key = new ActionSerializerKey<>(EncodeConstants.OF13_VERSION_ID, actionCaseType, + ActionSerializerKey key = new ActionSerializerKey<>(EncodeConstants.OF_VERSION_1_3, actionCaseType, (Uint32) null); registrations.add(extensionConverterRegistrator.registerActionConvertor(key, actionConvertor)); } diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/ConntrackConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/ConntrackConvertor.java index ff07493995..27b65a0e96 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/ConntrackConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/ConntrackConvertor.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.action; import com.google.common.base.Preconditions; @@ -16,8 +15,8 @@ import org.opendaylight.openflowplugin.extension.api.ConvertorActionToOFJava; import org.opendaylight.openflowplugin.extension.api.path.ActionPath; import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPreconditionException; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionConntrack; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionConntrackBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionConntrack; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionConntrackBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.conntrack.grouping.NxActionConntrack; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.conntrack.grouping.NxActionConntrackBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.NxActionConntrackGrouping; diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/CtClearConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/CtClearConvertor.java index 8ff799bd78..cc37eed054 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/CtClearConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/CtClearConvertor.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.action; import com.google.common.base.Preconditions; @@ -14,7 +13,7 @@ import org.opendaylight.openflowplugin.extension.api.ConvertorActionToOFJava; import org.opendaylight.openflowplugin.extension.api.path.ActionPath; import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPreconditionException; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionCtClearBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionCtClearBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.ct.clear.grouping.NxActionCtClearBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.NxActionCtClearGrouping; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.flows.statistics.update.flow.and.statistics.map.list.instructions.instruction.instruction.apply.actions._case.apply.actions.action.action.NxActionCtClearNotifFlowsStatisticsUpdateApplyActionsCaseBuilder; @@ -32,7 +31,7 @@ public class CtClearConvertor implements Action>, ConvertorActionFromOFJava { private static org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action resolveAction( - NxCtClear value, ActionPath path) { + final NxCtClear value, final ActionPath path) { switch (path) { case INVENTORY_FLOWNODE_TABLE_WRITE_ACTIONS: return new NxActionCtClearNodesNodeTableFlowWriteActionsCaseBuilder().setNxCtClear(value).build(); @@ -59,14 +58,14 @@ public class CtClearConvertor implements @Override public org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action convert( - Action input, ActionPath path) { + final Action input, final ActionPath path) { NxCtClearBuilder builder = new NxCtClearBuilder(); return resolveAction(builder.build(), path); } @Override public Action convert( - org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action nxActionArg) { + final org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action nxActionArg) { Preconditions.checkArgument(nxActionArg instanceof NxActionCtClearGrouping); ActionCtClearBuilder builder = new ActionCtClearBuilder(); NxActionCtClearBuilder nxActionCtClearBuilder = new NxActionCtClearBuilder(); diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/DecNshTtlConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/DecNshTtlConvertor.java index 4fd8c3db72..4885d5c75e 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/DecNshTtlConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/DecNshTtlConvertor.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.action; import com.google.common.base.Preconditions; @@ -14,7 +13,7 @@ import org.opendaylight.openflowplugin.extension.api.ConvertorActionToOFJava; import org.opendaylight.openflowplugin.extension.api.path.ActionPath; import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPreconditionException; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionDecNshTtlBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionDecNshTtlBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.dec.nsh.ttl.grouping.NxActionDecNshTtlBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.NxActionDecNshTtlGrouping; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.flows.statistics.update.flow.and.statistics.map.list.instructions.instruction.instruction.apply.actions._case.apply.actions.action.action.NxActionDecNshTtlNotifFlowsStatisticsUpdateApplyActionsCaseBuilder; @@ -34,14 +33,14 @@ public class DecNshTtlConvertor implements @Override public org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action convert( - Action input, ActionPath path) { + final Action input, final ActionPath path) { NxDecNshTtlBuilder builder = new NxDecNshTtlBuilder(); return resolveAction(builder.build(), path); } @Override public Action convert( - org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action actionCase) { + final org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action actionCase) { Preconditions.checkArgument(actionCase instanceof NxActionDecNshTtlGrouping); ActionDecNshTtlBuilder builder = new ActionDecNshTtlBuilder(); NxActionDecNshTtlBuilder nxActionDecNshTtlBuilder = new NxActionDecNshTtlBuilder(); @@ -50,7 +49,7 @@ public class DecNshTtlConvertor implements } private static org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action resolveAction( - NxDecNshTtl value, ActionPath path) { + final NxDecNshTtl value, final ActionPath path) { switch (path) { case INVENTORY_FLOWNODE_TABLE_WRITE_ACTIONS: return new NxActionDecNshTtlNodesNodeTableFlowWriteActionsCaseBuilder().setNxDecNshTtl(value).build(); diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/DecapConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/DecapConvertor.java index 39bc1eb43c..2563521a0a 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/DecapConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/DecapConvertor.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.action; import com.google.common.base.Preconditions; @@ -14,8 +13,8 @@ import org.opendaylight.openflowplugin.extension.api.ConvertorActionToOFJava; import org.opendaylight.openflowplugin.extension.api.path.ActionPath; import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPreconditionException; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionDecap; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionDecapBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionDecap; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionDecapBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.decap.grouping.NxActionDecap; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.decap.grouping.NxActionDecapBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.NxActionDecapGrouping; @@ -35,7 +34,7 @@ public class DecapConvertor implements Action>, ConvertorActionFromOFJava { @Override public org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action convert( - Action input, ActionPath path) { + final Action input, final ActionPath path) { ActionDecap actionDecap = (ActionDecap) input.getActionChoice(); Uint32 packetType = actionDecap.getNxActionDecap().getPacketType(); NxDecap nxDecap = new NxDecapBuilder().setPacketType(packetType).build(); @@ -44,7 +43,7 @@ public class DecapConvertor implements @Override public Action convert( - org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action actionCase) { + final org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action actionCase) { Preconditions.checkArgument(actionCase instanceof NxActionDecapGrouping); NxActionDecapGrouping nxActionDecapGrouping = (NxActionDecapGrouping) actionCase; Uint32 packetType = nxActionDecapGrouping.getNxDecap().getPacketType(); @@ -54,7 +53,7 @@ public class DecapConvertor implements } private static org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action resolveAction( - NxDecap value, ActionPath path) { + final NxDecap value, final ActionPath path) { switch (path) { case INVENTORY_FLOWNODE_TABLE_WRITE_ACTIONS: return new NxActionDecapNodesNodeTableFlowWriteActionsCaseBuilder().setNxDecap(value).build(); diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/EncapConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/EncapConvertor.java index de3c2cfe7f..fdadb30e5c 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/EncapConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/EncapConvertor.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.action; import com.google.common.base.Preconditions; @@ -14,8 +13,8 @@ import org.opendaylight.openflowplugin.extension.api.ConvertorActionToOFJava; import org.opendaylight.openflowplugin.extension.api.path.ActionPath; import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPreconditionException; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionEncap; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionEncapBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionEncap; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionEncapBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.encap.grouping.NxActionEncap; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.encap.grouping.NxActionEncapBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.NxActionEncapGrouping; @@ -35,7 +34,7 @@ public class EncapConvertor implements Action>, ConvertorActionFromOFJava { @Override public org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action convert( - Action input, ActionPath path) { + final Action input, final ActionPath path) { ActionEncap actionEncap = (ActionEncap) input.getActionChoice(); Uint32 packetType = actionEncap.getNxActionEncap().getPacketType(); NxEncap nxEncap = new NxEncapBuilder().setPacketType(packetType).build(); @@ -44,7 +43,7 @@ public class EncapConvertor implements @Override public Action convert( - org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action actionCase) { + final org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action actionCase) { Preconditions.checkArgument(actionCase instanceof NxActionEncapGrouping); NxActionEncapGrouping nxActionEncapGrouping = (NxActionEncapGrouping) actionCase; Uint32 packetType = nxActionEncapGrouping.getNxEncap().getPacketType(); @@ -54,7 +53,7 @@ public class EncapConvertor implements } private static org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action resolveAction( - NxEncap value, ActionPath path) { + final NxEncap value, final ActionPath path) { switch (path) { case INVENTORY_FLOWNODE_TABLE_WRITE_ACTIONS: return new NxActionEncapNodesNodeTableFlowWriteActionsCaseBuilder().setNxEncap(value).build(); diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/FinTimeoutConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/FinTimeoutConvertor.java index 8d439bd166..3a48c93f46 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/FinTimeoutConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/FinTimeoutConvertor.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.action; import com.google.common.base.Preconditions; @@ -14,8 +13,8 @@ import org.opendaylight.openflowplugin.extension.api.ConvertorActionToOFJava; import org.opendaylight.openflowplugin.extension.api.path.ActionPath; import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPreconditionException; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionFinTimeout; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionFinTimeoutBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionFinTimeout; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionFinTimeoutBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.fin.timeout.grouping.NxActionFinTimeout; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.fin.timeout.grouping.NxActionFinTimeoutBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.NxActionFinTimeoutGrouping; diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/LearnConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/LearnConvertor.java index d24fb37382..24ec081785 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/LearnConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/LearnConvertor.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.action; import com.google.common.base.Preconditions; @@ -14,8 +13,8 @@ import org.opendaylight.openflowplugin.extension.api.ConvertorActionToOFJava; import org.opendaylight.openflowplugin.extension.api.path.ActionPath; import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPreconditionException; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionLearn; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionLearnBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionLearn; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionLearnBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.learn.grouping.NxActionLearn; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.learn.grouping.NxActionLearnBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.NxActionLearnGrouping; diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/MultipathConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/MultipathConvertor.java index 4875718723..8eaf68affc 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/MultipathConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/MultipathConvertor.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.action; import com.google.common.base.Preconditions; @@ -14,8 +13,8 @@ import org.opendaylight.openflowplugin.extension.api.ConvertorActionToOFJava; import org.opendaylight.openflowplugin.extension.api.path.ActionPath; import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPreconditionException; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionMultipath; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionMultipathBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionMultipath; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionMultipathBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.multipath.grouping.NxActionMultipath; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.multipath.grouping.NxActionMultipathBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.NxActionMultipathGrouping; diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/OutputReg2Convertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/OutputReg2Convertor.java index 6d9bf76c88..6eac340965 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/OutputReg2Convertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/OutputReg2Convertor.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.action; import com.google.common.base.Preconditions; @@ -13,8 +12,8 @@ import org.opendaylight.openflowplugin.extension.api.ConvertorActionFromOFJava; import org.opendaylight.openflowplugin.extension.api.ConvertorActionToOFJava; import org.opendaylight.openflowplugin.extension.api.path.ActionPath; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionOutputReg2; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionOutputReg2Builder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionOutputReg2; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionOutputReg2Builder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.output.reg2.grouping.NxActionOutputReg2; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.output.reg2.grouping.NxActionOutputReg2Builder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.NxActionOutputRegGrouping; @@ -27,7 +26,7 @@ public class OutputReg2Convertor implements Action>, ConvertorActionFromOFJava { @Override public org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action convert( - Action input, ActionPath path) { + final Action input, final ActionPath path) { NxActionOutputReg2 action = ((ActionOutputReg2) input.getActionChoice()).getNxActionOutputReg2(); SrcBuilder srcBuilder = new SrcBuilder(); srcBuilder.setSrcChoice(FieldChoiceResolver.resolveSrcChoice(action.getSrc())); @@ -40,7 +39,7 @@ public class OutputReg2Convertor implements @Override public Action convert( - org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action actionCase) { + final org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action actionCase) { Preconditions.checkArgument(actionCase instanceof NxActionOutputRegGrouping); NxActionOutputRegGrouping nxAction = (NxActionOutputRegGrouping) actionCase; Src src = nxAction.getNxOutputReg().getSrc(); diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/OutputRegConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/OutputRegConvertor.java index b806b2d9aa..9fc4c3664d 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/OutputRegConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/OutputRegConvertor.java @@ -14,8 +14,8 @@ import org.opendaylight.openflowplugin.extension.api.ConvertorActionToOFJava; import org.opendaylight.openflowplugin.extension.api.path.ActionPath; import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPreconditionException; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionOutputReg; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionOutputRegBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionOutputReg; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionOutputRegBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.output.reg.grouping.NxActionOutputRegBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.NxActionOutputRegGrouping; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.flows.statistics.update.flow.and.statistics.map.list.instructions.instruction.instruction.apply.actions._case.apply.actions.action.action.NxActionOutputRegNotifFlowsStatisticsUpdateApplyActionsCaseBuilder; diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/RegLoad2Convertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/RegLoad2Convertor.java index a48ab21a1a..29e6cb65fb 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/RegLoad2Convertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/RegLoad2Convertor.java @@ -26,12 +26,12 @@ import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.match.N import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.match.Nshc4Convertor; import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.match.NsiConvertor; import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.match.NspConvertor; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.MatchField; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionRegLoad2; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionRegLoad2Builder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionRegLoad2; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionRegLoad2Builder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.reg.load2.grouping.NxActionRegLoad2; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.reg.load2.grouping.NxActionRegLoad2Builder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNshFlags; @@ -43,16 +43,16 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev14 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNsi; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNsp; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.OfjAugNxExpMatch; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.NxExpMatchEntryValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshFlagsCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshTtlCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshcCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NsiCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NspCaseValue; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.nsh.flags.grouping.NshFlagsValues; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.nsh.ttl.grouping.NshTtlValues; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.nsi.grouping.NsiValues; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.nsp.grouping.NspValues; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.NxExpMatchEntryValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshFlagsCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshTtlCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshcCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NsiCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NspCaseValue; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.NxActionRegLoadGrouping; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.DstChoice; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxNshFlagsCase; diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/RegLoadConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/RegLoadConvertor.java index c451dad623..535b669d3c 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/RegLoadConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/RegLoadConvertor.java @@ -14,8 +14,8 @@ import org.opendaylight.openflowplugin.extension.api.ConvertorActionToOFJava; import org.opendaylight.openflowplugin.extension.api.path.ActionPath; import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPreconditionException; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionRegLoad; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionRegLoadBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionRegLoad; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionRegLoadBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.reg.load.grouping.NxActionRegLoadBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.NxActionRegLoadGrouping; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.flows.statistics.update.flow.and.statistics.map.list.instructions.instruction.instruction.apply.actions._case.apply.actions.action.action.NxActionRegLoadNotifFlowsStatisticsUpdateApplyActionsCaseBuilder; diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/RegMoveConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/RegMoveConvertor.java index 223cd94515..22c024ffba 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/RegMoveConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/RegMoveConvertor.java @@ -14,8 +14,8 @@ import org.opendaylight.openflowplugin.extension.api.ConvertorActionToOFJava; import org.opendaylight.openflowplugin.extension.api.path.ActionPath; import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPreconditionException; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionRegMove; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionRegMoveBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionRegMove; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionRegMoveBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.reg.move.grouping.NxActionRegMoveBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.NxActionRegMoveGrouping; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.flows.statistics.update.flow.and.statistics.map.list.instructions.instruction.instruction.apply.actions._case.apply.actions.action.action.NxActionRegMoveNotifFlowsStatisticsUpdateApplyActionsCaseBuilder; diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/ResubmitConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/ResubmitConvertor.java index 6491eaa101..db7701a6b4 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/ResubmitConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/ResubmitConvertor.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.action; import com.google.common.base.Preconditions; @@ -14,8 +13,8 @@ import org.opendaylight.openflowplugin.extension.api.ConvertorActionToOFJava; import org.opendaylight.openflowplugin.extension.api.path.ActionPath; import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPreconditionException; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionResubmit; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionResubmitBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionResubmit; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionResubmitBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.resubmit.grouping.NxActionResubmit; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.resubmit.grouping.NxActionResubmitBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.NxActionResubmitGrouping; diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpOpConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpOpConvertor.java index 7fdfdcac00..da56f5feb3 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpOpConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpOpConvertor.java @@ -16,8 +16,8 @@ import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPr import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm0Class; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.ArpOpCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.ArpOpCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.arp.op.grouping.ArpOpValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.ArpOpCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.ExtensionKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; @@ -45,14 +45,14 @@ import org.opendaylight.yangtools.yang.common.Uint16; public class ArpOpConvertor implements ConvertorToOFJava, ConvertorFromOFJava { @Override - public ExtensionAugment> convert(MatchEntry input, MatchPath path) { + public ExtensionAugment> convert(final MatchEntry input, final MatchPath path) { ArpOpCase arpOpCase = (ArpOpCase) input.getMatchEntryValue(); return resolveAugmentation(new NxmOfArpOpBuilder().setValue(arpOpCase.getArpOp().getOpCode()).build(), path, NxmOfArpOpKey.class); } @Override - public MatchEntry convert(Extension extension) { + public MatchEntry convert(final Extension extension) { Optional matchGrouping = MatchUtil.ARP_OP_RESOLVER.findExtension(extension); if (!matchGrouping.isPresent()) { throw new CodecPreconditionException(extension); @@ -65,8 +65,8 @@ public class ArpOpConvertor implements ConvertorToOFJava, ConvertorF .match.rev140421.NxmOfArpOp.class, Nxm0Class.class, arpOpCaseValueBuilder.build()).build(); } - private static ExtensionAugment> resolveAugmentation(NxmOfArpOp value, - MatchPath path, Class key) { + private static ExtensionAugment> resolveAugmentation(final NxmOfArpOp value, + final MatchPath path, final Class key) { switch (path) { case FLOWS_STATISTICS_UPDATE_MATCH: return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class, diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpShaConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpShaConvertor.java index 7b87ebe4f1..fbbee7a2ff 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpShaConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpShaConvertor.java @@ -16,9 +16,9 @@ import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPr import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1Class; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.ArpShaCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.ArpShaCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.arp.sha.grouping.ArpShaValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.ArpShaCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.ArpShaCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.ExtensionKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; @@ -45,14 +45,14 @@ import org.opendaylight.yangtools.yang.binding.Augmentation; public class ArpShaConvertor implements ConvertorToOFJava, ConvertorFromOFJava { @Override - public ExtensionAugment> convert(MatchEntry input, MatchPath path) { + public ExtensionAugment> convert(final MatchEntry input, final MatchPath path) { ArpShaCaseValue arpShaCaseValue = (ArpShaCaseValue) input.getMatchEntryValue(); return resolveAugmentation(new NxmNxArpShaBuilder().setMacAddress(arpShaCaseValue.getArpShaValues() .getMacAddress()).build(), path, NxmNxArpShaKey.class); } @Override - public MatchEntry convert(Extension extension) { + public MatchEntry convert(final Extension extension) { Optional matchGrouping = MatchUtil.ARP_SHA_RESOLVER.findExtension(extension); if (!matchGrouping.isPresent()) { throw new CodecPreconditionException(extension); @@ -65,8 +65,8 @@ public class ArpShaConvertor implements ConvertorToOFJava, Convertor .match.rev140421.NxmNxArpSha.class, Nxm1Class.class, arpShaCaseValueBuilder.build()).build(); } - private static ExtensionAugment> resolveAugmentation(NxmNxArpSha value, - MatchPath path, Class key) { + private static ExtensionAugment> resolveAugmentation(final NxmNxArpSha value, + final MatchPath path, final Class key) { switch (path) { case FLOWS_STATISTICS_UPDATE_MATCH: return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class, diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpSpaConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpSpaConvertor.java index 6365f50f39..0d6502b9fc 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpSpaConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpSpaConvertor.java @@ -17,9 +17,9 @@ import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.IpConve import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm0Class; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.ArpSpaCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.ArpSpaCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.arp.spa.grouping.ArpSpaValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.ArpSpaCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.ArpSpaCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.ExtensionKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpThaConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpThaConvertor.java index 7d7b4d12b6..e7eee47996 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpThaConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpThaConvertor.java @@ -16,9 +16,9 @@ import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPr import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1Class; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.ArpThaCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.ArpThaCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.arp.tha.grouping.ArpThaValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.ArpThaCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.ArpThaCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.ExtensionKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; @@ -45,7 +45,7 @@ import org.opendaylight.yangtools.yang.binding.Augmentation; public class ArpThaConvertor implements ConvertorToOFJava, ConvertorFromOFJava { @Override - public ExtensionAugment> convert(MatchEntry input, MatchPath path) { + public ExtensionAugment> convert(final MatchEntry input, final MatchPath path) { ArpThaCaseValue arpThaCaseValue = (ArpThaCaseValue) input.getMatchEntryValue(); return resolveAugmentation( new NxmNxArpThaBuilder().setMacAddress(arpThaCaseValue.getArpThaValues().getMacAddress()).build(), path, @@ -53,7 +53,7 @@ public class ArpThaConvertor implements ConvertorToOFJava, Convertor } @Override - public MatchEntry convert(Extension extension) { + public MatchEntry convert(final Extension extension) { Optional matchGrouping = MatchUtil.ARP_THA_RESOLVER.findExtension(extension); if (!matchGrouping.isPresent()) { throw new CodecPreconditionException(extension); @@ -67,8 +67,8 @@ public class ArpThaConvertor implements ConvertorToOFJava, Convertor } - private static ExtensionAugment> resolveAugmentation(NxmNxArpTha value, - MatchPath path, Class key) { + private static ExtensionAugment> resolveAugmentation(final NxmNxArpTha value, + final MatchPath path, final Class key) { switch (path) { case FLOWS_STATISTICS_UPDATE_MATCH: return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class, diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpTpaConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpTpaConvertor.java index bc362dfc0a..b74084d5b3 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpTpaConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpTpaConvertor.java @@ -17,9 +17,9 @@ import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.IpConve import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm0Class; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.ArpTpaCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.ArpTpaCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.arp.tpa.grouping.ArpTpaValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.ArpTpaCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.ArpTpaCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.ExtensionKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/CtMarkConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/CtMarkConvertor.java index 3b5ce00643..13d3b38d9d 100755 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/CtMarkConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/CtMarkConvertor.java @@ -16,9 +16,9 @@ import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPr import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1Class; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.CtMarkCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.CtMarkCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.ct.mark.grouping.CtMarkValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.CtMarkCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.CtMarkCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.ExtensionKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; @@ -48,7 +48,7 @@ public class CtMarkConvertor implements ConvertorToOFJava, Convertor * org.opendaylight.openflowplugin.extension.api.path.AugmentationPath) */ @Override - public ExtensionAugment> convert(MatchEntry input, MatchPath path) { + public ExtensionAugment> convert(final MatchEntry input, final MatchPath path) { CtMarkCaseValue ctMarkCaseValue = (CtMarkCaseValue) input.getMatchEntryValue(); NxmNxCtMarkBuilder ctMarkBuilder = new NxmNxCtMarkBuilder(); ctMarkBuilder.setCtMark(ctMarkCaseValue.getCtMarkValues().getCtMark()); @@ -67,7 +67,7 @@ public class CtMarkConvertor implements ConvertorToOFJava, Convertor * .rev140714.general.extension.grouping.Extension) */ @Override - public MatchEntry convert(Extension extension) { + public MatchEntry convert(final Extension extension) { Optional matchGrouping = MatchUtil.CT_MARK_RESOLVER.findExtension(extension); if (!matchGrouping.isPresent()) { throw new CodecPreconditionException(extension); @@ -85,8 +85,8 @@ public class CtMarkConvertor implements ConvertorToOFJava, Convertor return ofMatch.build(); } - private static ExtensionAugment> resolveAugmentation(NxmNxCtMark value, - MatchPath path, Class key) { + private static ExtensionAugment> resolveAugmentation(final NxmNxCtMark value, + final MatchPath path, final Class key) { switch (path) { case FLOWS_STATISTICS_UPDATE_MATCH: return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class, diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/CtStateConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/CtStateConvertor.java index 5c37adfc78..cf0537b616 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/CtStateConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/CtStateConvertor.java @@ -16,9 +16,9 @@ import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPr import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1Class; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.CtStateCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.CtStateCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.ct.state.grouping.CtStateValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.CtStateCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.CtStateCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.ExtensionKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; @@ -45,7 +45,7 @@ import org.opendaylight.yangtools.yang.binding.Augmentation; public class CtStateConvertor implements ConvertorToOFJava, ConvertorFromOFJava { @Override - public ExtensionAugment> convert(MatchEntry input, MatchPath path) { + public ExtensionAugment> convert(final MatchEntry input, final MatchPath path) { CtStateCaseValue ctStateCaseValue = (CtStateCaseValue) input.getMatchEntryValue(); NxmNxCtStateBuilder ctStateBuilder = new NxmNxCtStateBuilder(); ctStateBuilder.setCtState(ctStateCaseValue.getCtStateValues().getCtState()); @@ -55,7 +55,7 @@ public class CtStateConvertor implements ConvertorToOFJava, Converto } @Override - public MatchEntry convert(Extension extension) { + public MatchEntry convert(final Extension extension) { Optional matchGrouping = MatchUtil.CT_STATE_RESOLVER.findExtension(extension); if (!matchGrouping.isPresent()) { throw new CodecPreconditionException(extension); @@ -65,16 +65,15 @@ public class CtStateConvertor implements ConvertorToOFJava, Converto ctStateValuesBuilder.setCtState(matchGrouping.get().getNxmNxCtState().getCtState()); ctStateValuesBuilder.setMask(matchGrouping.get().getNxmNxCtState().getMask()); ctStateCaseValueBuilder.setCtStateValues(ctStateValuesBuilder.build()); - MatchEntryBuilder ofMatch = MatchUtil - .createDefaultMatchEntryBuilder(org.opendaylight.yang.gen.v1.urn - .opendaylight.openflowjava.nx.match.rev140421.NxmNxCtState.class, - Nxm1Class.class, ctStateCaseValueBuilder.build()); + MatchEntryBuilder ofMatch = MatchUtil.createDefaultMatchEntryBuilder( + org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxCtState.class, + Nxm1Class.class, ctStateCaseValueBuilder.build()); ofMatch.setHasMask(true); return ofMatch.build(); } - private static ExtensionAugment> resolveAugmentation(NxmNxCtState value, - MatchPath path, Class key) { + private static ExtensionAugment> resolveAugmentation(final NxmNxCtState value, + final MatchPath path, final Class key) { switch (path) { case FLOWS_STATISTICS_UPDATE_MATCH: return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class, diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/CtTpDstConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/CtTpDstConvertor.java index 8c6bcfea90..5893957039 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/CtTpDstConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/CtTpDstConvertor.java @@ -16,9 +16,9 @@ import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPr import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1Class; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.CtTpDstCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.CtTpDstCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.ct.tp.dst.grouping.CtTpDstValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.CtTpDstCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.CtTpDstCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.ExtensionKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; @@ -40,7 +40,7 @@ import org.opendaylight.yangtools.yang.binding.Augmentation; public class CtTpDstConvertor implements ConvertorToOFJava, ConvertorFromOFJava { @Override - public MatchEntry convert(Extension extension) { + public MatchEntry convert(final Extension extension) { Optional matchGrouping = MatchUtil.CT_TP_DST_RESOLVER.findExtension(extension); if (!matchGrouping.isPresent()) { throw new CodecPreconditionException(extension); @@ -57,7 +57,7 @@ public class CtTpDstConvertor implements ConvertorToOFJava, Converto } @Override - public ExtensionAugment> convert(MatchEntry input, MatchPath path) { + public ExtensionAugment> convert(final MatchEntry input, final MatchPath path) { CtTpDstCaseValue ctTpSrcCaseValue = (CtTpDstCaseValue) input.getMatchEntryValue(); NxmNxCtTpDstBuilder ctTpSrcBuilder = new NxmNxCtTpDstBuilder(); ctTpSrcBuilder.setCtTpDst(ctTpSrcCaseValue.getCtTpDstValues().getCtTpDst()); @@ -65,8 +65,8 @@ public class CtTpDstConvertor implements ConvertorToOFJava, Converto NxmNxCtTpDstKey.class); } - private static ExtensionAugment> resolveAugmentation(NxmNxCtTpDst value, - MatchPath path, Class key) { + private static ExtensionAugment> resolveAugmentation(final NxmNxCtTpDst value, + final MatchPath path, final Class key) { switch (path) { case FLOWS_STATISTICS_UPDATE_MATCH: return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class, diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/CtTpSrcConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/CtTpSrcConvertor.java index dfde71063c..54336df588 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/CtTpSrcConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/CtTpSrcConvertor.java @@ -16,9 +16,9 @@ import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPr import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1Class; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.CtTpSrcCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.CtTpSrcCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.ct.tp.src.grouping.CtTpSrcValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.CtTpSrcCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.CtTpSrcCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.ExtensionKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; @@ -40,7 +40,7 @@ import org.opendaylight.yangtools.yang.binding.Augmentation; public class CtTpSrcConvertor implements ConvertorToOFJava, ConvertorFromOFJava { @Override - public MatchEntry convert(Extension extension) { + public MatchEntry convert(final Extension extension) { Optional matchGrouping = MatchUtil.CT_TP_SRC_RESOLVER.findExtension(extension); if (!matchGrouping.isPresent()) { throw new CodecPreconditionException(extension); @@ -57,7 +57,7 @@ public class CtTpSrcConvertor implements ConvertorToOFJava, Converto } @Override - public ExtensionAugment> convert(MatchEntry input, MatchPath path) { + public ExtensionAugment> convert(final MatchEntry input, final MatchPath path) { CtTpSrcCaseValue ctTpSrcCaseValue = (CtTpSrcCaseValue) input.getMatchEntryValue(); NxmNxCtTpSrcBuilder ctTpSrcBuilder = new NxmNxCtTpSrcBuilder(); ctTpSrcBuilder.setCtTpSrc(ctTpSrcCaseValue.getCtTpSrcValues().getCtTpSrc()); @@ -65,8 +65,8 @@ public class CtTpSrcConvertor implements ConvertorToOFJava, Converto NxmNxCtTpSrcKey.class); } - private static ExtensionAugment> resolveAugmentation(NxmNxCtTpSrc value, - MatchPath path, Class key) { + private static ExtensionAugment> resolveAugmentation(final NxmNxCtTpSrc value, + final MatchPath path, final Class key) { switch (path) { case FLOWS_STATISTICS_UPDATE_MATCH: return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class, diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/CtZoneConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/CtZoneConvertor.java index cc64c36034..7784dfd2f6 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/CtZoneConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/CtZoneConvertor.java @@ -16,9 +16,9 @@ import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPr import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1Class; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.CtZoneCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.CtZoneCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.ct.zone.grouping.CtZoneValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.CtZoneCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.CtZoneCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.ExtensionKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; @@ -45,7 +45,7 @@ import org.opendaylight.yangtools.yang.binding.Augmentation; public class CtZoneConvertor implements ConvertorToOFJava, ConvertorFromOFJava { @Override - public ExtensionAugment> convert(MatchEntry input, MatchPath path) { + public ExtensionAugment> convert(final MatchEntry input, final MatchPath path) { CtZoneCaseValue ctZoneCaseValue = (CtZoneCaseValue) input.getMatchEntryValue(); NxmNxCtZoneBuilder ctZoneBuilder = new NxmNxCtZoneBuilder(); ctZoneBuilder.setCtZone(ctZoneCaseValue.getCtZoneValues().getCtZone()); @@ -54,7 +54,7 @@ public class CtZoneConvertor implements ConvertorToOFJava, Convertor } @Override - public MatchEntry convert(Extension extension) { + public MatchEntry convert(final Extension extension) { Optional matchGrouping = MatchUtil.CT_ZONE_RESOLVER.findExtension(extension); if (!matchGrouping.isPresent()) { throw new CodecPreconditionException(extension); @@ -70,8 +70,8 @@ public class CtZoneConvertor implements ConvertorToOFJava, Convertor return ofMatch.build(); } - private static ExtensionAugment> resolveAugmentation(NxmNxCtZone value, - MatchPath path, Class key) { + private static ExtensionAugment> resolveAugmentation(final NxmNxCtZone value, + final MatchPath path, final Class key) { switch (path) { case FLOWS_STATISTICS_UPDATE_MATCH: return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class, diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/EthDstConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/EthDstConvertor.java index 6b7f4c2409..6860f80314 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/EthDstConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/EthDstConvertor.java @@ -16,9 +16,9 @@ import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPr import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm0Class; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.EthDstCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.EthDstCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.eth.dst.grouping.EthDstValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.EthDstCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.EthDstCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.ExtensionKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; @@ -45,7 +45,7 @@ import org.opendaylight.yangtools.yang.binding.Augmentation; public class EthDstConvertor implements ConvertorToOFJava, ConvertorFromOFJava { @Override - public ExtensionAugment> convert(MatchEntry input, MatchPath path) { + public ExtensionAugment> convert(final MatchEntry input, final MatchPath path) { EthDstCaseValue ethDstCaseValue = (EthDstCaseValue) input.getMatchEntryValue(); return resolveAugmentation( new NxmOfEthDstBuilder().setMacAddress(ethDstCaseValue.getEthDstValues().getMacAddress()).build(), path, @@ -53,7 +53,7 @@ public class EthDstConvertor implements ConvertorToOFJava, Convertor } @Override - public MatchEntry convert(Extension extension) { + public MatchEntry convert(final Extension extension) { Optional matchGrouping = MatchUtil.ETH_DST_RESOLVER.findExtension(extension); if (!matchGrouping.isPresent()) { throw new CodecPreconditionException(extension); @@ -67,8 +67,8 @@ public class EthDstConvertor implements ConvertorToOFJava, Convertor Nxm0Class.class, ethDstCaseValueBuilder.build()).build(); } - private static ExtensionAugment> resolveAugmentation(NxmOfEthDst value, - MatchPath path, Class key) { + private static ExtensionAugment> resolveAugmentation(final NxmOfEthDst value, + final MatchPath path, final Class key) { switch (path) { case FLOWS_STATISTICS_UPDATE_MATCH: return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class, diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/EthSrcConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/EthSrcConvertor.java index 2390dabef1..4d6b7c0385 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/EthSrcConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/EthSrcConvertor.java @@ -16,9 +16,9 @@ import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPr import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm0Class; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.EthSrcCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.EthSrcCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.eth.src.grouping.EthSrcValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.EthSrcCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.EthSrcCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.ExtensionKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; @@ -45,7 +45,7 @@ import org.opendaylight.yangtools.yang.binding.Augmentation; public class EthSrcConvertor implements ConvertorToOFJava, ConvertorFromOFJava { @Override - public ExtensionAugment> convert(MatchEntry input, MatchPath path) { + public ExtensionAugment> convert(final MatchEntry input, final MatchPath path) { EthSrcCaseValue ethSrcCaseValue = (EthSrcCaseValue) input.getMatchEntryValue(); return resolveAugmentation( new NxmOfEthSrcBuilder().setMacAddress(ethSrcCaseValue.getEthSrcValues().getMacAddress()).build(), path, @@ -53,7 +53,7 @@ public class EthSrcConvertor implements ConvertorToOFJava, Convertor } @Override - public MatchEntry convert(Extension extension) { + public MatchEntry convert(final Extension extension) { Optional matchGrouping = MatchUtil.ETH_SRC_RESOLVER.findExtension(extension); if (!matchGrouping.isPresent()) { throw new CodecPreconditionException(extension); @@ -67,8 +67,8 @@ public class EthSrcConvertor implements ConvertorToOFJava, Convertor Nxm0Class.class, ethSrcCaseValueBuilder.build()).build(); } - private static ExtensionAugment> resolveAugmentation(NxmOfEthSrc value, - MatchPath path, Class key) { + private static ExtensionAugment> resolveAugmentation(final NxmOfEthSrc value, + final MatchPath path, final Class key) { switch (path) { case FLOWS_STATISTICS_UPDATE_MATCH: return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class, diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/EthTypeConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/EthTypeConvertor.java index 1febe9a100..1917e0d273 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/EthTypeConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/EthTypeConvertor.java @@ -15,9 +15,9 @@ import org.opendaylight.openflowplugin.extension.api.path.MatchPath; import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPreconditionException; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm0Class; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.EthTypeCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.EthTypeCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.eth.type.grouping.EthTypeValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.EthTypeCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.EthTypeCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.ExtensionKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; @@ -45,7 +45,7 @@ import org.opendaylight.yangtools.yang.common.Uint16; public class EthTypeConvertor implements ConvertorToOFJava, ConvertorFromOFJava { @Override - public ExtensionAugment> convert(MatchEntry input, MatchPath path) { + public ExtensionAugment> convert(final MatchEntry input, final MatchPath path) { EthTypeCaseValue ethTypeCaseValue = (EthTypeCaseValue) input.getMatchEntryValue(); return resolveAugmentation( new NxmOfEthTypeBuilder().setValue(ethTypeCaseValue.getEthTypeValues().getValue()).build(), path, @@ -53,7 +53,7 @@ public class EthTypeConvertor implements ConvertorToOFJava, Converto } @Override - public MatchEntry convert(Extension extension) { + public MatchEntry convert(final Extension extension) { Optional matchGrouping = MatchUtil.ETH_TYPE_RESOLVER.findExtension(extension); if (!matchGrouping.isPresent()) { throw new CodecPreconditionException(extension); @@ -68,8 +68,8 @@ public class EthTypeConvertor implements ConvertorToOFJava, Converto } - private static ExtensionAugment> resolveAugmentation(NxmOfEthType value, - MatchPath path, Class key) { + private static ExtensionAugment> resolveAugmentation(final NxmOfEthType value, + final MatchPath path, final Class key) { switch (path) { case FLOWS_STATISTICS_UPDATE_MATCH: return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class, diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/MatchUtil.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/MatchUtil.java index caa005feff..304d12ba1a 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/MatchUtil.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/MatchUtil.java @@ -12,9 +12,9 @@ import org.opendaylight.openflowplugin.extension.api.AugmentationGroupingResolve import org.opendaylight.openflowplugin.extension.api.AugmentationGroupingResolver.Factory; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCase; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.experimenter.id._case.ExperimenterBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.experimenter.id._case.ExperimenterBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ExperimenterId; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.ExperimenterClass; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.MatchField; @@ -22,11 +22,12 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmC import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.MatchEntryValue; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.OfjAugNxExpMatchBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.NxExpMatchEntryValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.NxExpMatchEntryValue; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNotifPacketIn; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNotifSwitchFlowRemoved; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNotifUpdateFlowStats; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchPacketInMessage; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchRpcAddFlow; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchRpcRemoveFlow; @@ -117,7 +118,7 @@ public final class MatchUtil { NxAugMatchNodesNodeTableFlow.class, NxAugMatchNotifSwitchFlowRemoved.class, NxAugMatchNotifPacketIn.class, - // NxAugMatchNotifUpdateFlowStats.class, + NxAugMatchNotifUpdateFlowStats.class, NxAugMatchPacketInMessage.class)); REG_RESOLVER = factory.createResolver(NxmNxRegGrouping.class); diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NshFlagsConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NshFlagsConvertor.java index 087a38ffc4..be3cb23525 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NshFlagsConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NshFlagsConvertor.java @@ -14,14 +14,14 @@ import org.opendaylight.openflowplugin.extension.api.ConvertorToOFJava; import org.opendaylight.openflowplugin.extension.api.ExtensionAugment; import org.opendaylight.openflowplugin.extension.api.path.MatchPath; import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPreconditionException; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.OfjAugNxExpMatch; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.NxExpMatchEntryValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshFlagsCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshFlagsCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.nsh.flags.grouping.NshFlagsValues; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.nsh.flags.grouping.NshFlagsValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.NxExpMatchEntryValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshFlagsCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshFlagsCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.ExtensionKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; @@ -44,7 +44,7 @@ import org.opendaylight.yangtools.yang.common.Uint8; public class NshFlagsConvertor implements ConvertorToOFJava, ConvertorFromOFJava { @Override - public ExtensionAugment> convert(MatchEntry input, MatchPath path) { + public ExtensionAugment> convert(final MatchEntry input, final MatchPath path) { ExperimenterIdCase experimenterIdCase = (ExperimenterIdCase) input.getMatchEntryValue(); OfjAugNxExpMatch ofjAugNxExpMatch = experimenterIdCase.augmentation(OfjAugNxExpMatch.class); NshFlagsCaseValue nshFlagsCaseValue = (NshFlagsCaseValue) ofjAugNxExpMatch.getNxExpMatchEntryValue(); @@ -60,7 +60,7 @@ public class NshFlagsConvertor implements ConvertorToOFJava, Convert } @Override - public MatchEntry convert(Extension extension) { + public MatchEntry convert(final Extension extension) { Optional matchGrouping = MatchUtil.NSH_FLAGS_RESOLVER.findExtension(extension); if (!matchGrouping.isPresent()) { throw new CodecPreconditionException(extension); @@ -70,7 +70,7 @@ public class NshFlagsConvertor implements ConvertorToOFJava, Convert return buildMatchEntry(flags, mask); } - public static MatchEntry buildMatchEntry(Uint8 flags, Uint8 mask) { + public static MatchEntry buildMatchEntry(final Uint8 flags, final Uint8 mask) { NshFlagsValues nshFlagsValues = new NshFlagsValuesBuilder().setNshFlags(flags).setMask(mask).build(); NxExpMatchEntryValue value = new NshFlagsCaseValueBuilder().setNshFlagsValues(nshFlagsValues).build(); return MatchUtil.createExperimenterMatchEntryBuilder( @@ -80,8 +80,8 @@ public class NshFlagsConvertor implements ConvertorToOFJava, Convert } private static ExtensionAugment> resolveAugmentation( - NxmNxNshFlags value, - MatchPath path, Class key) { + final NxmNxNshFlags value, + final MatchPath path, final Class key) { switch (path) { case FLOWS_STATISTICS_UPDATE_MATCH: return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class, diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NshMdtypeConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NshMdtypeConvertor.java index a62ddd99df..f0bc5f7d94 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NshMdtypeConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NshMdtypeConvertor.java @@ -14,14 +14,14 @@ import org.opendaylight.openflowplugin.extension.api.ConvertorToOFJava; import org.opendaylight.openflowplugin.extension.api.ExtensionAugment; import org.opendaylight.openflowplugin.extension.api.path.MatchPath; import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPreconditionException; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.OfjAugNxExpMatch; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.NxExpMatchEntryValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshMdtypeCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshMdtypeCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.nsh.mdtype.grouping.NshMdtypeValues; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.nsh.mdtype.grouping.NshMdtypeValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.NxExpMatchEntryValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshMdtypeCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshMdtypeCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.ExtensionKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; @@ -44,7 +44,7 @@ import org.opendaylight.yangtools.yang.common.Uint8; public class NshMdtypeConvertor implements ConvertorToOFJava, ConvertorFromOFJava { @Override - public ExtensionAugment> convert(MatchEntry input, MatchPath path) { + public ExtensionAugment> convert(final MatchEntry input, final MatchPath path) { ExperimenterIdCase experimenterIdCase = (ExperimenterIdCase) input.getMatchEntryValue(); OfjAugNxExpMatch ofjAugNxExpMatch = experimenterIdCase.augmentation(OfjAugNxExpMatch.class); NshMdtypeCaseValue nshMdtypeCaseValue = (NshMdtypeCaseValue) ofjAugNxExpMatch.getNxExpMatchEntryValue(); @@ -59,7 +59,7 @@ public class NshMdtypeConvertor implements ConvertorToOFJava, Conver } @Override - public MatchEntry convert(Extension extension) { + public MatchEntry convert(final Extension extension) { Optional matchGrouping = MatchUtil.NSH_MDTYPE_RESOLVER.findExtension(extension); if (!matchGrouping.isPresent()) { throw new CodecPreconditionException(extension); @@ -68,7 +68,7 @@ public class NshMdtypeConvertor implements ConvertorToOFJava, Conver return buildMatchEntry(value, null); } - public static MatchEntry buildMatchEntry(Uint8 value, Uint8 mask) { + public static MatchEntry buildMatchEntry(final Uint8 value, final Uint8 mask) { NshMdtypeValues nshMdtypeValues = new NshMdtypeValuesBuilder().setValue(value).build(); NxExpMatchEntryValue entryValue = new NshMdtypeCaseValueBuilder().setNshMdtypeValues(nshMdtypeValues).build(); return MatchUtil.createExperimenterMatchEntryBuilder( @@ -78,8 +78,8 @@ public class NshMdtypeConvertor implements ConvertorToOFJava, Conver } private static ExtensionAugment> resolveAugmentation( - NxmNxNshMdtype value, - MatchPath path, Class key) { + final NxmNxNshMdtype value, + final MatchPath path, final Class key) { switch (path) { case FLOWS_STATISTICS_UPDATE_MATCH: return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class, diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NshNpConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NshNpConvertor.java index 7d0a59272e..5ddf171ee2 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NshNpConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NshNpConvertor.java @@ -14,14 +14,14 @@ import org.opendaylight.openflowplugin.extension.api.ConvertorToOFJava; import org.opendaylight.openflowplugin.extension.api.ExtensionAugment; import org.opendaylight.openflowplugin.extension.api.path.MatchPath; import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPreconditionException; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.OfjAugNxExpMatch; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.NxExpMatchEntryValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshNpCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshNpCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.nsh.np.grouping.NshNpValues; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.nsh.np.grouping.NshNpValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.NxExpMatchEntryValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshNpCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshNpCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.ExtensionKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; @@ -44,7 +44,7 @@ import org.opendaylight.yangtools.yang.common.Uint8; public class NshNpConvertor implements ConvertorToOFJava, ConvertorFromOFJava { @Override - public ExtensionAugment> convert(MatchEntry input, MatchPath path) { + public ExtensionAugment> convert(final MatchEntry input, final MatchPath path) { ExperimenterIdCase experimenterIdCase = (ExperimenterIdCase) input.getMatchEntryValue(); OfjAugNxExpMatch ofjAugNxExpMatch = experimenterIdCase.augmentation(OfjAugNxExpMatch.class); NshNpCaseValue nshNpCaseValue = (NshNpCaseValue) ofjAugNxExpMatch.getNxExpMatchEntryValue(); @@ -59,7 +59,7 @@ public class NshNpConvertor implements ConvertorToOFJava, ConvertorF } @Override - public MatchEntry convert(Extension extension) { + public MatchEntry convert(final Extension extension) { Optional matchGrouping = MatchUtil.NSH_NP_RESOLVER.findExtension(extension); if (!matchGrouping.isPresent()) { throw new CodecPreconditionException(extension); @@ -68,7 +68,7 @@ public class NshNpConvertor implements ConvertorToOFJava, ConvertorF return buildMatchEntry(value, null); } - public static MatchEntry buildMatchEntry(Uint8 value, Uint8 mask) { + public static MatchEntry buildMatchEntry(final Uint8 value, final Uint8 mask) { NshNpValues nshNpValues = new NshNpValuesBuilder().setValue(value).build(); NxExpMatchEntryValue entryValue = new NshNpCaseValueBuilder().setNshNpValues(nshNpValues).build(); return MatchUtil.createExperimenterMatchEntryBuilder( @@ -78,8 +78,8 @@ public class NshNpConvertor implements ConvertorToOFJava, ConvertorF } private static ExtensionAugment> resolveAugmentation( - NxmNxNshNp value, - MatchPath path, Class key) { + final NxmNxNshNp value, + final MatchPath path, final Class key) { switch (path) { case FLOWS_STATISTICS_UPDATE_MATCH: return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class, diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NshTtlConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NshTtlConvertor.java index 276ade7e19..e12ca21cb1 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NshTtlConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NshTtlConvertor.java @@ -14,14 +14,14 @@ import org.opendaylight.openflowplugin.extension.api.ConvertorToOFJava; import org.opendaylight.openflowplugin.extension.api.ExtensionAugment; import org.opendaylight.openflowplugin.extension.api.path.MatchPath; import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPreconditionException; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.OfjAugNxExpMatch; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.NxExpMatchEntryValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshTtlCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshTtlCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.nsh.ttl.grouping.NshTtlValues; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.nsh.ttl.grouping.NshTtlValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.NxExpMatchEntryValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshTtlCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshTtlCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.ExtensionKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; @@ -43,7 +43,7 @@ import org.opendaylight.yangtools.yang.common.Uint8; public class NshTtlConvertor implements ConvertorToOFJava, ConvertorFromOFJava { @Override - public ExtensionAugment> convert(MatchEntry input, MatchPath path) { + public ExtensionAugment> convert(final MatchEntry input, final MatchPath path) { ExperimenterIdCase experimenterIdCase = (ExperimenterIdCase) input.getMatchEntryValue(); OfjAugNxExpMatch ofjAugNxExpMatch = experimenterIdCase.augmentation(OfjAugNxExpMatch.class); NshTtlCaseValue nshTtlCaseValue = (NshTtlCaseValue) ofjAugNxExpMatch.getNxExpMatchEntryValue(); @@ -57,7 +57,7 @@ public class NshTtlConvertor implements ConvertorToOFJava, Convertor } @Override - public MatchEntry convert(Extension extension) { + public MatchEntry convert(final Extension extension) { Optional matchGrouping = MatchUtil.NSH_TTL_RESOLVER.findExtension(extension); if (!matchGrouping.isPresent()) { throw new CodecPreconditionException(extension); @@ -65,7 +65,7 @@ public class NshTtlConvertor implements ConvertorToOFJava, Convertor return buildMatchEntry(matchGrouping.get().getNxmNxNshTtl().getNshTtl(), null); } - public static MatchEntry buildMatchEntry(Uint8 flags, Uint8 mask) { + public static MatchEntry buildMatchEntry(final Uint8 flags, final Uint8 mask) { NshTtlValues nshTtlValues = new NshTtlValuesBuilder().setNshTtl(flags).setMask(mask).build(); NxExpMatchEntryValue value = new NshTtlCaseValueBuilder().setNshTtlValues(nshTtlValues).build(); return MatchUtil.createExperimenterMatchEntryBuilder( @@ -75,8 +75,8 @@ public class NshTtlConvertor implements ConvertorToOFJava, Convertor } private static ExtensionAugment> resolveAugmentation( - NxmNxNshTtl value, - MatchPath path, Class key) { + final NxmNxNshTtl value, + final MatchPath path, final Class key) { switch (path) { case FLOWS_STATISTICS_UPDATE_MATCH: return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class, diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/Nshc1Convertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/Nshc1Convertor.java index ffb8ef47ae..26d676a84d 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/Nshc1Convertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/Nshc1Convertor.java @@ -14,11 +14,11 @@ import org.opendaylight.openflowplugin.extension.api.ConvertorToOFJava; import org.opendaylight.openflowplugin.extension.api.ExtensionAugment; import org.opendaylight.openflowplugin.extension.api.path.MatchPath; import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPreconditionException; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.OfjAugNxExpMatch; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshcCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshcCaseValueBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshcCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshcCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.ExtensionKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; @@ -73,8 +73,7 @@ public class Nshc1Convertor implements ConvertorToOFJava, ConvertorF } private static ExtensionAugment> resolveAugmentation( - final NxmNxNshc1 value, - final MatchPath path, final Class key) { + final NxmNxNshc1 value, final MatchPath path, final Class key) { switch (path) { case FLOWS_STATISTICS_UPDATE_MATCH: return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class, diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/Nshc2Convertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/Nshc2Convertor.java index af2bc41e8f..fc05d8a2c4 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/Nshc2Convertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/Nshc2Convertor.java @@ -14,11 +14,11 @@ import org.opendaylight.openflowplugin.extension.api.ConvertorToOFJava; import org.opendaylight.openflowplugin.extension.api.ExtensionAugment; import org.opendaylight.openflowplugin.extension.api.path.MatchPath; import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPreconditionException; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.OfjAugNxExpMatch; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshcCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshcCaseValueBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshcCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshcCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.ExtensionKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; @@ -41,7 +41,7 @@ import org.opendaylight.yangtools.yang.common.Uint32; public class Nshc2Convertor implements ConvertorToOFJava, ConvertorFromOFJava { @Override - public ExtensionAugment> convert(MatchEntry input, MatchPath path) { + public ExtensionAugment> convert(final MatchEntry input, final MatchPath path) { ExperimenterIdCase experimenterIdCase = (ExperimenterIdCase) input.getMatchEntryValue(); OfjAugNxExpMatch ofjAugNxExpMatch = experimenterIdCase.augmentation(OfjAugNxExpMatch.class); NshcCaseValue nshcCaseValue = (NshcCaseValue) ofjAugNxExpMatch.getNxExpMatchEntryValue(); @@ -53,7 +53,7 @@ public class Nshc2Convertor implements ConvertorToOFJava, ConvertorF } @Override - public MatchEntry convert(Extension extension) { + public MatchEntry convert(final Extension extension) { Optional matchGrouping = MatchUtil.NSC2_RESOLVER.findExtension(extension); if (!matchGrouping.isPresent()) { throw new CodecPreconditionException(extension); @@ -64,7 +64,7 @@ public class Nshc2Convertor implements ConvertorToOFJava, ConvertorF return matchEntry; } - public static MatchEntry buildMatchEntry(Uint32 value, Uint32 mask) { + public static MatchEntry buildMatchEntry(final Uint32 value, final Uint32 mask) { NshcCaseValue nshcCaseValue = new NshcCaseValueBuilder().setNshc(value).setMask(mask).build(); return MatchUtil.createExperimenterMatchEntryBuilder( org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNshc2.class, @@ -73,8 +73,7 @@ public class Nshc2Convertor implements ConvertorToOFJava, ConvertorF } private static ExtensionAugment> resolveAugmentation( - NxmNxNshc2 value, - MatchPath path, Class key) { + final NxmNxNshc2 value, final MatchPath path, final Class key) { switch (path) { case FLOWS_STATISTICS_UPDATE_MATCH: return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class, diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/Nshc3Convertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/Nshc3Convertor.java index bb2e6ef29e..8c571fa40c 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/Nshc3Convertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/Nshc3Convertor.java @@ -14,11 +14,11 @@ import org.opendaylight.openflowplugin.extension.api.ConvertorToOFJava; import org.opendaylight.openflowplugin.extension.api.ExtensionAugment; import org.opendaylight.openflowplugin.extension.api.path.MatchPath; import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPreconditionException; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.OfjAugNxExpMatch; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshcCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshcCaseValueBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshcCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshcCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.ExtensionKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; @@ -41,7 +41,7 @@ import org.opendaylight.yangtools.yang.common.Uint32; public class Nshc3Convertor implements ConvertorToOFJava, ConvertorFromOFJava { @Override - public ExtensionAugment> convert(MatchEntry input, MatchPath path) { + public ExtensionAugment> convert(final MatchEntry input, final MatchPath path) { ExperimenterIdCase experimenterIdCase = (ExperimenterIdCase) input.getMatchEntryValue(); OfjAugNxExpMatch ofjAugNxExpMatch = experimenterIdCase.augmentation(OfjAugNxExpMatch.class); NshcCaseValue nshcCaseValue = (NshcCaseValue) ofjAugNxExpMatch.getNxExpMatchEntryValue(); @@ -53,7 +53,7 @@ public class Nshc3Convertor implements ConvertorToOFJava, ConvertorF } @Override - public MatchEntry convert(Extension extension) { + public MatchEntry convert(final Extension extension) { Optional matchGrouping = MatchUtil.NSC3_RESOLVER.findExtension(extension); if (!matchGrouping.isPresent()) { throw new CodecPreconditionException(extension); @@ -64,7 +64,7 @@ public class Nshc3Convertor implements ConvertorToOFJava, ConvertorF return matchEntry; } - public static MatchEntry buildMatchEntry(Uint32 value, Uint32 mask) { + public static MatchEntry buildMatchEntry(final Uint32 value, final Uint32 mask) { NshcCaseValue nshcCaseValue = new NshcCaseValueBuilder().setNshc(value).setMask(mask).build(); return MatchUtil.createExperimenterMatchEntryBuilder( org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNshc3.class, @@ -73,8 +73,8 @@ public class Nshc3Convertor implements ConvertorToOFJava, ConvertorF } private static ExtensionAugment> resolveAugmentation( - NxmNxNshc3 value, - MatchPath path, Class key) { + final NxmNxNshc3 value, + final MatchPath path, final Class key) { switch (path) { case FLOWS_STATISTICS_UPDATE_MATCH: return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class, diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/Nshc4Convertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/Nshc4Convertor.java index 251c7bba57..aa2e528ce3 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/Nshc4Convertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/Nshc4Convertor.java @@ -14,11 +14,11 @@ import org.opendaylight.openflowplugin.extension.api.ConvertorToOFJava; import org.opendaylight.openflowplugin.extension.api.ExtensionAugment; import org.opendaylight.openflowplugin.extension.api.path.MatchPath; import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPreconditionException; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.OfjAugNxExpMatch; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshcCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshcCaseValueBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshcCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshcCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.ExtensionKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; @@ -41,7 +41,7 @@ import org.opendaylight.yangtools.yang.common.Uint32; public class Nshc4Convertor implements ConvertorToOFJava, ConvertorFromOFJava { @Override - public ExtensionAugment> convert(MatchEntry input, MatchPath path) { + public ExtensionAugment> convert(final MatchEntry input, final MatchPath path) { ExperimenterIdCase experimenterIdCase = (ExperimenterIdCase) input.getMatchEntryValue(); OfjAugNxExpMatch ofjAugNxExpMatch = experimenterIdCase.augmentation(OfjAugNxExpMatch.class); NshcCaseValue nshcCaseValue = (NshcCaseValue) ofjAugNxExpMatch.getNxExpMatchEntryValue(); @@ -53,7 +53,7 @@ public class Nshc4Convertor implements ConvertorToOFJava, ConvertorF } @Override - public MatchEntry convert(Extension extension) { + public MatchEntry convert(final Extension extension) { Optional matchGrouping = MatchUtil.NSC4_RESOLVER.findExtension(extension); if (!matchGrouping.isPresent()) { throw new CodecPreconditionException(extension); @@ -64,7 +64,7 @@ public class Nshc4Convertor implements ConvertorToOFJava, ConvertorF return matchEntry; } - public static MatchEntry buildMatchEntry(Uint32 value, Uint32 mask) { + public static MatchEntry buildMatchEntry(final Uint32 value, final Uint32 mask) { NshcCaseValue nshcCaseValue = new NshcCaseValueBuilder().setNshc(value).setMask(mask).build(); return MatchUtil.createExperimenterMatchEntryBuilder( org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNshc4.class, @@ -73,8 +73,8 @@ public class Nshc4Convertor implements ConvertorToOFJava, ConvertorF } private static ExtensionAugment> resolveAugmentation( - NxmNxNshc4 value, - MatchPath path, Class key) { + final NxmNxNshc4 value, + final MatchPath path, final Class key) { switch (path) { case FLOWS_STATISTICS_UPDATE_MATCH: return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class, diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NsiConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NsiConvertor.java index e7c451f43a..52ed1ff84f 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NsiConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NsiConvertor.java @@ -14,13 +14,13 @@ import org.opendaylight.openflowplugin.extension.api.ConvertorToOFJava; import org.opendaylight.openflowplugin.extension.api.ExtensionAugment; import org.opendaylight.openflowplugin.extension.api.path.MatchPath; import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPreconditionException; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.OfjAugNxExpMatch; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NsiCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NsiCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.nsi.grouping.NsiValues; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.nsi.grouping.NsiValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NsiCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NsiCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.ExtensionKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; @@ -42,7 +42,7 @@ import org.opendaylight.yangtools.yang.common.Uint8; public class NsiConvertor implements ConvertorToOFJava, ConvertorFromOFJava { @Override - public ExtensionAugment> convert(MatchEntry input, MatchPath path) { + public ExtensionAugment> convert(final MatchEntry input, final MatchPath path) { ExperimenterIdCase experimenterIdCase = (ExperimenterIdCase) input.getMatchEntryValue(); OfjAugNxExpMatch ofjAugNxExpMatch = experimenterIdCase.augmentation(OfjAugNxExpMatch.class); NsiCaseValue nshNsiCaseValue = (NsiCaseValue) ofjAugNxExpMatch.getNxExpMatchEntryValue(); @@ -54,7 +54,7 @@ public class NsiConvertor implements ConvertorToOFJava, ConvertorFro } @Override - public MatchEntry convert(Extension extension) { + public MatchEntry convert(final Extension extension) { Optional matchGrouping = MatchUtil.NSI_RESOLVER.findExtension(extension); if (!matchGrouping.isPresent()) { throw new CodecPreconditionException(extension); @@ -64,7 +64,7 @@ public class NsiConvertor implements ConvertorToOFJava, ConvertorFro return matchEntry; } - public static MatchEntry buildMatchEntry(Uint8 nsi, Uint8 mask) { + public static MatchEntry buildMatchEntry(final Uint8 nsi, final Uint8 mask) { NsiValues nsiValues = new NsiValuesBuilder().setNsi(nsi).setMask(mask).build(); NsiCaseValue nsiCaseValue = new NsiCaseValueBuilder().setNsiValues(nsiValues).build(); return MatchUtil.createExperimenterMatchEntryBuilder( @@ -73,8 +73,8 @@ public class NsiConvertor implements ConvertorToOFJava, ConvertorFro nsiCaseValue).setHasMask(mask != null).build(); } - private static ExtensionAugment> resolveAugmentation(NxmNxNsi value, - MatchPath path, Class key) { + private static ExtensionAugment> resolveAugmentation(final NxmNxNsi value, + final MatchPath path, final Class key) { switch (path) { case FLOWS_STATISTICS_UPDATE_MATCH: return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class, diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NspConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NspConvertor.java index 960e1a889f..85a154388b 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NspConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NspConvertor.java @@ -14,13 +14,13 @@ import org.opendaylight.openflowplugin.extension.api.ConvertorToOFJava; import org.opendaylight.openflowplugin.extension.api.ExtensionAugment; import org.opendaylight.openflowplugin.extension.api.path.MatchPath; import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPreconditionException; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.OfjAugNxExpMatch; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NspCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NspCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.nsp.grouping.NspValues; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.nsp.grouping.NspValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NspCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NspCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.ExtensionKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; @@ -43,7 +43,7 @@ import org.opendaylight.yangtools.yang.common.Uint32; public class NspConvertor implements ConvertorToOFJava, ConvertorFromOFJava { @Override - public ExtensionAugment> convert(MatchEntry input, MatchPath path) { + public ExtensionAugment> convert(final MatchEntry input, final MatchPath path) { ExperimenterIdCase experimenterIdCase = (ExperimenterIdCase) input.getMatchEntryValue(); OfjAugNxExpMatch ofjAugNxExpMatch = experimenterIdCase.augmentation(OfjAugNxExpMatch.class); NspCaseValue nshNspCaseValue = (NspCaseValue) ofjAugNxExpMatch.getNxExpMatchEntryValue(); @@ -55,7 +55,7 @@ public class NspConvertor implements ConvertorToOFJava, ConvertorFro } @Override - public MatchEntry convert(Extension extension) { + public MatchEntry convert(final Extension extension) { Optional matchGrouping = MatchUtil.NSP_RESOLVER.findExtension(extension); if (!matchGrouping.isPresent()) { throw new CodecPreconditionException(extension); @@ -65,7 +65,7 @@ public class NspConvertor implements ConvertorToOFJava, ConvertorFro return matchEntry; } - public static MatchEntry buildMatchEntry(Uint32 nsp, Uint32 mask) { + public static MatchEntry buildMatchEntry(final Uint32 nsp, final Uint32 mask) { NspValues nspValues = new NspValuesBuilder().setNsp(nsp).setMask(mask).build(); NspCaseValue nspCaseValue = new NspCaseValueBuilder().setNspValues(nspValues).build(); return MatchUtil.createExperimenterMatchEntryBuilder( @@ -74,8 +74,8 @@ public class NspConvertor implements ConvertorToOFJava, ConvertorFro nspCaseValue).setHasMask(mask != null).build(); } - private static ExtensionAugment> resolveAugmentation(NxmNxNsp value, - MatchPath path, Class key) { + private static ExtensionAugment> resolveAugmentation(final NxmNxNsp value, + final MatchPath path, final Class key) { switch (path) { case FLOWS_STATISTICS_UPDATE_MATCH: return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class, diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NxmInPortConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NxmInPortConvertor.java index cadf567fe4..a0ef810dab 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NxmInPortConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NxmInPortConvertor.java @@ -15,9 +15,9 @@ import org.opendaylight.openflowplugin.extension.api.path.MatchPath; import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPreconditionException; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm0Class; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.OfInPortCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.OfInPortCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.in.port.type.grouping.NxmOfInPortValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.OfInPortCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.OfInPortCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.ExtensionKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; @@ -41,7 +41,7 @@ public class NxmInPortConvertor implements ConvertorToOFJava, @Override public ExtensionAugment> convert( - MatchEntry input, MatchPath path) { + final MatchEntry input, final MatchPath path) { OfInPortCaseValue inPortCaseValue = (OfInPortCaseValue) input .getMatchEntryValue(); return NxmInPortConvertor.resolveAugmentation(new OfInPortBuilder() @@ -50,7 +50,7 @@ public class NxmInPortConvertor implements ConvertorToOFJava, } @Override - public MatchEntry convert(Extension extension) { + public MatchEntry convert(final Extension extension) { Optional matchGrouping = MatchUtil.NXM_OF_INPORT_RESOLVER.findExtension(extension); if (!matchGrouping.isPresent()) { throw new CodecPreconditionException(extension); @@ -59,17 +59,15 @@ public class NxmInPortConvertor implements ConvertorToOFJava, OfInPortCaseValueBuilder inPortCaseValueBuilder = new OfInPortCaseValueBuilder(); inPortCaseValueBuilder.setNxmOfInPortValues( new NxmOfInPortValuesBuilder().setValue(value).build()); - return MatchUtil - .createDefaultMatchEntryBuilder( - org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfInPort.class, - Nxm0Class.class, inPortCaseValueBuilder.build()) - .build(); - + return MatchUtil.createDefaultMatchEntryBuilder( + org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfInPort.class, + Nxm0Class.class, inPortCaseValueBuilder.build()) + .build(); } private static ExtensionAugment> resolveAugmentation( - org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.nxm.of.in - .port.grouping.OfInPort value, MatchPath path, Class key) { + final org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.nxm.of + .in.port.grouping.OfInPort value, final MatchPath path, final Class key) { switch (path) { case FLOWS_STATISTICS_UPDATE_MATCH: return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class, diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/PktMarkConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/PktMarkConvertor.java index dccffb02d8..09cc00d92c 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/PktMarkConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/PktMarkConvertor.java @@ -16,9 +16,9 @@ import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPr import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1Class; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.PktMarkCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.PktMarkCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.pkt.mark.grouping.PktMarkValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.PktMarkCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.PktMarkCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.ExtensionKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; @@ -40,7 +40,7 @@ import org.opendaylight.yangtools.yang.binding.Augmentation; public class PktMarkConvertor implements ConvertorToOFJava, ConvertorFromOFJava { @Override - public MatchEntry convert(Extension extension) { + public MatchEntry convert(final Extension extension) { Optional matchGrouping = MatchUtil.PKT_MARK_RESOLVER.findExtension(extension); if (!matchGrouping.isPresent()) { throw new CodecPreconditionException(extension); @@ -58,7 +58,7 @@ public class PktMarkConvertor implements ConvertorToOFJava, Converto } @Override - public ExtensionAugment> convert(MatchEntry input, MatchPath path) { + public ExtensionAugment> convert(final MatchEntry input, final MatchPath path) { PktMarkCaseValue pktMarkCaseValue = (PktMarkCaseValue) input.getMatchEntryValue(); NxmNxPktMarkBuilder pktMarkBuilder = new NxmNxPktMarkBuilder(); pktMarkBuilder.setPktMark(pktMarkCaseValue.getPktMarkValues().getPktMark()); @@ -67,8 +67,8 @@ public class PktMarkConvertor implements ConvertorToOFJava, Converto NxmNxPktMarkKey.class); } - private static ExtensionAugment> resolveAugmentation(NxmNxPktMark value, - MatchPath path, Class key) { + private static ExtensionAugment> resolveAugmentation(final NxmNxPktMark value, + final MatchPath path, final Class key) { switch (path) { case FLOWS_STATISTICS_UPDATE_MATCH: return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class, diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/RegConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/RegConvertor.java index 7aaf2abe85..0cc4f64c2f 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/RegConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/RegConvertor.java @@ -17,9 +17,9 @@ import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPr import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.MatchField; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1Class; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.RegCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.RegCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.reg.grouping.RegValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.RegCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.RegCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.ExtensionKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TcpDstConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TcpDstConvertor.java index f0d543e2f3..005903f118 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TcpDstConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TcpDstConvertor.java @@ -16,9 +16,9 @@ import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPr import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm0Class; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.TcpDstCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.TcpDstCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.tcp.dst.grouping.TcpDstValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.TcpDstCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.TcpDstCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.ExtensionKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; @@ -45,7 +45,7 @@ import org.opendaylight.yangtools.yang.binding.Augmentation; public class TcpDstConvertor implements ConvertorToOFJava, ConvertorFromOFJava { @Override - public ExtensionAugment> convert(MatchEntry input, MatchPath path) { + public ExtensionAugment> convert(final MatchEntry input, final MatchPath path) { TcpDstCaseValue tcpDstCaseValue = (TcpDstCaseValue) input.getMatchEntryValue(); NxmOfTcpDstBuilder tcpDstBuilder = new NxmOfTcpDstBuilder(); tcpDstBuilder.setPort(tcpDstCaseValue.getTcpDstValues().getPort()); @@ -55,7 +55,7 @@ public class TcpDstConvertor implements ConvertorToOFJava, Convertor } @Override - public MatchEntry convert(Extension extension) { + public MatchEntry convert(final Extension extension) { Optional matchGrouping = MatchUtil.TCP_DST_RESOLVER.findExtension(extension); if (!matchGrouping.isPresent()) { throw new CodecPreconditionException(extension); @@ -73,8 +73,8 @@ public class TcpDstConvertor implements ConvertorToOFJava, Convertor return ofMatch.build(); } - private static ExtensionAugment> resolveAugmentation(NxmOfTcpDst value, - MatchPath path, Class key) { + private static ExtensionAugment> resolveAugmentation(final NxmOfTcpDst value, + final MatchPath path, final Class key) { switch (path) { case FLOWS_STATISTICS_UPDATE_MATCH: return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class, diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TcpSrcConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TcpSrcConvertor.java index 7b09c56792..534eaaa17e 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TcpSrcConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TcpSrcConvertor.java @@ -16,9 +16,9 @@ import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPr import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm0Class; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.TcpSrcCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.TcpSrcCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.tcp.src.grouping.TcpSrcValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.TcpSrcCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.TcpSrcCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.ExtensionKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; @@ -44,17 +44,16 @@ import org.opendaylight.yangtools.yang.binding.Augmentation; */ public class TcpSrcConvertor implements ConvertorToOFJava, ConvertorFromOFJava { @Override - public ExtensionAugment> convert(MatchEntry input, MatchPath path) { + public ExtensionAugment> convert(final MatchEntry input, final MatchPath path) { TcpSrcCaseValue tcpSrcCaseValue = (TcpSrcCaseValue) input.getMatchEntryValue(); NxmOfTcpSrcBuilder tcpSrcBuilder = new NxmOfTcpSrcBuilder(); tcpSrcBuilder.setPort(tcpSrcCaseValue.getTcpSrcValues().getPort()); tcpSrcBuilder.setMask(tcpSrcCaseValue.getTcpSrcValues().getMask()); - return resolveAugmentation(tcpSrcBuilder.build(), path, - NxmOfTcpSrcKey.class); + return resolveAugmentation(tcpSrcBuilder.build(), path, NxmOfTcpSrcKey.class); } @Override - public MatchEntry convert(Extension extension) { + public MatchEntry convert(final Extension extension) { Optional matchGrouping = MatchUtil.TCP_SRC_RESOLVER.findExtension(extension); if (!matchGrouping.isPresent()) { throw new CodecPreconditionException(extension); @@ -72,8 +71,8 @@ public class TcpSrcConvertor implements ConvertorToOFJava, Convertor return ofMatch.build(); } - private static ExtensionAugment> resolveAugmentation(NxmOfTcpSrc value, - MatchPath path, Class key) { + private static ExtensionAugment> resolveAugmentation(final NxmOfTcpSrc value, + final MatchPath path, final Class key) { switch (path) { case FLOWS_STATISTICS_UPDATE_MATCH: return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class, diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TunIPv4DstConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TunIPv4DstConvertor.java index aaadafa950..93c88624bc 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TunIPv4DstConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TunIPv4DstConvertor.java @@ -15,9 +15,9 @@ import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPr import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1Class; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.TunIpv4DstCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.TunIpv4DstCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.tun.ipv4.dst.grouping.TunIpv4DstValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.TunIpv4DstCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.TunIpv4DstCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.ExtensionKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TunIPv4SrcConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TunIPv4SrcConvertor.java index e5e31392db..cc8f834d1d 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TunIPv4SrcConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TunIPv4SrcConvertor.java @@ -15,9 +15,9 @@ import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPr import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1Class; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.TunIpv4SrcCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.TunIpv4SrcCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.tun.ipv4.src.grouping.TunIpv4SrcValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.TunIpv4SrcCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.TunIpv4SrcCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.ExtensionKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TunIdConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TunIdConvertor.java index bd69efcfce..2fca2b78c1 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TunIdConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TunIdConvertor.java @@ -15,9 +15,9 @@ import org.opendaylight.openflowplugin.extension.api.path.MatchPath; import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPreconditionException; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1Class; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.TunIdCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.TunIdCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.tun.id.grouping.TunIdValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.TunIdCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.TunIdCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.ExtensionKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/UdpDstConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/UdpDstConvertor.java index 5269e24115..f5b814ebf4 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/UdpDstConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/UdpDstConvertor.java @@ -16,9 +16,9 @@ import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPr import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm0Class; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.UdpDstCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.UdpDstCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.udp.dst.grouping.UdpDstValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.UdpDstCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.UdpDstCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.ExtensionKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; @@ -45,7 +45,7 @@ import org.opendaylight.yangtools.yang.binding.Augmentation; public class UdpDstConvertor implements ConvertorToOFJava, ConvertorFromOFJava { @Override - public ExtensionAugment> convert(MatchEntry input, MatchPath path) { + public ExtensionAugment> convert(final MatchEntry input, final MatchPath path) { UdpDstCaseValue udpDstCaseValue = (UdpDstCaseValue) input.getMatchEntryValue(); NxmOfUdpDstBuilder udpDstBuilder = new NxmOfUdpDstBuilder(); udpDstBuilder.setPort(udpDstCaseValue.getUdpDstValues().getPort()); @@ -55,7 +55,7 @@ public class UdpDstConvertor implements ConvertorToOFJava, Convertor } @Override - public MatchEntry convert(Extension extension) { + public MatchEntry convert(final Extension extension) { Optional matchGrouping = MatchUtil.UDP_DST_RESOLVER.findExtension(extension); if (!matchGrouping.isPresent()) { throw new CodecPreconditionException(extension); @@ -73,8 +73,8 @@ public class UdpDstConvertor implements ConvertorToOFJava, Convertor return ofMatch.build(); } - private static ExtensionAugment> resolveAugmentation(NxmOfUdpDst value, - MatchPath path, Class key) { + private static ExtensionAugment> resolveAugmentation(final NxmOfUdpDst value, + final MatchPath path, final Class key) { switch (path) { case FLOWS_STATISTICS_UPDATE_MATCH: return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class, diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/UdpSrcConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/UdpSrcConvertor.java index 9138c5266e..9da402ae2c 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/UdpSrcConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/UdpSrcConvertor.java @@ -16,9 +16,9 @@ import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPr import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm0Class; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.UdpSrcCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.UdpSrcCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.udp.src.grouping.UdpSrcValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.UdpSrcCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.UdpSrcCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.ExtensionKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; @@ -45,7 +45,7 @@ import org.opendaylight.yangtools.yang.binding.Augmentation; public class UdpSrcConvertor implements ConvertorToOFJava, ConvertorFromOFJava { @Override - public ExtensionAugment> convert(MatchEntry input, MatchPath path) { + public ExtensionAugment> convert(final MatchEntry input, final MatchPath path) { UdpSrcCaseValue udpSrcCaseValue = (UdpSrcCaseValue) input.getMatchEntryValue(); NxmOfUdpSrcBuilder udpSrcBuilder = new NxmOfUdpSrcBuilder(); udpSrcBuilder.setPort(udpSrcCaseValue.getUdpSrcValues().getPort()); @@ -55,7 +55,7 @@ public class UdpSrcConvertor implements ConvertorToOFJava, Convertor } @Override - public MatchEntry convert(Extension extension) { + public MatchEntry convert(final Extension extension) { Optional matchGrouping = MatchUtil.UDP_SRC_RESOLVER.findExtension(extension); if (!matchGrouping.isPresent()) { throw new CodecPreconditionException(extension); @@ -73,8 +73,8 @@ public class UdpSrcConvertor implements ConvertorToOFJava, Convertor return ofMatch.build(); } - private static ExtensionAugment> resolveAugmentation(NxmOfUdpSrc value, - MatchPath path, Class key) { + private static ExtensionAugment> resolveAugmentation(final NxmOfUdpSrc value, + final MatchPath path, final Class key) { switch (path) { case FLOWS_STATISTICS_UPDATE_MATCH: return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class, diff --git a/extension/openflowplugin-extension-nicira/src/main/yang/openflowplugin-extension-nicira-match.yang b/extension/openflowplugin-extension-nicira/src/main/yang/openflowplugin-extension-nicira-match.yang index a8b2187b29..1ec4c7956c 100644 --- a/extension/openflowplugin-extension-nicira/src/main/yang/openflowplugin-extension-nicira-match.yang +++ b/extension/openflowplugin-extension-nicira/src/main/yang/openflowplugin-extension-nicira-match.yang @@ -527,7 +527,7 @@ module openflowplugin-extension-nicira-match { uses all-matches-grouping; } augment "/odl-flow-stats:flows-statistics-update/odl-flow-stats:flow-and-statistics-map-list/odl-flow-stats:match/ext-gen:extension-list/ext-gen:extension" { - ext:augment-identifier "nx-aug-match-nodes-node-table-flow"; + ext:augment-identifier "nx-aug-match-notif-update-flow-stats"; uses all-matches-grouping; } augment "/odl-direct-stats:get-flow-statistics/odl-direct-stats:output/odl-direct-stats:flow-and-statistics-map-list/odl-direct-stats:match/ext-gen:extension-list/ext-gen:extension" { diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/ConntrackConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/ConntrackConvertorTest.java index 04cf1e3f24..eb0edce2e0 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/ConntrackConvertorTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/ConntrackConvertorTest.java @@ -16,8 +16,8 @@ import org.opendaylight.openflowplugin.extension.api.path.ActionPath; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionConntrack; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionConntrackBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionConntrack; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionConntrackBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.conntrack.grouping.NxActionConntrackBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.flows.statistics.update.flow.and.statistics.map.list.instructions.instruction.instruction.apply.actions._case.apply.actions.action.action.NxActionConntrackNotifFlowsStatisticsUpdateApplyActionsCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.flows.statistics.update.flow.and.statistics.map.list.instructions.instruction.instruction.write.actions._case.write.actions.action.action.NxActionConntrackNotifFlowsStatisticsUpdateWriteActionsCase; diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/CtClearConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/CtClearConvertorTest.java index 9743a2cf23..9998273e09 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/CtClearConvertorTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/CtClearConvertorTest.java @@ -16,21 +16,16 @@ import org.mockito.Mockito; import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.openflowplugin.extension.api.path.ActionPath; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionCtClear; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionCtClear; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.ct.clear.grouping.NxActionCtClear; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nodes.node.table.flow.instructions.instruction.instruction.write.actions._case.write.actions.action.action.NxActionCtClearNodesNodeTableFlowWriteActionsCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.ct.clear.grouping.NxCtClear; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Test for {@link CtClearConvertor}. */ @RunWith(MockitoJUnitRunner.class) public class CtClearConvertorTest { - - private static final Logger LOG = LoggerFactory.getLogger(CtClearConvertorTest.class); - @Mock private NxActionCtClearNodesNodeTableFlowWriteActionsCase actionsCase; diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/DecNshTtlConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/DecNshTtlConvertorTest.java index 482b10f47a..0373a20861 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/DecNshTtlConvertorTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/DecNshTtlConvertorTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.action; import org.junit.Assert; @@ -17,7 +16,7 @@ import org.mockito.Mockito; import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.openflowplugin.extension.api.path.ActionPath; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionDecNshTtl; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionDecNshTtl; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.dec.nsh.ttl.grouping.NxActionDecNshTtl; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nodes.node.table.flow.instructions.instruction.instruction.write.actions._case.write.actions.action.action.NxActionDecNshTtlNodesNodeTableFlowWriteActionsCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.dec.nsh.ttl.grouping.NxDecNshTtl; diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/DecapConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/DecapConvertorTest.java index ac064c6155..1750e8bd55 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/DecapConvertorTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/DecapConvertorTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.action; import static org.mockito.Mockito.when; @@ -19,7 +18,7 @@ import org.mockito.Mockito; import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.openflowplugin.extension.api.path.ActionPath; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionDecap; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionDecap; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.decap.grouping.NxActionDecap; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.flows.statistics.update.flow.and.statistics.map.list.instructions.instruction.instruction.apply.actions._case.apply.actions.action.action.NxActionDecapNotifFlowsStatisticsUpdateApplyActionsCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.flows.statistics.update.flow.and.statistics.map.list.instructions.instruction.instruction.write.actions._case.write.actions.action.action.NxActionDecapNotifFlowsStatisticsUpdateWriteActionsCase; diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/EncapConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/EncapConvertorTest.java index 29199326e9..2a6699f16d 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/EncapConvertorTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/EncapConvertorTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.action; import static org.mockito.Mockito.when; @@ -19,7 +18,7 @@ import org.mockito.Mockito; import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.openflowplugin.extension.api.path.ActionPath; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionEncap; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionEncap; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.encap.grouping.NxActionEncap; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.flows.statistics.update.flow.and.statistics.map.list.instructions.instruction.instruction.apply.actions._case.apply.actions.action.action.NxActionEncapNotifFlowsStatisticsUpdateApplyActionsCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.flows.statistics.update.flow.and.statistics.map.list.instructions.instruction.instruction.write.actions._case.write.actions.action.action.NxActionEncapNotifFlowsStatisticsUpdateWriteActionsCase; diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/FinTimeoutConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/FinTimeoutConvertorTest.java index 56ed5cd611..14a98551e2 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/FinTimeoutConvertorTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/FinTimeoutConvertorTest.java @@ -18,7 +18,7 @@ import org.mockito.Mockito; import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.openflowplugin.extension.api.path.ActionPath; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionFinTimeout; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionFinTimeout; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.fin.timeout.grouping.NxActionFinTimeout; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.flows.statistics.update.flow.and.statistics.map.list.instructions.instruction.instruction.apply.actions._case.apply.actions.action.action.NxActionFinTimeoutNotifFlowsStatisticsUpdateApplyActionsCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.flows.statistics.update.flow.and.statistics.map.list.instructions.instruction.instruction.write.actions._case.write.actions.action.action.NxActionFinTimeoutNotifFlowsStatisticsUpdateWriteActionsCase; diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/MultipathConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/MultipathConvertorTest.java index 7ddc2caef8..97f4d87c87 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/MultipathConvertorTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/MultipathConvertorTest.java @@ -21,7 +21,7 @@ import org.opendaylight.openflowplugin.extension.api.path.ActionPath; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.OfjNxHashFields; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.OfjNxMpAlgorithm; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionMultipath; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionMultipath; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.multipath.grouping.NxActionMultipath; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxTunIdCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxTunIdCaseBuilder; diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/OutputReg2ConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/OutputReg2ConvertorTest.java index 0c047583c6..867d12af4f 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/OutputReg2ConvertorTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/OutputReg2ConvertorTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.action; import static org.mockito.Mockito.when; @@ -20,7 +19,7 @@ import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.openflowjava.nx.codec.match.NiciraMatchCodecs; import org.opendaylight.openflowplugin.extension.api.path.ActionPath; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionOutputReg2; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionOutputReg2; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.output.reg2.grouping.NxActionOutputReg2; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.flows.statistics.update.flow.and.statistics.map.list.instructions.instruction.instruction.apply.actions._case.apply.actions.action.action.NxActionOutputRegNotifFlowsStatisticsUpdateApplyActionsCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.flows.statistics.update.flow.and.statistics.map.list.instructions.instruction.instruction.write.actions._case.write.actions.action.action.NxActionOutputRegNotifFlowsStatisticsUpdateWriteActionsCase; diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/OutputRegConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/OutputRegConvertorTest.java index c98ea7bf94..4fb44b3e92 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/OutputRegConvertorTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/OutputRegConvertorTest.java @@ -19,7 +19,7 @@ import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.openflowjava.nx.codec.match.NiciraMatchCodecs; import org.opendaylight.openflowplugin.extension.api.path.ActionPath; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionOutputReg; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionOutputReg; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.output.reg.grouping.NxActionOutputReg; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.flows.statistics.update.flow.and.statistics.map.list.instructions.instruction.instruction.apply.actions._case.apply.actions.action.action.NxActionOutputRegNotifFlowsStatisticsUpdateApplyActionsCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.flows.statistics.update.flow.and.statistics.map.list.instructions.instruction.instruction.write.actions._case.write.actions.action.action.NxActionOutputRegNotifFlowsStatisticsUpdateWriteActionsCase; diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/RegLoad2ConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/RegLoad2ConvertorTest.java index e598665185..7a94ea7dc0 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/RegLoad2ConvertorTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/RegLoad2ConvertorTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.action; import static org.junit.Assert.assertEquals; @@ -22,14 +21,14 @@ import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.opendaylight.openflowplugin.extension.api.path.ActionPath; import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.match.NshFlagsConvertor; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionRegLoad2; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionRegLoad2; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.reg.load2.grouping.NxActionRegLoad2; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.OfjAugNxExpMatch; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshFlagsCaseValue; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.nsh.flags.grouping.NshFlagsValues; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshFlagsCaseValue; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxNshFlagsCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.flows.statistics.update.flow.and.statistics.map.list.instructions.instruction.instruction.apply.actions._case.apply.actions.action.action.NxActionRegLoadNotifFlowsStatisticsUpdateApplyActionsCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.flows.statistics.update.flow.and.statistics.map.list.instructions.instruction.instruction.write.actions._case.write.actions.action.action.NxActionRegLoadNotifFlowsStatisticsUpdateWriteActionsCase; @@ -84,12 +83,12 @@ public class RegLoad2ConvertorTest { @Test @Parameters(method = "commonData, salToOpenflowData") - public void testConvertSalToOf(Uint16 rangeStart, - Uint16 rangeEnd, - Integer rangeValue, - Integer value, - Integer mask, - Class expectedException) { + public void testConvertSalToOf(final Uint16 rangeStart, + final Uint16 rangeEnd, + final Integer rangeValue, + final Integer value, + final Integer mask, + final Class expectedException) { if (expectedException != null) { thrown.expect(expectedException); @@ -121,12 +120,12 @@ public class RegLoad2ConvertorTest { @Test @Parameters(method = "commonData, openflowToSalData") - public void testConvertOfToSal(Uint16 rangeStart, - Uint16 rangeEnd, - Integer rangeValue, - Integer value, - Integer mask, - Class expectedException) { + public void testConvertOfToSal(final Uint16 rangeStart, + final Uint16 rangeEnd, + final Integer rangeValue, + final Integer value, + final Integer mask, + final Class expectedException) { if (expectedException != null) { thrown.expect(expectedException); diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/RegLoadConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/RegLoadConvertorTest.java index f2f2fab2e9..0a50d94de3 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/RegLoadConvertorTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/RegLoadConvertorTest.java @@ -19,7 +19,7 @@ import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.openflowjava.nx.codec.match.NiciraMatchCodecs; import org.opendaylight.openflowplugin.extension.api.path.ActionPath; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionRegLoad; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionRegLoad; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.reg.load.grouping.NxActionRegLoad; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxTunIdCaseBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.flows.statistics.update.flow.and.statistics.map.list.instructions.instruction.instruction.apply.actions._case.apply.actions.action.action.NxActionRegLoadNotifFlowsStatisticsUpdateApplyActionsCase; diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/RegMoveConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/RegMoveConvertorTest.java index 17c415569c..0c4094d88b 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/RegMoveConvertorTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/RegMoveConvertorTest.java @@ -19,7 +19,7 @@ import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.openflowjava.nx.codec.match.NiciraMatchCodecs; import org.opendaylight.openflowplugin.extension.api.path.ActionPath; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionRegMove; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionRegMove; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.reg.move.grouping.NxActionRegMove; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxTunIdCaseBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.flows.statistics.update.flow.and.statistics.map.list.instructions.instruction.instruction.apply.actions._case.apply.actions.action.action.NxActionRegMoveNotifFlowsStatisticsUpdateApplyActionsCase; @@ -83,7 +83,6 @@ public class RegMoveConvertorTest { when(action.getActionChoice()).thenReturn(actionRegMove); regMoveConvertor = new RegMoveConvertor(); - } @Test diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/ResubmitConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/ResubmitConvertorTest.java index 493e4b5aff..765a47b0a5 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/ResubmitConvertorTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/ResubmitConvertorTest.java @@ -18,7 +18,7 @@ import org.mockito.Mockito; import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.openflowplugin.extension.api.path.ActionPath; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionResubmit; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionResubmit; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.resubmit.grouping.NxActionResubmit; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.flows.statistics.update.flow.and.statistics.map.list.instructions.instruction.instruction.apply.actions._case.apply.actions.action.action.NxActionResubmitNotifFlowsStatisticsUpdateApplyActionsCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.flows.statistics.update.flow.and.statistics.map.list.instructions.instruction.instruction.write.actions._case.write.actions.action.action.NxActionResubmitNotifFlowsStatisticsUpdateWriteActionsCase; diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpOpConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpOpConvertorTest.java index da097b0857..300ea6c56a 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpOpConvertorTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpOpConvertorTest.java @@ -22,7 +22,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.ArpOpCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.ArpOpCaseBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.arp.op._case.ArpOpBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.ArpOpCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.ArpOpCaseValue; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNotifPacketIn; diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpShaConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpShaConvertorTest.java index 75a4772729..a95ea33eb3 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpShaConvertorTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpShaConvertorTest.java @@ -20,9 +20,9 @@ import org.opendaylight.openflowplugin.extension.api.ExtensionAugment; import org.opendaylight.openflowplugin.extension.api.path.MatchPath; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.ArpShaCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.ArpShaCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.arp.sha.grouping.ArpShaValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.ArpShaCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.ArpShaCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNotifPacketIn; diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpSpaConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpSpaConvertorTest.java index 1347b4684f..4d3be6a2ad 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpSpaConvertorTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpSpaConvertorTest.java @@ -21,9 +21,9 @@ import org.opendaylight.openflowplugin.extension.api.path.MatchPath; import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.IpConverter; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.ArpSpaCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.ArpSpaCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.arp.spa.grouping.ArpSpaValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.ArpSpaCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.ArpSpaCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNotifPacketIn; diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpThaConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpThaConvertorTest.java index e7bfa63116..9d8d8d87e6 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpThaConvertorTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpThaConvertorTest.java @@ -20,9 +20,9 @@ import org.opendaylight.openflowplugin.extension.api.ExtensionAugment; import org.opendaylight.openflowplugin.extension.api.path.MatchPath; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.ArpThaCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.ArpThaCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.arp.tha.grouping.ArpThaValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.ArpThaCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.ArpThaCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNotifPacketIn; diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpTpaConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpTpaConvertorTest.java index dd44edf47c..a4aeb90dee 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpTpaConvertorTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpTpaConvertorTest.java @@ -21,9 +21,9 @@ import org.opendaylight.openflowplugin.extension.api.path.MatchPath; import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.IpConverter; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.ArpTpaCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.ArpTpaCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.arp.tpa.grouping.ArpTpaValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.ArpTpaCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.ArpTpaCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNotifPacketIn; diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/CtStateConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/CtStateConvertorTest.java index 5f3d6928cf..6fb8576b83 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/CtStateConvertorTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/CtStateConvertorTest.java @@ -19,9 +19,9 @@ import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.openflowplugin.extension.api.ExtensionAugment; import org.opendaylight.openflowplugin.extension.api.path.MatchPath; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.CtStateCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.CtStateCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.ct.state.grouping.CtStateValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.CtStateCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.CtStateCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlowBuilder; diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/CtZoneConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/CtZoneConvertorTest.java index adfb9867f0..9a60467385 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/CtZoneConvertorTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/CtZoneConvertorTest.java @@ -19,9 +19,9 @@ import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.openflowplugin.extension.api.ExtensionAugment; import org.opendaylight.openflowplugin.extension.api.path.MatchPath; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.CtZoneCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.CtZoneCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.ct.zone.grouping.CtZoneValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.CtZoneCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.CtZoneCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlowBuilder; diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/EthDstConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/EthDstConvertorTest.java index d94bbadeb6..6a92463214 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/EthDstConvertorTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/EthDstConvertorTest.java @@ -20,9 +20,9 @@ import org.opendaylight.openflowplugin.extension.api.ExtensionAugment; import org.opendaylight.openflowplugin.extension.api.path.MatchPath; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.EthDstCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.EthDstCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.eth.dst.grouping.EthDstValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.EthDstCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.EthDstCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlowBuilder; diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/EthSrcConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/EthSrcConvertorTest.java index 7ace232868..d495d85c21 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/EthSrcConvertorTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/EthSrcConvertorTest.java @@ -20,9 +20,9 @@ import org.opendaylight.openflowplugin.extension.api.ExtensionAugment; import org.opendaylight.openflowplugin.extension.api.path.MatchPath; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.EthSrcCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.EthSrcCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.eth.src.grouping.EthSrcValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.EthSrcCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.EthSrcCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlowBuilder; diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/EthTypeConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/EthTypeConvertorTest.java index 11275dbe47..e49e12b0b7 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/EthTypeConvertorTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/EthTypeConvertorTest.java @@ -19,9 +19,9 @@ import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.openflowplugin.extension.api.ExtensionAugment; import org.opendaylight.openflowplugin.extension.api.path.MatchPath; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.EthTypeCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.EthTypeCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.eth.type.grouping.EthTypeValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.EthTypeCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.EthTypeCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlowBuilder; diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NshFlagsConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NshFlagsConvertorTest.java index e1ca50cce9..292bba4c6a 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NshFlagsConvertorTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NshFlagsConvertorTest.java @@ -20,10 +20,10 @@ import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.openflowjava.nx.api.NiciraConstants; import org.opendaylight.openflowplugin.extension.api.ExtensionAugment; import org.opendaylight.openflowplugin.extension.api.path.MatchPath; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.OfjAugNxExpMatch; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshFlagsCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshFlagsCaseValue; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlowBuilder; diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NshMdtypeConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NshMdtypeConvertorTest.java index bd895964d1..77869eb99c 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NshMdtypeConvertorTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NshMdtypeConvertorTest.java @@ -20,10 +20,10 @@ import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.openflowjava.nx.api.NiciraConstants; import org.opendaylight.openflowplugin.extension.api.ExtensionAugment; import org.opendaylight.openflowplugin.extension.api.path.MatchPath; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.OfjAugNxExpMatch; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshMdtypeCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshMdtypeCaseValue; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlowBuilder; diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NshNpConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NshNpConvertorTest.java index 185031eecc..3aab4026cf 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NshNpConvertorTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NshNpConvertorTest.java @@ -20,10 +20,10 @@ import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.openflowjava.nx.api.NiciraConstants; import org.opendaylight.openflowplugin.extension.api.ExtensionAugment; import org.opendaylight.openflowplugin.extension.api.path.MatchPath; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.OfjAugNxExpMatch; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshNpCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshNpCaseValue; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlowBuilder; diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NshTtlConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NshTtlConvertorTest.java index 26471d074e..439d401065 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NshTtlConvertorTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NshTtlConvertorTest.java @@ -20,10 +20,10 @@ import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.openflowjava.nx.api.NiciraConstants; import org.opendaylight.openflowplugin.extension.api.ExtensionAugment; import org.opendaylight.openflowplugin.extension.api.path.MatchPath; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.OfjAugNxExpMatch; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshTtlCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshTtlCaseValue; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlowBuilder; diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/Nshc1ConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/Nshc1ConvertorTest.java index 07af9e8da8..65739b6f91 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/Nshc1ConvertorTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/Nshc1ConvertorTest.java @@ -19,10 +19,10 @@ import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.openflowjava.nx.api.NiciraConstants; import org.opendaylight.openflowplugin.extension.api.ExtensionAugment; import org.opendaylight.openflowplugin.extension.api.path.MatchPath; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.OfjAugNxExpMatch; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshcCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshcCaseValue; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlowBuilder; diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/Nshc2ConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/Nshc2ConvertorTest.java index b0bee0ebf4..49dfb1df7c 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/Nshc2ConvertorTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/Nshc2ConvertorTest.java @@ -19,10 +19,10 @@ import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.openflowjava.nx.api.NiciraConstants; import org.opendaylight.openflowplugin.extension.api.ExtensionAugment; import org.opendaylight.openflowplugin.extension.api.path.MatchPath; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.OfjAugNxExpMatch; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshcCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshcCaseValue; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlowBuilder; diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/Nshc3ConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/Nshc3ConvertorTest.java index f7989f1858..9ddc87ee92 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/Nshc3ConvertorTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/Nshc3ConvertorTest.java @@ -19,10 +19,10 @@ import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.openflowjava.nx.api.NiciraConstants; import org.opendaylight.openflowplugin.extension.api.ExtensionAugment; import org.opendaylight.openflowplugin.extension.api.path.MatchPath; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.OfjAugNxExpMatch; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshcCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshcCaseValue; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlowBuilder; diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/Nshc4ConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/Nshc4ConvertorTest.java index a948f4799e..ad77b8d49c 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/Nshc4ConvertorTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/Nshc4ConvertorTest.java @@ -19,10 +19,10 @@ import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.openflowjava.nx.api.NiciraConstants; import org.opendaylight.openflowplugin.extension.api.ExtensionAugment; import org.opendaylight.openflowplugin.extension.api.path.MatchPath; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.OfjAugNxExpMatch; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NshcCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NshcCaseValue; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlowBuilder; diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NsiConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NsiConvertorTest.java index 017419eb4a..d0842938c3 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NsiConvertorTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NsiConvertorTest.java @@ -19,10 +19,10 @@ import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.openflowjava.nx.api.NiciraConstants; import org.opendaylight.openflowplugin.extension.api.ExtensionAugment; import org.opendaylight.openflowplugin.extension.api.path.MatchPath; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.OfjAugNxExpMatch; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NsiCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NsiCaseValue; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlowBuilder; diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NspConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NspConvertorTest.java index 778649eeb4..83342edce2 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NspConvertorTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/NspConvertorTest.java @@ -19,10 +19,10 @@ import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.openflowjava.nx.api.NiciraConstants; import org.opendaylight.openflowplugin.extension.api.ExtensionAugment; import org.opendaylight.openflowplugin.extension.api.path.MatchPath; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.OfjAugNxExpMatch; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.nx.exp.match.entry.value.NspCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.nx.exp.match.entry.value.NspCaseValue; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlowBuilder; diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TcpDstConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TcpDstConvertorTest.java index 990f912033..4c233686c7 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TcpDstConvertorTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TcpDstConvertorTest.java @@ -20,9 +20,9 @@ import org.opendaylight.openflowplugin.extension.api.ExtensionAugment; import org.opendaylight.openflowplugin.extension.api.path.MatchPath; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.TcpDstCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.TcpDstCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.tcp.dst.grouping.TcpDstValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.TcpDstCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.TcpDstCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlowBuilder; diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TcpSrcConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TcpSrcConvertorTest.java index d526c64890..b22cea7d03 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TcpSrcConvertorTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TcpSrcConvertorTest.java @@ -20,9 +20,9 @@ import org.opendaylight.openflowplugin.extension.api.ExtensionAugment; import org.opendaylight.openflowplugin.extension.api.path.MatchPath; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.TcpSrcCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.TcpSrcCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.tcp.src.grouping.TcpSrcValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.TcpSrcCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.TcpSrcCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlowBuilder; diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TunIPv4DstConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TunIPv4DstConvertorTest.java index 98e8d17c73..c2cb841788 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TunIPv4DstConvertorTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TunIPv4DstConvertorTest.java @@ -21,9 +21,9 @@ import org.opendaylight.openflowplugin.extension.api.path.MatchPath; import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.IpConverter; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.TunIpv4DstCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.TunIpv4DstCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.tun.ipv4.dst.grouping.TunIpv4DstValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.TunIpv4DstCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.TunIpv4DstCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlowBuilder; diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TunIPv4SrcConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TunIPv4SrcConvertorTest.java index 998341eacd..1d662ab3f3 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TunIPv4SrcConvertorTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TunIPv4SrcConvertorTest.java @@ -21,9 +21,9 @@ import org.opendaylight.openflowplugin.extension.api.path.MatchPath; import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.IpConverter; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.TunIpv4SrcCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.TunIpv4SrcCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.tun.ipv4.src.grouping.TunIpv4SrcValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.TunIpv4SrcCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.TunIpv4SrcCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlowBuilder; diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TunIdConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TunIdConvertorTest.java index 32244fdb3f..b09e0ec199 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TunIdConvertorTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TunIdConvertorTest.java @@ -19,9 +19,9 @@ import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.openflowplugin.extension.api.ExtensionAugment; import org.opendaylight.openflowplugin.extension.api.path.MatchPath; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.TunIdCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.TunIdCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.tun.id.grouping.TunIdValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.TunIdCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.TunIdCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlowBuilder; diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/UdpDstConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/UdpDstConvertorTest.java index e3f5efd205..063d00f659 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/UdpDstConvertorTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/UdpDstConvertorTest.java @@ -20,9 +20,9 @@ import org.opendaylight.openflowplugin.extension.api.ExtensionAugment; import org.opendaylight.openflowplugin.extension.api.path.MatchPath; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.UdpDstCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.UdpDstCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.udp.dst.grouping.UdpDstValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.UdpDstCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.UdpDstCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlowBuilder; diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/UdpSrcConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/UdpSrcConvertorTest.java index 336448a568..fc1fbb5943 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/UdpSrcConvertorTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/UdpSrcConvertorTest.java @@ -20,9 +20,9 @@ import org.opendaylight.openflowplugin.extension.api.ExtensionAugment; import org.opendaylight.openflowplugin.extension.api.path.MatchPath; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.UdpSrcCaseValue; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.UdpSrcCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.of.match.udp.src.grouping.UdpSrcValuesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.UdpSrcCaseValue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.UdpSrcCaseValueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlowBuilder; diff --git a/extension/openflowplugin-extension-onf/src/main/java/org/opendaylight/openflowplugin/extension/onf/OnfConstants.java b/extension/openflowplugin-extension-onf/src/main/java/org/opendaylight/openflowplugin/extension/onf/OnfConstants.java index 13f35acd3a..4cd7ad5ba5 100644 --- a/extension/openflowplugin-extension-onf/src/main/java/org/opendaylight/openflowplugin/extension/onf/OnfConstants.java +++ b/extension/openflowplugin-extension-onf/src/main/java/org/opendaylight/openflowplugin/extension/onf/OnfConstants.java @@ -17,20 +17,20 @@ public interface OnfConstants { /** * Experimenter ID of ONF approved extensions. */ - long ONF_EXPERIMENTER_ID_LONG = 0x4F4E4600; + Uint32 ONF_EXPERIMENTER = Uint32.valueOf(0x4F4E4600).intern(); /** * Experimenter ID of ONF approved extensions. */ - ExperimenterId ONF_EXPERIMENTER_ID = new ExperimenterId(Uint32.valueOf(ONF_EXPERIMENTER_ID_LONG).intern()); + ExperimenterId ONF_EXPERIMENTER_ID = new ExperimenterId(ONF_EXPERIMENTER); /** * ONF_ET_BUNDLE_CONTROL message type. */ - int ONF_ET_BUNDLE_CONTROL = 2300; + Uint32 ONF_ET_BUNDLE_CONTROL = Uint32.valueOf(2300).intern(); /** * ONF_ET_BUNDLE_ADD_MESSAGE message type. */ - int ONF_ET_BUNDLE_ADD_MESSAGE = 2301; + Uint32 ONF_ET_BUNDLE_ADD_MESSAGE = Uint32.valueOf(2301).intern(); } diff --git a/extension/openflowplugin-extension-onf/src/main/java/org/opendaylight/openflowplugin/extension/onf/OnfExtensionProvider.java b/extension/openflowplugin-extension-onf/src/main/java/org/opendaylight/openflowplugin/extension/onf/OnfExtensionProvider.java index b5d252355f..61170edde5 100644 --- a/extension/openflowplugin-extension-onf/src/main/java/org/opendaylight/openflowplugin/extension/onf/OnfExtensionProvider.java +++ b/extension/openflowplugin-extension-onf/src/main/java/org/opendaylight/openflowplugin/extension/onf/OnfExtensionProvider.java @@ -58,21 +58,21 @@ public class OnfExtensionProvider { public void init() { switchConnectionProvider.registerExperimenterMessageSerializer( new ExperimenterIdTypeSerializerKey<>(OFConstants.OFP_VERSION_1_3, - OnfConstants.ONF_EXPERIMENTER_ID_LONG, OnfConstants.ONF_ET_BUNDLE_CONTROL, + OnfConstants.ONF_EXPERIMENTER, OnfConstants.ONF_ET_BUNDLE_CONTROL.toJava(), ExperimenterDataOfChoice.class), new BundleControlFactory()); switchConnectionProvider.registerExperimenterMessageSerializer( new ExperimenterIdTypeSerializerKey<>(OFConstants.OFP_VERSION_1_3, - OnfConstants.ONF_EXPERIMENTER_ID_LONG, OnfConstants.ONF_ET_BUNDLE_ADD_MESSAGE, + OnfConstants.ONF_EXPERIMENTER, OnfConstants.ONF_ET_BUNDLE_ADD_MESSAGE.toJava(), ExperimenterDataOfChoice.class), new BundleAddMessageFactory()); switchConnectionProvider.registerExperimenterMessageDeserializer( new ExperimenterIdTypeDeserializerKey(OFConstants.OFP_VERSION_1_3, - OnfConstants.ONF_EXPERIMENTER_ID_LONG, OnfConstants.ONF_ET_BUNDLE_CONTROL, + OnfConstants.ONF_EXPERIMENTER, OnfConstants.ONF_ET_BUNDLE_CONTROL.toJava(), ExperimenterDataOfChoice.class), new org.opendaylight.openflowplugin.extension.onf.deserializer.BundleControlFactory()); switchConnectionProvider.registerErrorDeserializer( new ExperimenterIdDeserializerKey(OFConstants.OFP_VERSION_1_3, - OnfConstants.ONF_EXPERIMENTER_ID_LONG, ErrorMessage.class), + OnfConstants.ONF_EXPERIMENTER, ErrorMessage.class), new OnfExperimenterErrorFactory()); converterRegistrator.registerMessageConvertor( diff --git a/extension/openflowplugin-extension-onf/src/main/java/org/opendaylight/openflowplugin/extension/onf/converter/BundleAddMessageConverter.java b/extension/openflowplugin-extension-onf/src/main/java/org/opendaylight/openflowplugin/extension/onf/converter/BundleAddMessageConverter.java index 07f74be225..8b0d5264e0 100644 --- a/extension/openflowplugin-extension-onf/src/main/java/org/opendaylight/openflowplugin/extension/onf/converter/BundleAddMessageConverter.java +++ b/extension/openflowplugin-extension-onf/src/main/java/org/opendaylight/openflowplugin/extension/onf/converter/BundleAddMessageConverter.java @@ -54,6 +54,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.on import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.rev170124.experimenter.input.experimenter.data.of.choice.BundleAddMessageOnf; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.rev170124.experimenter.input.experimenter.data.of.choice.BundleAddMessageOnfBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.rev170124.experimenter.input.experimenter.data.of.choice.bundle.add.message.onf.OnfAddMessageGroupingDataBuilder; +import org.opendaylight.yangtools.yang.common.Uint32; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -194,7 +195,7 @@ public class BundleAddMessageConverter implements } @Override - public long getType() { + public Uint32 getType() { return OnfConstants.ONF_ET_BUNDLE_ADD_MESSAGE; } } diff --git a/extension/openflowplugin-extension-onf/src/main/java/org/opendaylight/openflowplugin/extension/onf/converter/BundleControlConverter.java b/extension/openflowplugin-extension-onf/src/main/java/org/opendaylight/openflowplugin/extension/onf/converter/BundleControlConverter.java index a60362a01a..5500601f93 100644 --- a/extension/openflowplugin-extension-onf/src/main/java/org/opendaylight/openflowplugin/extension/onf/converter/BundleControlConverter.java +++ b/extension/openflowplugin-extension-onf/src/main/java/org/opendaylight/openflowplugin/extension/onf/converter/BundleControlConverter.java @@ -19,6 +19,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.on import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.rev170124.experimenter.input.experimenter.data.of.choice.BundleControlOnf; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.rev170124.experimenter.input.experimenter.data.of.choice.BundleControlOnfBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.rev170124.experimenter.input.experimenter.data.of.choice.bundle.control.onf.OnfControlGroupingDataBuilder; +import org.opendaylight.yangtools.yang.common.Uint32; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -51,7 +52,7 @@ public class BundleControlConverter implements } @Override - public long getType() { + public Uint32 getType() { return OnfConstants.ONF_ET_BUNDLE_CONTROL; } } diff --git a/extension/openflowplugin-extension-onf/src/main/java/org/opendaylight/openflowplugin/extension/onf/deserializer/BundleControlFactory.java b/extension/openflowplugin-extension-onf/src/main/java/org/opendaylight/openflowplugin/extension/onf/deserializer/BundleControlFactory.java index 487f929712..38bd3704af 100644 --- a/extension/openflowplugin-extension-onf/src/main/java/org/opendaylight/openflowplugin/extension/onf/deserializer/BundleControlFactory.java +++ b/extension/openflowplugin-extension-onf/src/main/java/org/opendaylight/openflowplugin/extension/onf/deserializer/BundleControlFactory.java @@ -86,7 +86,7 @@ public class BundleControlFactory implements OFDeserializer, D .setExpType(expType); OFDeserializer deserializer = deserializerRegistry.getDeserializer( - new ExperimenterIdTypeDeserializerKey(EncodeConstants.OF13_VERSION_ID, experimenterId.toJava(), + new ExperimenterIdTypeDeserializerKey(EncodeConstants.OF_VERSION_1_3, experimenterId, expType.toJava(), BundlePropertyExperimenterData.class)); experimenterProperty.setBundlePropertyExperimenterData( deserializer.deserialize(message.readBytes(length - 12))); diff --git a/extension/openflowplugin-extension-onf/src/main/java/org/opendaylight/openflowplugin/extension/onf/serializer/AbstractBundleMessageFactory.java b/extension/openflowplugin-extension-onf/src/main/java/org/opendaylight/openflowplugin/extension/onf/serializer/AbstractBundleMessageFactory.java index cacbf6571d..6ca972c9a0 100644 --- a/extension/openflowplugin-extension-onf/src/main/java/org/opendaylight/openflowplugin/extension/onf/serializer/AbstractBundleMessageFactory.java +++ b/extension/openflowplugin-extension-onf/src/main/java/org/opendaylight/openflowplugin/extension/onf/serializer/AbstractBundleMessageFactory.java @@ -7,6 +7,8 @@ */ package org.opendaylight.openflowplugin.extension.onf.serializer; +import static org.opendaylight.yangtools.yang.common.netty.ByteBufUtils.writeUint32; + import io.netty.buffer.ByteBuf; import java.util.List; import org.opendaylight.openflowjava.protocol.api.extensibility.OFSerializer; @@ -20,6 +22,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.on import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.rev170124.bundle.property.grouping.bundle.property.entry.BundlePropertyExperimenter; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.rev170124.bundle.property.grouping.bundle.property.entry.bundle.property.experimenter.BundlePropertyExperimenterData; import org.opendaylight.yangtools.yang.binding.DataContainer; +import org.opendaylight.yangtools.yang.common.Uint32; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -61,12 +64,12 @@ public abstract class AbstractBundleMessageFactory impl } private void writeBundleExperimenterProperty(final BundlePropertyExperimenter property, final ByteBuf outBuffer) { - int experimenterId = property.getExperimenter().getValue().intValue(); - int expType = property.getExpType().intValue(); - outBuffer.writeInt(experimenterId); - outBuffer.writeInt(expType); + final Uint32 experimenterId = property.getExperimenter().getValue(); + final Uint32 expType = property.getExpType(); + writeUint32(outBuffer, experimenterId); + writeUint32(outBuffer, expType); OFSerializer serializer = serializerRegistry.getSerializer( - new ExperimenterIdTypeSerializerKey<>(EncodeConstants.OF13_VERSION_ID, experimenterId, expType, + new ExperimenterIdTypeSerializerKey<>(EncodeConstants.OF_VERSION_1_3, experimenterId, expType.toJava(), BundlePropertyExperimenterData.class)); serializer.serialize(property.getBundlePropertyExperimenterData(), outBuffer); } diff --git a/extension/openflowplugin-extension-onf/src/main/java/org/opendaylight/openflowplugin/extension/onf/serializer/BundleAddMessageFactory.java b/extension/openflowplugin-extension-onf/src/main/java/org/opendaylight/openflowplugin/extension/onf/serializer/BundleAddMessageFactory.java index 870cf73433..8878ce5600 100644 --- a/extension/openflowplugin-extension-onf/src/main/java/org/opendaylight/openflowplugin/extension/onf/serializer/BundleAddMessageFactory.java +++ b/extension/openflowplugin-extension-onf/src/main/java/org/opendaylight/openflowplugin/extension/onf/serializer/BundleAddMessageFactory.java @@ -12,11 +12,11 @@ import java.util.List; import org.opendaylight.openflowjava.protocol.api.extensibility.OFSerializer; import org.opendaylight.openflowjava.protocol.api.keys.MessageTypeKey; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.FlowMod; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.FlowMod$G; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.FlowModInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GroupMod; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GroupMod$G; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GroupModInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PortMod; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PortMod$G; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PortModInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.rev170124.bundle.add.message.grouping.BundleInnerMessage; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.rev170124.bundle.add.message.grouping.bundle.inner.message.BundleFlowModCase; @@ -31,7 +31,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.on public class BundleAddMessageFactory extends AbstractBundleMessageFactory { @Override - public void serialize(BundleAddMessageOnf input, ByteBuf outBuffer) { + public void serialize(final BundleAddMessageOnf input, final ByteBuf outBuffer) { outBuffer.writeInt(input.getOnfAddMessageGroupingData().getBundleId().getValue().intValue()); outBuffer.writeZero(2); writeBundleFlags(input.getOnfAddMessageGroupingData().getFlags(), outBuffer); @@ -51,18 +51,18 @@ public class BundleAddMessageFactory extends AbstractBundleMessageFactory clazz = message.implementedInterface(); if (clazz.equals(BundleFlowModCase.class)) { - OFSerializer serializer = serializerRegistry.getSerializer( - new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, FlowModInput.class)); + OFSerializer serializer = serializerRegistry.getSerializer( + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, FlowModInput.class)); serializer.serialize(((BundleFlowModCase)message) .getFlowModCaseData(), outBuffer); } else if (clazz.equals(BundleGroupModCase.class)) { - OFSerializer serializer = serializerRegistry.getSerializer( - new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, GroupModInput.class)); + OFSerializer serializer = serializerRegistry.getSerializer( + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, GroupModInput.class)); serializer.serialize(((BundleGroupModCase)message) .getGroupModCaseData(), outBuffer); } else if (clazz.equals(BundlePortModCase.class)) { - OFSerializer serializer = serializerRegistry.getSerializer( - new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, PortModInput.class)); + OFSerializer serializer = serializerRegistry.getSerializer( + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, PortModInput.class)); serializer.serialize(((BundlePortModCase)message) .getPortModCaseData(), outBuffer); } @@ -70,7 +70,7 @@ public class BundleAddMessageFactory extends AbstractBundleMessageFactory org.opendaylight.odlparent odlparent-lite - 8.1.1 + 9.0.2 diff --git a/extension/test-extension/pom.xml b/extension/test-extension/pom.xml index 38e083d17d..0202d7a589 100644 --- a/extension/test-extension/pom.xml +++ b/extension/test-extension/pom.xml @@ -52,7 +52,7 @@ model-flow-statistics - org.opendaylight.controller.model + org.opendaylight.openflowplugin.model model-inventory diff --git a/features-aggregator/features-openflowplugin/pom.xml b/features-aggregator/features-openflowplugin/pom.xml index b24dd19573..2636c77a43 100644 --- a/features-aggregator/features-openflowplugin/pom.xml +++ b/features-aggregator/features-openflowplugin/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent feature-repo-parent - 8.1.1 + 9.0.2 diff --git a/features-aggregator/odl-openflowplugin-app-arbitratorreconciliation/pom.xml b/features-aggregator/odl-openflowplugin-app-arbitratorreconciliation/pom.xml index a059a68b8b..88d9581864 100644 --- a/features-aggregator/odl-openflowplugin-app-arbitratorreconciliation/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-arbitratorreconciliation/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 8.1.1 + 9.0.2 diff --git a/features-aggregator/odl-openflowplugin-app-bulk-o-matic/pom.xml b/features-aggregator/odl-openflowplugin-app-bulk-o-matic/pom.xml index 945a22f5c5..71fffcb2db 100644 --- a/features-aggregator/odl-openflowplugin-app-bulk-o-matic/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-bulk-o-matic/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 8.1.1 + 9.0.2 diff --git a/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml b/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml index d52ab761b7..ab577fd50c 100644 --- a/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 8.1.1 + 9.0.2 diff --git a/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml b/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml index 9b846aff58..a6cabda971 100644 --- a/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 8.1.1 + 9.0.2 diff --git a/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml b/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml index 4452ecdc8b..623e7ea85f 100644 --- a/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 8.1.1 + 9.0.2 diff --git a/features-aggregator/odl-openflowplugin-app-lldp-speaker/pom.xml b/features-aggregator/odl-openflowplugin-app-lldp-speaker/pom.xml index 6736dde55b..ed825d7e6d 100644 --- a/features-aggregator/odl-openflowplugin-app-lldp-speaker/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-lldp-speaker/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 8.1.1 + 9.0.2 diff --git a/features-aggregator/odl-openflowplugin-app-notifications/pom.xml b/features-aggregator/odl-openflowplugin-app-notifications/pom.xml index 81f3491b6c..c0120bc081 100644 --- a/features-aggregator/odl-openflowplugin-app-notifications/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-notifications/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 8.1.1 + 9.0.2 diff --git a/features-aggregator/odl-openflowplugin-app-reconciliation-framework/pom.xml b/features-aggregator/odl-openflowplugin-app-reconciliation-framework/pom.xml index 904cf7696f..444f30d465 100644 --- a/features-aggregator/odl-openflowplugin-app-reconciliation-framework/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-reconciliation-framework/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 8.1.1 + 9.0.2 diff --git a/features-aggregator/odl-openflowplugin-app-southbound-cli/pom.xml b/features-aggregator/odl-openflowplugin-app-southbound-cli/pom.xml index 52410ed90f..beba2d55db 100644 --- a/features-aggregator/odl-openflowplugin-app-southbound-cli/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-southbound-cli/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 8.1.1 + 9.0.2 diff --git a/features-aggregator/odl-openflowplugin-app-table-miss-enforcer/pom.xml b/features-aggregator/odl-openflowplugin-app-table-miss-enforcer/pom.xml index 860e0ba250..cf29750cf7 100644 --- a/features-aggregator/odl-openflowplugin-app-table-miss-enforcer/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-table-miss-enforcer/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 8.1.1 + 9.0.2 diff --git a/features-aggregator/odl-openflowplugin-app-topology-lldp-discovery/pom.xml b/features-aggregator/odl-openflowplugin-app-topology-lldp-discovery/pom.xml index 4bacfd6aed..9ca5987356 100644 --- a/features-aggregator/odl-openflowplugin-app-topology-lldp-discovery/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-topology-lldp-discovery/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 8.1.1 + 9.0.2 diff --git a/features-aggregator/odl-openflowplugin-app-topology-manager/pom.xml b/features-aggregator/odl-openflowplugin-app-topology-manager/pom.xml index a9d270216a..b89387b626 100644 --- a/features-aggregator/odl-openflowplugin-app-topology-manager/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-topology-manager/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 8.1.1 + 9.0.2 diff --git a/features-aggregator/odl-openflowplugin-app-topology/pom.xml b/features-aggregator/odl-openflowplugin-app-topology/pom.xml index 7f5adeadac..db29e30af9 100644 --- a/features-aggregator/odl-openflowplugin-app-topology/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-topology/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 8.1.1 + 9.0.2 diff --git a/features-aggregator/odl-openflowplugin-drop-test/pom.xml b/features-aggregator/odl-openflowplugin-drop-test/pom.xml index b5bcde960c..c3a90de4c0 100644 --- a/features-aggregator/odl-openflowplugin-drop-test/pom.xml +++ b/features-aggregator/odl-openflowplugin-drop-test/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 8.1.1 + 9.0.2 diff --git a/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml b/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml index e7ff28bc72..bacccfb586 100644 --- a/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml +++ b/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 8.1.1 + 9.0.2 @@ -21,7 +21,7 @@ org.opendaylight.netconf netconf-artifacts - 1.13.1 + 2.0.0 import pom diff --git a/features-aggregator/odl-openflowplugin-flow-services/pom.xml b/features-aggregator/odl-openflowplugin-flow-services/pom.xml index e7c3f513a3..5b9e4a4583 100644 --- a/features-aggregator/odl-openflowplugin-flow-services/pom.xml +++ b/features-aggregator/odl-openflowplugin-flow-services/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 8.1.1 + 9.0.2 diff --git a/features-aggregator/odl-openflowplugin-libraries/pom.xml b/features-aggregator/odl-openflowplugin-libraries/pom.xml index 3dc17c2ab6..7468b0ec27 100644 --- a/features-aggregator/odl-openflowplugin-libraries/pom.xml +++ b/features-aggregator/odl-openflowplugin-libraries/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 8.1.1 + 9.0.2 diff --git a/features-aggregator/odl-openflowplugin-libraries/src/main/feature/feature.xml b/features-aggregator/odl-openflowplugin-libraries/src/main/feature/feature.xml index cab2470fbb..f819fecba3 100644 --- a/features-aggregator/odl-openflowplugin-libraries/src/main/feature/feature.xml +++ b/features-aggregator/odl-openflowplugin-libraries/src/main/feature/feature.xml @@ -1,6 +1,6 @@ - odl-guava + odl-guava diff --git a/features-aggregator/odl-openflowplugin-nsf-model/pom.xml b/features-aggregator/odl-openflowplugin-nsf-model/pom.xml index 96d00b61c7..61a596ecea 100644 --- a/features-aggregator/odl-openflowplugin-nsf-model/pom.xml +++ b/features-aggregator/odl-openflowplugin-nsf-model/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 8.1.1 + 9.0.2 @@ -21,7 +21,7 @@ org.opendaylight.mdsal mdsal-artifacts - 7.0.6 + 8.0.0 import pom @@ -30,7 +30,7 @@ org.opendaylight.controller controller-artifacts - 3.0.7 + 4.0.0 import pom @@ -46,20 +46,6 @@ xml - - org.opendaylight.controller - odl-mdsal-model-inventory - features - xml - - - - org.opendaylight.controller - odl-controller-model-topology - features - xml - - ${project.groupId}.openflowjava odl-openflowjava-protocol @@ -86,6 +72,17 @@ ${project.version} + + org.opendaylight.openflowplugin.model + model-inventory + ${project.version} + + + + org.opendaylight.openflowplugin.model + model-topology + ${project.version} + diff --git a/features-aggregator/odl-openflowplugin-nsf-model/src/main/feature/feature.xml b/features-aggregator/odl-openflowplugin-nsf-model/src/main/feature/feature.xml index f110309bd1..021d737cbf 100644 --- a/features-aggregator/odl-openflowplugin-nsf-model/src/main/feature/feature.xml +++ b/features-aggregator/odl-openflowplugin-nsf-model/src/main/feature/feature.xml @@ -1,8 +1,6 @@ - odl-mdsal-model-odl-l2-types - odl-mdsal-model-inventory - odl-controller-model-topology + odl-mdsal-model-odl-l2-types diff --git a/features-aggregator/odl-openflowplugin-southbound/pom.xml b/features-aggregator/odl-openflowplugin-southbound/pom.xml index fc4a1d3cef..8f57a43409 100644 --- a/features-aggregator/odl-openflowplugin-southbound/pom.xml +++ b/features-aggregator/odl-openflowplugin-southbound/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 8.1.1 + 9.0.2 @@ -29,14 +29,14 @@ org.opendaylight.controller controller-artifacts - 3.0.7 + 4.0.0 import pom org.opendaylight.infrautils infrautils-artifacts - 1.9.6 + 2.0.2 import pom diff --git a/features-aggregator/odl-openflowplugin-southbound/src/main/feature/feature.xml b/features-aggregator/odl-openflowplugin-southbound/src/main/feature/feature.xml index e569910925..a2b463ebf6 100644 --- a/features-aggregator/odl-openflowplugin-southbound/src/main/feature/feature.xml +++ b/features-aggregator/odl-openflowplugin-southbound/src/main/feature/feature.xml @@ -2,7 +2,7 @@ mvn:org.opendaylight.openflowplugin/openflowplugin-blueprint-config/${project.version}/cfg/config - odl-mdsal-broker - odl-infrautils-diagstatus + odl-mdsal-broker + odl-infrautils-diagstatus diff --git a/features-aggregator/pom.xml b/features-aggregator/pom.xml index ffe64b5399..4b1802e08a 100644 --- a/features-aggregator/pom.xml +++ b/features-aggregator/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 8.1.1 + 9.0.2 diff --git a/libraries/pom.xml b/libraries/pom.xml index c2c99a0a93..3730dd7d44 100644 --- a/libraries/pom.xml +++ b/libraries/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent-lite - 8.1.1 + 9.0.2 diff --git a/model/model-flow-base/pom.xml b/model/model-flow-base/pom.xml index b960d5fca5..c43b5cae82 100644 --- a/model/model-flow-base/pom.xml +++ b/model/model-flow-base/pom.xml @@ -16,7 +16,7 @@ - org.opendaylight.controller.model + org.opendaylight.openflowplugin.model model-inventory diff --git a/model/model-flow-service/pom.xml b/model/model-flow-service/pom.xml index 6ca4f2d8e5..1cad7f1081 100644 --- a/model/model-flow-service/pom.xml +++ b/model/model-flow-service/pom.xml @@ -20,7 +20,7 @@ model-flow-base - org.opendaylight.controller.model + ${project.groupId} model-inventory diff --git a/model/model-flow-statistics/pom.xml b/model/model-flow-statistics/pom.xml index 49477535d4..fd05bd9092 100644 --- a/model/model-flow-statistics/pom.xml +++ b/model/model-flow-statistics/pom.xml @@ -24,7 +24,7 @@ model-flow-service - org.opendaylight.controller.model + ${project.groupId} model-inventory diff --git a/model/model-inventory/pom.xml b/model/model-inventory/pom.xml new file mode 100644 index 0000000000..f043cc3bcf --- /dev/null +++ b/model/model-inventory/pom.xml @@ -0,0 +1,41 @@ + + + + + + 4.0.0 + + org.opendaylight.openflowplugin + openflowplugin-parent + 0.13.0-SNAPSHOT + ../../parent + + + org.opendaylight.openflowplugin.model + model-inventory + bundle + + + + org.opendaylight.mdsal.binding.model.ietf + rfc6991-ietf-inet-types + + + org.opendaylight.mdsal.model + yang-ext + + + + + scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git + scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git + https://wiki.opendaylight.org/view/OpenDaylight_OpenFlow_Plugin:Main + HEAD + + diff --git a/model/model-inventory/src/main/yang/opendaylight-inventory.yang b/model/model-inventory/src/main/yang/opendaylight-inventory.yang new file mode 100644 index 0000000000..f58fcc48fe --- /dev/null +++ b/model/model-inventory/src/main/yang/opendaylight-inventory.yang @@ -0,0 +1,251 @@ +module opendaylight-inventory { + namespace "urn:opendaylight:inventory"; + prefix inv; + + import yang-ext { prefix ext; revision-date "2013-07-09"; } + import ietf-inet-types { prefix inet; revision-date "2013-07-15"; } + + revision "2013-08-19" { + description "Initial revision of Inventory model"; + } + + typedef support-type { + type enumeration { + enum native; + enum emulated; + enum not-supported; + } + } + + typedef node-id { + type inet:uri; + description "Identifier for a particular node. For example: + + myprotocol: + + myprotocol:12 + + It is a good practice to always lead with a scoping + identifier. In the example above the scoping was + 'myprotocol'. In your app you could use 'myapp' etc."; + } + + typedef node-connector-id { + type inet:uri; + description "Identifier for a particular node-connector. For example: + + myprotocol: + myprotocol:3 + + It is a good practice to always lead with a scoping + identifier. In the example above the scoping was + 'myprotocol'. In your app you could use 'myapp' etc."; + } + + // YANG does not have a statement which limits the scope of an + // instance-identifier to a particular subtree, which is why we are using + // a type capture and not an instance-identifier to define a node-ref and + // a node-connector-ref. + typedef node-ref { + type instance-identifier; + description "A reference that points to an + opendaylight-light:nodes/node in the data tree."; + } + + typedef node-connector-ref { + type instance-identifier; + description "A reference that points to an + opendaylight-list:nodes/node/{node-id}/node-connector in + the data tree."; + } + + identity node-context { + description "A node-context is a classifier for node elements which + allows an RPC to provide a service on behalf of a + particular element in the data tree."; + } + + identity node-connector-context { + description "A node-connector-context is a classifier for + node-connector elements which allows an RPC to provide + a service on behalf of a particular element in the data + tree."; + } + + // We are defining a base identity here because there are limitations with + // YANG enums. YANG does not allow you to extend enumeratations, therefore + // by defining a base identity we allow other yang files to extend this + // identity to define additional "enumerations". By using node-type as + // their base they are able to pass their object to fields that accept + // "node-types" while uniquely describing their type of node, such as + // "router-node" or "switch-node" etc. + // See https://wiki.opendaylight.org/view/YANG_Tools:YANG_to_Java_Mapping#Identity + // for more information. + identity node-type { + description "A base identity definition which represents a generic + node type and can be extended in other yang files."; + } + + identity node-connector-type { + description "A base identity definition which represents a generic + node connector type and can be extended in other YANG + files."; + } + + grouping node { + description "Describes the contents of a generic node - + essentially an ID and a list of node-connectors. + Acts as an augmentation point where other YANG files + can add additional information."; + + leaf id { + type node-id; + description "The unique identifier for the node."; + } + + list "node-connector" { + key "id"; + + description "A list of node connectors that belong this node."; + ext:context-instance "node-connector-context"; + + uses node-connector; + } + } + + grouping node-connector { + description "Describes a generic node connector which consists of an ID. + Acts as an augmentation point where other YANG files can + add additional information."; + + leaf id { + type node-connector-id; + description "The unique identifier for the node-connector."; + } + } + + grouping node-context-ref { + description "A helper grouping which contains a reference to a node + classified with a node-context. This allows RPCs in other + YANG files to refine their input to a particular node + instance."; + + leaf node { + ext:context-reference "node-context"; + type node-ref; + description "A reference to a particular node."; + } + } + + // Base structure + container nodes { + description "The root container of all nodes."; + + list node { + key "id"; + ext:context-instance "node-context"; + description "A list of nodes (as defined by the 'grouping node')."; + uses node; //this refers to the 'grouping node' defined above. + } + } + + // The following notifications should really be replaced by direct writes + // to the data tree with data change listeners listening to those changes. + // Notifications should be reserved for one time events which do not + // require persistence to the data tree. + notification node-updated { + status deprecated; + + description "A notification sent by someone who realized there was + a modification to a node, but did not modify the data + tree. + + Describes that something on the node has been updated + (including addition of a new node), but is for whatever + reason is not modifying the data tree. + + Deprecated: If a process determines that a node was + updated, then that logic should update the node using + the DataBroker directly. Listeners interested update + changes should register a data change listener for + notifications on removals."; + + leaf node-ref { + ext:context-reference "node-context"; + description "A reference to the node which changed."; + + type node-ref; + } + uses node; + } + + notification node-connector-updated { + status deprecated; + + description "A notification sent by someone who realized there was + a modification to a node-connector, but did not modify + the data tree. + + Describes that something on the node-connector has been + updated (including addition of a new node-connector), but + is for whatever reason is not modifying the data tree. + + Deprecated: If a process determines that a node-connector + was updated, then that logic should update the + node-connector using the DataBroker directly. Listeners + interested update changes should register a data change + listener for notifications on removals."; + + leaf node-connector-ref { + ext:context-reference "node-connector-context"; + type node-connector-ref; + description "A reference to the node-connector which changed."; + } + uses node-connector; + } + + notification node-removed { + status deprecated; + + description "A notification sent by someone who realized there was + a node was removed, but did not modify the data tree. + + Describes that a node has been removed but is for whatever + reason is not modifying the data tree. + + Deprecated: If a process determines that a node was + removed, then that logic should remove the node from + the DataBroker directly. Listeners interested in changes + should register a data change listener for notifications + on removals."; + + leaf node-ref { + description "A reference to the node that was removed."; + ext:context-reference "node-context"; + type node-ref; + } + } + + notification node-connector-removed { + status deprecated; + + description "A notification sent by someone who realized there was + a node-connector was removed, but did not modify the data + tree. + + Describes that a node-connector has been removed but is + for whatever reason is not modifying the data tree. + + Deprecated: If a process determines that a node-connector + was removed, then that logic should remove the + node-connector from the DataBroker directly. Listeners + interested in changes should register a data change + listener for notifications on removals."; + + leaf node-connector-ref { + description "A reference to the node-connector that was removed."; + ext:context-reference "node-connector-context"; + type node-connector-ref; + } + } +} diff --git a/model/model-topology/pom.xml b/model/model-topology/pom.xml new file mode 100644 index 0000000000..c47c81121a --- /dev/null +++ b/model/model-topology/pom.xml @@ -0,0 +1,41 @@ + + + + + + 4.0.0 + + org.opendaylight.openflowplugin + openflowplugin-parent + 0.13.0-SNAPSHOT + ../../parent + + + org.opendaylight.openflowplugin.model + model-topology + bundle + + + + org.opendaylight.openflowplugin.model + model-inventory + + + org.opendaylight.mdsal.model + ietf-topology + + + + + scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git + scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git + https://wiki.opendaylight.org/view/OpenDaylight_OpenFlow_Plugin:Main + HEAD + + diff --git a/model/model-topology/src/main/yang/opendaylight-topology-inventory.yang b/model/model-topology/src/main/yang/opendaylight-topology-inventory.yang new file mode 100644 index 0000000000..86a02b85d2 --- /dev/null +++ b/model/model-topology/src/main/yang/opendaylight-topology-inventory.yang @@ -0,0 +1,34 @@ +module opendaylight-topology-inventory { + yang-version 1; + namespace "urn:opendaylight:model:topology:inventory"; + // replace with IANA namespace when assigned + prefix "nt"; + + import yang-ext { prefix "ext"; } + import opendaylight-inventory {prefix "inv";} + import network-topology {prefix "topo"; revision-date "2013-10-21"; } + + organization "TBD"; + + contact "WILL-BE-DEFINED-LATER"; + + revision 2013-10-30 { + description + "Initial revision."; + } + + augment "/topo:network-topology/topo:topology/topo:node" { + ext:augment-identifier "inventory-node"; + leaf inventory-node-ref { + type inv:node-ref; + } + } + + augment "/topo:network-topology/topo:topology/topo:node/topo:termination-point" { + ext:augment-identifier "inventory-node-connector"; + leaf inventory-node-connector-ref { + ext:context-reference "inv:node-connector-context"; + type inv:node-connector-ref; + } + } +} diff --git a/model/pom.xml b/model/pom.xml index e47292d5d8..3debf3a2a9 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent odlparent-lite - 8.1.1 + 9.0.2 @@ -24,6 +24,8 @@ model-flow-base model-flow-service model-flow-statistics + model-inventory + model-topology diff --git a/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml b/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml index dce7bf0cf9..fda941cd64 100644 --- a/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml +++ b/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent feature-repo-parent - 8.1.1 + 9.0.2 diff --git a/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml b/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml index 371c9ef11e..75d4768391 100644 --- a/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml +++ b/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent single-feature-parent - 8.1.1 + 9.0.2 @@ -33,7 +33,7 @@ org.opendaylight.infrautils infrautils-artifacts - 1.9.6 + 2.0.2 import pom @@ -42,7 +42,7 @@ org.opendaylight.mdsal mdsal-artifacts - 7.0.6 + 8.0.0 import pom diff --git a/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/src/main/feature/feature.xml b/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/src/main/feature/feature.xml index f415161eec..6b9bc77586 100644 --- a/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/src/main/feature/feature.xml +++ b/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/src/main/feature/feature.xml @@ -4,8 +4,8 @@ mvn:org.opendaylight.openflowplugin.openflowjava/openflowjava-blueprint-config/${project.version}/xml/config mvn:org.opendaylight.openflowplugin.openflowjava/openflowjava-blueprint-config/${project.version}/xml/legacyConfig - odl-netty-4 - odl-mdsal-model-rfc6991 - odl-infrautils-diagstatus + odl-netty-4 + odl-mdsal-model-rfc6991 + odl-infrautils-diagstatus diff --git a/openflowjava/features-openflowjava-aggregator/pom.xml b/openflowjava/features-openflowjava-aggregator/pom.xml index e69ad918ee..c2bfc5419f 100644 --- a/openflowjava/features-openflowjava-aggregator/pom.xml +++ b/openflowjava/features-openflowjava-aggregator/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 8.1.1 + 9.0.2 diff --git a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/connection/OutboundQueue.java b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/connection/OutboundQueue.java index 250cc8b08b..0d41bf1d7f 100644 --- a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/connection/OutboundQueue.java +++ b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/connection/OutboundQueue.java @@ -13,6 +13,7 @@ import java.util.function.Function; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader; +import org.opendaylight.yangtools.yang.common.Uint32; @Beta public interface OutboundQueue { @@ -20,7 +21,7 @@ public interface OutboundQueue { * Reserve an entry in the outbound queue. * @return XID for the new message, or null if the queue is full */ - Long reserveEntry(); + Uint32 reserveEntry(); /** * Commit the specified offset using a message. Specified callback will @@ -48,7 +49,7 @@ public interface OutboundQueue { * @throws IllegalArgumentException if the slot is already committed or was never reserved. */ void commitEntry( - @NonNull Long xid, + @NonNull Uint32 xid, @Nullable OfHeader message, @Nullable FutureCallback callback); @@ -79,7 +80,7 @@ public interface OutboundQueue { * @throws IllegalArgumentException if the slot is already committed or was never reserved. */ void commitEntry( - @NonNull Long xid, + @NonNull Uint32 xid, @Nullable OfHeader message, @Nullable FutureCallback callback, @Nullable Function isComplete); diff --git a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/connection/OutboundQueueHandler.java b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/connection/OutboundQueueHandler.java index a345fbb9be..670dad12b3 100644 --- a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/connection/OutboundQueueHandler.java +++ b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/connection/OutboundQueueHandler.java @@ -10,6 +10,7 @@ package org.opendaylight.openflowjava.protocol.api.connection; import com.google.common.annotations.Beta; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.BarrierInput; +import org.opendaylight.yangtools.yang.common.Uint32; /** * Handler of the outbound queue. The queue has a maximum depth assigned when the @@ -25,7 +26,7 @@ public interface OutboundQueueHandler { * @param xid XID for the barrier message * @return New barrier message. */ - @NonNull BarrierInput createBarrierRequest(@NonNull Long xid); + @NonNull BarrierInput createBarrierRequest(@NonNull Uint32 xid); /** * Invoked whenever the underlying queue is refreshed. Implementations should diff --git a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageCodeKey.java b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageCodeKey.java index e8b8e9541f..87ebec5374 100644 --- a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageCodeKey.java +++ b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageCodeKey.java @@ -8,6 +8,7 @@ package org.opendaylight.openflowjava.protocol.api.extensibility; import org.opendaylight.openflowjava.protocol.api.keys.MessageCodeKey; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Enhanced MessageCodeKey. @@ -15,7 +16,6 @@ import org.opendaylight.openflowjava.protocol.api.keys.MessageCodeKey; * @author michal.polkorab */ public class EnhancedMessageCodeKey extends MessageCodeKey { - private final int msgType2; /** @@ -26,7 +26,7 @@ public class EnhancedMessageCodeKey extends MessageCodeKey { * @param value2 used as detailed distinguisher * @param clazz class of object that is going to be deserialized */ - public EnhancedMessageCodeKey(short version, int value, int value2, Class clazz) { + public EnhancedMessageCodeKey(final Uint8 version, final int value, final int value2, final Class clazz) { super(version, value, clazz); this.msgType2 = value2; } @@ -40,7 +40,7 @@ public class EnhancedMessageCodeKey extends MessageCodeKey { } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } diff --git a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageTypeKey.java b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageTypeKey.java index 7747821cc2..352f4a72f6 100644 --- a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageTypeKey.java +++ b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageTypeKey.java @@ -8,6 +8,7 @@ package org.opendaylight.openflowjava.protocol.api.extensibility; import org.opendaylight.openflowjava.protocol.api.keys.MessageTypeKey; +import org.opendaylight.yangtools.yang.common.Uint8; /** @@ -28,7 +29,7 @@ public class EnhancedMessageTypeKey extends MessageTypeKey { * @param msgType main type * @param msgType2 subtype */ - public EnhancedMessageTypeKey(short msgVersion, Class msgType, Class msgType2) { + public EnhancedMessageTypeKey(final Uint8 msgVersion, final Class msgType, final Class msgType2) { super(msgVersion, msgType); this.msgType2 = msgType2; } @@ -42,7 +43,7 @@ public class EnhancedMessageTypeKey extends MessageTypeKey { } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } diff --git a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ActionDeserializerKey.java b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ActionDeserializerKey.java index 3f7695a681..86208e745d 100644 --- a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ActionDeserializerKey.java +++ b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ActionDeserializerKey.java @@ -5,10 +5,11 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.api.keys; +import java.util.Objects; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Key for an action deserializer. @@ -16,7 +17,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev1 * @author michal.polkorab */ public class ActionDeserializerKey extends MessageCodeKey { - private final Long experimenterId; /** @@ -26,8 +26,7 @@ public class ActionDeserializerKey extends MessageCodeKey { * @param type action type * @param experimenterId experimenter / vendor ID */ - public ActionDeserializerKey(short version, - int type, Long experimenterId) { + public ActionDeserializerKey(final Uint8 version, final int type, final Long experimenterId) { super(version, type, Action.class); this.experimenterId = experimenterId; } @@ -41,7 +40,7 @@ public class ActionDeserializerKey extends MessageCodeKey { } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } @@ -52,14 +51,7 @@ public class ActionDeserializerKey extends MessageCodeKey { return false; } ActionDeserializerKey other = (ActionDeserializerKey) obj; - if (experimenterId == null) { - if (other.experimenterId != null) { - return false; - } - } else if (!experimenterId.equals(other.experimenterId)) { - return false; - } - return true; + return Objects.equals(experimenterId, other.experimenterId); } @Override diff --git a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ActionSerializerKey.java b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ActionSerializerKey.java index b07989d051..390b5a39a3 100644 --- a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ActionSerializerKey.java +++ b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ActionSerializerKey.java @@ -7,9 +7,11 @@ */ package org.opendaylight.openflowjava.protocol.api.keys; +import java.util.Objects; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.ActionChoice; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Key for an action serializer. @@ -30,7 +32,7 @@ public class ActionSerializerKey extends MessageTypeKey< * @param actionType type of action * @param experimenterId experimenter / vendor ID */ - public ActionSerializerKey(final short msgVersion, final Class actionType, final Uint32 experimenterId) { + public ActionSerializerKey(final Uint8 msgVersion, final Class actionType, final Uint32 experimenterId) { super(msgVersion, Action.class); this.actionType = actionType; this.experimenterId = experimenterId; @@ -57,18 +59,10 @@ public class ActionSerializerKey extends MessageTypeKey< return false; } ActionSerializerKey other = (ActionSerializerKey) obj; - if (actionType == null) { - if (other.actionType != null) { - return false; - } - } else if (!actionType.equals(other.actionType)) { + if (!Objects.equals(actionType, other.actionType)) { return false; } - if (experimenterId == null) { - if (other.experimenterId != null) { - return false; - } - } else if (!experimenterId.equals(other.experimenterId)) { + if (!Objects.equals(experimenterId, other.experimenterId)) { return false; } return true; diff --git a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ExperimenterActionDeserializerKey.java b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ExperimenterActionDeserializerKey.java index ea8ddee55f..bfe0ee99f9 100644 --- a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ExperimenterActionDeserializerKey.java +++ b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ExperimenterActionDeserializerKey.java @@ -5,10 +5,10 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.api.keys; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Key for an experimenter action deserializer. @@ -17,14 +17,13 @@ import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; */ public final class ExperimenterActionDeserializerKey extends ActionDeserializerKey implements ExperimenterDeserializerKey { - /** * Constructor. * * @param version protocol wire version * @param experimenterId experimenter / vendor ID */ - public ExperimenterActionDeserializerKey(short version, Long experimenterId) { + public ExperimenterActionDeserializerKey(final Uint8 version, final Long experimenterId) { super(version, EncodeConstants.EXPERIMENTER_VALUE, experimenterId); } } diff --git a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ExperimenterActionSerializerKey.java b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ExperimenterActionSerializerKey.java index 908bd983a2..6789fffa28 100644 --- a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ExperimenterActionSerializerKey.java +++ b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ExperimenterActionSerializerKey.java @@ -7,9 +7,11 @@ */ package org.opendaylight.openflowjava.protocol.api.keys; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.action.container.action.choice.ExperimenterIdCase; +import java.util.Objects; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.action.ExperimenterIdCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.ExperimenterActionSubType; import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Key for an experimenter action serializer. @@ -27,7 +29,7 @@ public final class ExperimenterActionSerializerKey extends ActionSerializerKey actionSubType) { super(msgVersion, ExperimenterIdCase.class, experimenterId); this.actionSubType = actionSubType; @@ -53,11 +55,7 @@ public final class ExperimenterActionSerializerKey extends ActionSerializerKey ExperimenterIdDeserializerKey(final short version, final long experimenterId, + public ExperimenterIdDeserializerKey(final Uint8 version, final Uint32 experimenterId, final Class objectClass) { super(version, EncodeConstants.EXPERIMENTER_VALUE, objectClass); - this.experimenterId = experimenterId; + this.experimenterId = requireNonNull(experimenterId); } - protected int hashCodeOfLong(long longValue) { + protected int hashCodeOfLong(final long longValue) { return (int) (longValue ^ longValue >>> 32); } @@ -42,12 +44,12 @@ public class ExperimenterIdDeserializerKey extends MessageCodeKey implements Exp public int hashCode() { final int prime = 31; int result = super.hashCode(); - result = prime * result + hashCodeOfLong(experimenterId); + result = prime * result + experimenterId.hashCode(); return result; } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } diff --git a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ExperimenterIdMeterSubTypeSerializerKey.java b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ExperimenterIdMeterSubTypeSerializerKey.java index e6ad13e06e..3e1da12415 100755 --- a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ExperimenterIdMeterSubTypeSerializerKey.java +++ b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ExperimenterIdMeterSubTypeSerializerKey.java @@ -7,8 +7,11 @@ */ package org.opendaylight.openflowjava.protocol.api.keys; +import java.util.Objects; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ExperimenterMeterBandSubType; import org.opendaylight.yangtools.yang.binding.DataContainer; +import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Key for an experimenter id meter subtype serializer. @@ -16,7 +19,6 @@ import org.opendaylight.yangtools.yang.binding.DataContainer; * @author hyy on 2016/9/8. */ public class ExperimenterIdMeterSubTypeSerializerKey extends ExperimenterIdSerializerKey { - private final Class meterSubType; /** @@ -27,8 +29,8 @@ public class ExperimenterIdMeterSubTypeSerializerKey ex * @param objectClass class of object to be serialized * @param meterSubType vendor defined subtype */ - public ExperimenterIdMeterSubTypeSerializerKey(short msgVersion, long experimenterId, - Class objectClass, Class meterSubType) { + public ExperimenterIdMeterSubTypeSerializerKey(final Uint8 msgVersion, final Uint32 experimenterId, + final Class objectClass, final Class meterSubType) { super(msgVersion, experimenterId, objectClass); this.meterSubType = meterSubType; } @@ -42,7 +44,7 @@ public class ExperimenterIdMeterSubTypeSerializerKey ex } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } @@ -53,11 +55,7 @@ public class ExperimenterIdMeterSubTypeSerializerKey ex return false; } ExperimenterIdMeterSubTypeSerializerKey other = (ExperimenterIdMeterSubTypeSerializerKey) obj; - if (meterSubType == null) { - if (other.meterSubType != null) { - return false; - } - } else if (!meterSubType.equals(other.meterSubType)) { + if (!Objects.equals(meterSubType, other.meterSubType)) { return false; } return true; diff --git a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ExperimenterIdSerializerKey.java b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ExperimenterIdSerializerKey.java index bdbe978820..393ce4a65a 100644 --- a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ExperimenterIdSerializerKey.java +++ b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ExperimenterIdSerializerKey.java @@ -5,10 +5,13 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.api.keys; +import static java.util.Objects.requireNonNull; + import org.opendaylight.yangtools.yang.binding.DataContainer; +import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Key for an experimenter id serializer. @@ -19,7 +22,7 @@ import org.opendaylight.yangtools.yang.binding.DataContainer; public class ExperimenterIdSerializerKey extends MessageTypeKey implements ExperimenterSerializerKey { - private final long experimenterId; + private final Uint32 experimenterId; /** * Constructor. @@ -28,26 +31,26 @@ public class ExperimenterIdSerializerKey extends Messag * @param experimenterId experimenter / vendor ID * @param objectClass class of object to be serialized */ - public ExperimenterIdSerializerKey(short msgVersion, - long experimenterId, Class objectClass) { + public ExperimenterIdSerializerKey(final Uint8 msgVersion, + final Uint32 experimenterId, final Class objectClass) { super(msgVersion, objectClass); - this.experimenterId = experimenterId; + this.experimenterId = requireNonNull(experimenterId); } @Override public int hashCode() { final int prime = 31; int result = super.hashCode(); - result = prime * result + hashCodeOfLong(experimenterId); + result = prime * result + experimenterId.hashCode(); return result; } - protected int hashCodeOfLong(long longValue) { + protected int hashCodeOfLong(final long longValue) { return (int) (longValue ^ longValue >>> 32); } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } diff --git a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ExperimenterIdTypeDeserializerKey.java b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ExperimenterIdTypeDeserializerKey.java index 23b2dfdd49..da228c15a0 100644 --- a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ExperimenterIdTypeDeserializerKey.java +++ b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ExperimenterIdTypeDeserializerKey.java @@ -5,10 +5,11 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.api.keys; import org.opendaylight.yangtools.yang.binding.DataContainer; +import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Key for an experimenter id type deserializer. @@ -16,7 +17,6 @@ import org.opendaylight.yangtools.yang.binding.DataContainer; * @author michal.polkorab */ public class ExperimenterIdTypeDeserializerKey extends ExperimenterIdDeserializerKey { - private final long type; /** @@ -28,8 +28,8 @@ public class ExperimenterIdTypeDeserializerKey extends ExperimenterIdDeserialize * @param type data type according to vendor implementation * @param objectClass class of object to be serialized */ - public ExperimenterIdTypeDeserializerKey(final short version, final long experimenterId, - final long type, Class objectClass) { + public ExperimenterIdTypeDeserializerKey(final Uint8 version, final Uint32 experimenterId, + final long type, final Class objectClass) { super(version, experimenterId, objectClass); this.type = type; } @@ -43,7 +43,7 @@ public class ExperimenterIdTypeDeserializerKey extends ExperimenterIdDeserialize } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (!super.equals(obj)) { return false; } diff --git a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ExperimenterIdTypeSerializerKey.java b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ExperimenterIdTypeSerializerKey.java index cbd10c1a5a..e809bf0c81 100644 --- a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ExperimenterIdTypeSerializerKey.java +++ b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ExperimenterIdTypeSerializerKey.java @@ -5,10 +5,11 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.api.keys; import org.opendaylight.yangtools.yang.binding.DataContainer; +import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Key for an experimenter id type serializer. @@ -28,8 +29,8 @@ public class ExperimenterIdTypeSerializerKey extends Ex * @param type data type according to vendor implementation * @param objectClass class of object to be serialized */ - public ExperimenterIdTypeSerializerKey(short msgVersion, - long experimenterId, long type, Class objectClass) { + public ExperimenterIdTypeSerializerKey(final Uint8 msgVersion, + final Uint32 experimenterId, final long type, final Class objectClass) { super(msgVersion, experimenterId, objectClass); this.type = type; } @@ -43,7 +44,7 @@ public class ExperimenterIdTypeSerializerKey extends Ex } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (!super.equals(obj)) { return false; } diff --git a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ExperimenterInstructionDeserializerKey.java b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ExperimenterInstructionDeserializerKey.java index 77fe9ca69c..b9fb7ead96 100644 --- a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ExperimenterInstructionDeserializerKey.java +++ b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ExperimenterInstructionDeserializerKey.java @@ -5,10 +5,10 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.api.keys; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Key for an experimenter instruction deserializer. @@ -24,8 +24,7 @@ public final class ExperimenterInstructionDeserializerKey extends InstructionDes * @param version protocol wire version * @param experimenterId experimenter (vendor) identifier */ - public ExperimenterInstructionDeserializerKey(short version, Long experimenterId) { + public ExperimenterInstructionDeserializerKey(final Uint8 version, final Long experimenterId) { super(version, EncodeConstants.EXPERIMENTER_VALUE, experimenterId); } - } diff --git a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ExperimenterInstructionSerializerKey.java b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ExperimenterInstructionSerializerKey.java index abd9dd3b21..7199f4a1d7 100644 --- a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ExperimenterInstructionSerializerKey.java +++ b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ExperimenterInstructionSerializerKey.java @@ -9,6 +9,7 @@ package org.opendaylight.openflowjava.protocol.api.keys; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.instruction.container.instruction.choice.ExperimenterIdCase; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Key for an experimenter instruction serializer. @@ -16,15 +17,13 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225 * @author michal.polkorab */ public final class ExperimenterInstructionSerializerKey extends InstructionSerializerKey { - /** * Constructor. * * @param msgVersion protocol wire version * @param experimenterId experimenter / vendor ID */ - public ExperimenterInstructionSerializerKey(short msgVersion, Long experimenterId) { + public ExperimenterInstructionSerializerKey(final Uint8 msgVersion, final Long experimenterId) { super(msgVersion, ExperimenterIdCase.class, experimenterId); } - } diff --git a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionDeserializerKey.java b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionDeserializerKey.java index 146bd919aa..778c5cb94e 100644 --- a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionDeserializerKey.java +++ b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionDeserializerKey.java @@ -8,7 +8,9 @@ package org.opendaylight.openflowjava.protocol.api.keys; +import java.util.Objects; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction.rev130731.instructions.grouping.Instruction; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Key for an instruction deserializer. @@ -26,7 +28,7 @@ public class InstructionDeserializerKey extends MessageCodeKey { * @param type instruction type * @param experimenterId experimenter (vendor) identifier */ - public InstructionDeserializerKey(short version, int type, Long experimenterId) { + public InstructionDeserializerKey(final Uint8 version, final int type, final Long experimenterId) { super(version, type, Instruction.class); this.experimenterId = experimenterId; } @@ -40,7 +42,7 @@ public class InstructionDeserializerKey extends MessageCodeKey { } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } @@ -51,11 +53,7 @@ public class InstructionDeserializerKey extends MessageCodeKey { return false; } InstructionDeserializerKey other = (InstructionDeserializerKey) obj; - if (experimenterId == null) { - if (other.experimenterId != null) { - return false; - } - } else if (!experimenterId.equals(other.experimenterId)) { + if (!Objects.equals(experimenterId, other.experimenterId)) { return false; } return true; diff --git a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionSerializerKey.java b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionSerializerKey.java index ad2e1400ff..dedaf93f45 100644 --- a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionSerializerKey.java +++ b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionSerializerKey.java @@ -8,8 +8,10 @@ package org.opendaylight.openflowjava.protocol.api.keys; +import java.util.Objects; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction.rev130731.instruction.grouping.InstructionChoice; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction.rev130731.instructions.grouping.Instruction; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Key for an instruction serializer. @@ -30,8 +32,7 @@ public class InstructionSerializerKey * @param instructionType type of instruction * @param experimenterId experimenter / vendor ID */ - public InstructionSerializerKey(short msgVersion, Class instructionType, - Long experimenterId) { + public InstructionSerializerKey(final Uint8 msgVersion, final Class instructionType, final Long experimenterId) { super(msgVersion, Instruction.class); this.instructionType = instructionType; this.experimenterId = experimenterId; @@ -47,7 +48,7 @@ public class InstructionSerializerKey } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } @@ -58,18 +59,10 @@ public class InstructionSerializerKey return false; } InstructionSerializerKey other = (InstructionSerializerKey) obj; - if (experimenterId == null) { - if (other.experimenterId != null) { - return false; - } - } else if (!experimenterId.equals(other.experimenterId)) { + if (!Objects.equals(experimenterId, other.experimenterId)) { return false; } - if (instructionType == null) { - if (other.instructionType != null) { - return false; - } - } else if (!instructionType.equals(other.instructionType)) { + if (!Objects.equals(instructionType, other.instructionType)) { return false; } return true; diff --git a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntryDeserializerKey.java b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntryDeserializerKey.java index 111bec8ad8..fcb5aeadcb 100644 --- a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntryDeserializerKey.java +++ b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntryDeserializerKey.java @@ -7,8 +7,10 @@ */ package org.opendaylight.openflowjava.protocol.api.keys; +import java.util.Objects; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Key for a match entry deserializer. @@ -28,7 +30,7 @@ public final class MatchEntryDeserializerKey extends MessageCodeKey * @param oxmClass oxm_class (see specification) * @param oxmField oxm_field (see specification) */ - public MatchEntryDeserializerKey(final short version, final int oxmClass, final int oxmField) { + public MatchEntryDeserializerKey(final Uint8 version, final int oxmClass, final int oxmField) { super(version, oxmClass, MatchEntry.class); this.oxmField = oxmField; } @@ -63,11 +65,7 @@ public final class MatchEntryDeserializerKey extends MessageCodeKey return false; } MatchEntryDeserializerKey other = (MatchEntryDeserializerKey) obj; - if (experimenterId == null) { - if (other.experimenterId != null) { - return false; - } - } else if (!experimenterId.equals(other.experimenterId)) { + if (!Objects.equals(experimenterId, other.experimenterId)) { return false; } if (oxmField != other.oxmField) { diff --git a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntrySerializerKey.java b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntrySerializerKey.java index 2ddaf12437..f45b730405 100644 --- a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntrySerializerKey.java +++ b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntrySerializerKey.java @@ -7,10 +7,12 @@ */ package org.opendaylight.openflowjava.protocol.api.keys; +import java.util.Objects; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.MatchField; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmClassBase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Key for a match entry serializer. @@ -34,7 +36,7 @@ public final class MatchEntrySerializerKey oxmClass, final Class oxmField) { + public MatchEntrySerializerKey(final Uint8 msgVersion, final Class oxmClass, final Class oxmField) { super(msgVersion, MatchEntry.class); this.oxmClass = oxmClass; this.oxmField = oxmField; @@ -71,25 +73,13 @@ public final class MatchEntrySerializerKey other = (MatchEntrySerializerKey) obj; - if (experimenterId == null) { - if (other.experimenterId != null) { - return false; - } - } else if (!experimenterId.equals(other.experimenterId)) { + if (!Objects.equals(experimenterId, other.experimenterId)) { return false; } - if (oxmClass == null) { - if (other.oxmClass != null) { - return false; - } - } else if (!oxmClass.equals(other.oxmClass)) { + if (!Objects.equals(oxmClass, other.oxmClass)) { return false; } - if (oxmField == null) { - if (other.oxmField != null) { - return false; - } - } else if (!oxmField.equals(other.oxmField)) { + if (!Objects.equals(oxmField, other.oxmField)) { return false; } return true; diff --git a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/MessageCodeKey.java b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/MessageCodeKey.java index 819e56f704..74efe6f37e 100644 --- a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/MessageCodeKey.java +++ b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/MessageCodeKey.java @@ -7,14 +7,18 @@ */ package org.opendaylight.openflowjava.protocol.api.keys; +import static java.util.Objects.requireNonNull; + +import java.util.Objects; +import org.opendaylight.yangtools.yang.common.Uint8; + /** * Key for a message code. * * @author michal.polkorab */ public class MessageCodeKey { - - private final short msgVersion; + private final Uint8 msgVersion; private final int msgType; private final Class clazz; @@ -25,8 +29,8 @@ public class MessageCodeKey { * @param value used as distinguisher (read from binary data / buffer) * @param clazz class of object that is going to be deserialized */ - public MessageCodeKey(short version, int value, Class clazz) { - this.msgVersion = version; + public MessageCodeKey(final Uint8 version, final int value, final Class clazz) { + this.msgVersion = requireNonNull(version); this.msgType = value; this.clazz = clazz; } @@ -45,36 +49,20 @@ public class MessageCodeKey { int result = 1; result = prime * result + (clazz == null ? 0 : clazz.hashCode()); result = prime * result + msgType; - result = prime * result + msgVersion; + result = prime * result + msgVersion.hashCode(); return result; } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } - if (obj == null) { - return false; - } if (!(obj instanceof MessageCodeKey)) { return false; } MessageCodeKey other = (MessageCodeKey) obj; - if (clazz == null) { - if (other.clazz != null) { - return false; - } - } else if (!clazz.equals(other.clazz)) { - return false; - } - if (msgType != other.msgType) { - return false; - } - if (msgVersion != other.msgVersion) { - return false; - } - return true; + return Objects.equals(clazz, other.clazz) && msgType == other.msgType && msgVersion.equals(other.msgVersion); } @Override diff --git a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/MessageTypeKey.java b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/MessageTypeKey.java index fb4096719c..fdb609be58 100644 --- a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/MessageTypeKey.java +++ b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/MessageTypeKey.java @@ -7,6 +7,11 @@ */ package org.opendaylight.openflowjava.protocol.api.keys; +import static java.util.Objects.requireNonNull; + +import java.util.Objects; +import org.opendaylight.yangtools.yang.common.Uint8; + /** * Class used as a key in {@link org.opendaylight.openflowjava.protocol.api.extensibility.SerializerRegistry}. * @@ -17,7 +22,7 @@ package org.opendaylight.openflowjava.protocol.api.keys; public class MessageTypeKey { private final Class msgType; - private final short msgVersion; + private final Uint8 msgVersion; /** * Constructor. @@ -25,9 +30,9 @@ public class MessageTypeKey { * @param msgVersion protocol version * @param msgType type of message - class of serialized object */ - public MessageTypeKey(short msgVersion, Class msgType) { + public MessageTypeKey(final Uint8 msgVersion, final Class msgType) { this.msgType = msgType; - this.msgVersion = msgVersion; + this.msgVersion = requireNonNull(msgVersion); } @Override @@ -40,12 +45,12 @@ public class MessageTypeKey { final int prime = 31; int result = 1; result = prime * result + (msgType == null ? 0 : msgType.hashCode()); - result = prime * result + msgVersion; + result = prime * result + msgVersion.hashCode(); return result; } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } @@ -56,14 +61,10 @@ public class MessageTypeKey { return false; } MessageTypeKey other = (MessageTypeKey) obj; - if (msgType == null) { - if (other.msgType != null) { - return false; - } - } else if (!msgType.equals(other.msgType)) { + if (!Objects.equals(msgType, other.msgType)) { return false; } - if (msgVersion != other.msgVersion) { + if (!msgVersion.equals(other.msgVersion)) { return false; } return true; diff --git a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/TypeToClassKey.java b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/TypeToClassKey.java index 5e67ff75d5..c2dc9980e6 100644 --- a/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/TypeToClassKey.java +++ b/openflowjava/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/TypeToClassKey.java @@ -7,14 +7,17 @@ */ package org.opendaylight.openflowjava.protocol.api.keys; +import static java.util.Objects.requireNonNull; + +import org.opendaylight.yangtools.yang.common.Uint8; + /** * Key for a class type. * * @author michal.polkorab */ public class TypeToClassKey { - - private final short version; + private final Uint8 version; private final int type; /** @@ -23,8 +26,8 @@ public class TypeToClassKey { * @param version wire protocol version * @param type message type / code */ - public TypeToClassKey(short version, int type) { - this.version = version; + public TypeToClassKey(final Uint8 version, final int type) { + this.version = requireNonNull(version); this.type = type; } @@ -37,7 +40,7 @@ public class TypeToClassKey { } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } @@ -48,12 +51,6 @@ public class TypeToClassKey { return false; } TypeToClassKey other = (TypeToClassKey) obj; - if (type != other.type) { - return false; - } - if (version != other.version) { - return false; - } - return true; + return type == other.type && version.equals(other.version); } } diff --git a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageCodeKeyTest.java b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageCodeKeyTest.java index 6cd7812565..2890f7c9cf 100644 --- a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageCodeKeyTest.java +++ b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageCodeKeyTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.api.extensibility; import org.junit.Assert; @@ -20,31 +19,30 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 * @author michal.polkorab */ public class EnhancedMessageCodeKeyTest { - /** * Test EnhancedMessageCodeKey equals and hashCode. */ @Test public void test() { EnhancedMessageCodeKey key1 = - new EnhancedMessageCodeKey(EncodeConstants.OF10_VERSION_ID, 4, 8, BarrierInput.class); + new EnhancedMessageCodeKey(EncodeConstants.OF_VERSION_1_0, 4, 8, BarrierInput.class); EnhancedMessageCodeKey key2 = - new EnhancedMessageCodeKey(EncodeConstants.OF10_VERSION_ID, 4, 8, BarrierInput.class); + new EnhancedMessageCodeKey(EncodeConstants.OF_VERSION_1_0, 4, 8, BarrierInput.class); Assert.assertTrue("Wrong equals", key1.equals(key2)); Assert.assertTrue("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new EnhancedMessageCodeKey(EncodeConstants.OF13_VERSION_ID, 4, 8, BarrierInput.class); + key2 = new EnhancedMessageCodeKey(EncodeConstants.OF_VERSION_1_3, 4, 8, BarrierInput.class); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new EnhancedMessageCodeKey(EncodeConstants.OF10_VERSION_ID, 4, 8, null); + key2 = new EnhancedMessageCodeKey(EncodeConstants.OF_VERSION_1_0, 4, 8, null); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new EnhancedMessageCodeKey(EncodeConstants.OF10_VERSION_ID, 4, 8, BarrierOutput.class); + key2 = new EnhancedMessageCodeKey(EncodeConstants.OF_VERSION_1_0, 4, 8, BarrierOutput.class); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new EnhancedMessageCodeKey(EncodeConstants.OF10_VERSION_ID, 6, 8, BarrierInput.class); + key2 = new EnhancedMessageCodeKey(EncodeConstants.OF_VERSION_1_0, 6, 8, BarrierInput.class); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new EnhancedMessageCodeKey(EncodeConstants.OF10_VERSION_ID, 4, 16, BarrierInput.class); + key2 = new EnhancedMessageCodeKey(EncodeConstants.OF_VERSION_1_0, 4, 16, BarrierInput.class); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); } @@ -55,7 +53,7 @@ public class EnhancedMessageCodeKeyTest { @Test public void testEquals() { EnhancedMessageCodeKey key1 = - new EnhancedMessageCodeKey(EncodeConstants.OF10_VERSION_ID, 4, 8, BarrierInput.class); + new EnhancedMessageCodeKey(EncodeConstants.OF_VERSION_1_0, 4, 8, BarrierInput.class); Assert.assertTrue("Wrong equal to identical object.", key1.equals(key1)); Assert.assertFalse("Wrong equal to different class.", key1.equals(new Object())); @@ -67,7 +65,7 @@ public class EnhancedMessageCodeKeyTest { @Test public void testToString() { EnhancedMessageCodeKey key1 = - new EnhancedMessageCodeKey(EncodeConstants.OF10_VERSION_ID, 4, 8, BarrierInput.class); + new EnhancedMessageCodeKey(EncodeConstants.OF_VERSION_1_0, 4, 8, BarrierInput.class); Assert.assertEquals("Wrong toString()", "msgVersion: 1 objectClass: org.opendaylight.yang.gen.v1.urn.opendaylight" diff --git a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageTypeKeyTest.java b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageTypeKeyTest.java index 939a801040..de6a2d801f 100644 --- a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageTypeKeyTest.java +++ b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageTypeKeyTest.java @@ -29,24 +29,24 @@ public class EnhancedMessageTypeKeyTest { @Test public void test() { EnhancedMessageTypeKey key1 = - new EnhancedMessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, Action.class, OutputActionCase.class); + new EnhancedMessageTypeKey<>(EncodeConstants.OF_VERSION_1_0, Action.class, OutputActionCase.class); EnhancedMessageTypeKey key2 = - new EnhancedMessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, Action.class, OutputActionCase.class); + new EnhancedMessageTypeKey<>(EncodeConstants.OF_VERSION_1_0, Action.class, OutputActionCase.class); Assert.assertTrue("Wrong equals", key1.equals(key2)); Assert.assertTrue("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new EnhancedMessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, Action.class, OutputActionCase.class); + key2 = new EnhancedMessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, Action.class, OutputActionCase.class); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new EnhancedMessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, null, OutputActionCase.class); + key2 = new EnhancedMessageTypeKey<>(EncodeConstants.OF_VERSION_1_0, null, OutputActionCase.class); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new EnhancedMessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, Instruction.class, OutputActionCase.class); + key2 = new EnhancedMessageTypeKey<>(EncodeConstants.OF_VERSION_1_0, Instruction.class, OutputActionCase.class); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new EnhancedMessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, Action.class, null); + key2 = new EnhancedMessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, Action.class, null); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new EnhancedMessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, Action.class, SetFieldCase.class); + key2 = new EnhancedMessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, Action.class, SetFieldCase.class); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); } @@ -58,16 +58,16 @@ public class EnhancedMessageTypeKeyTest { public void testEquals() { EnhancedMessageTypeKey key1; EnhancedMessageTypeKey key2; - key1 = new EnhancedMessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, Action.class, OutputActionCase.class); - key2 = new EnhancedMessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, Action.class, OutputActionCase.class); + key1 = new EnhancedMessageTypeKey<>(EncodeConstants.OF_VERSION_1_0, Action.class, OutputActionCase.class); + key2 = new EnhancedMessageTypeKey<>(EncodeConstants.OF_VERSION_1_0, Action.class, OutputActionCase.class); Assert.assertTrue("Wrong equal to identical object.", key1.equals(key1)); Assert.assertFalse("Wrong equal to different class.", key1.equals(new Object())); - key1 = new EnhancedMessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, Action.class, null); + key1 = new EnhancedMessageTypeKey<>(EncodeConstants.OF_VERSION_1_0, Action.class, null); Assert.assertFalse("Wrong equal by msgType2.", key1.equals(key2)); - key1 = new EnhancedMessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, Action.class, OutputActionCase.class); - key2 = new EnhancedMessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, Action.class, SetFieldCase.class); + key1 = new EnhancedMessageTypeKey<>(EncodeConstants.OF_VERSION_1_0, Action.class, OutputActionCase.class); + key2 = new EnhancedMessageTypeKey<>(EncodeConstants.OF_VERSION_1_0, Action.class, SetFieldCase.class); Assert.assertFalse("Wrong equal by msgType2 class name.", key1.equals(key2)); } @@ -76,7 +76,7 @@ public class EnhancedMessageTypeKeyTest { */ @Test public void testToString() { - EnhancedMessageTypeKey key1 = new EnhancedMessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, + EnhancedMessageTypeKey key1 = new EnhancedMessageTypeKey<>(EncodeConstants.OF_VERSION_1_0, Action.class, OutputActionCase.class); Assert.assertEquals("Wrong toString()", "msgVersion: 1 objectType: org.opendaylight.yang.gen.v1.urn" diff --git a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/extensibility/MessageCodeKeyTest.java b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/extensibility/MessageCodeKeyTest.java index 32604181ef..c28fff8dbe 100644 --- a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/extensibility/MessageCodeKeyTest.java +++ b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/extensibility/MessageCodeKeyTest.java @@ -28,21 +28,21 @@ public class MessageCodeKeyTest { @Test public void test() { MessageCodeKey key1 = - new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, 4, BarrierInput.class); + new MessageCodeKey(EncodeConstants.OF_VERSION_1_0, 4, BarrierInput.class); MessageCodeKey key2 = - new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, 4, BarrierInput.class); + new MessageCodeKey(EncodeConstants.OF_VERSION_1_0, 4, BarrierInput.class); Assert.assertTrue("Wrong equals", key1.equals(key2)); Assert.assertTrue("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 4, BarrierInput.class); + key2 = new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, 4, BarrierInput.class); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, 4, null); + key2 = new MessageCodeKey(EncodeConstants.OF_VERSION_1_0, 4, null); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, 4, BarrierOutput.class); + key2 = new MessageCodeKey(EncodeConstants.OF_VERSION_1_0, 4, BarrierOutput.class); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, 6, BarrierInput.class); + key2 = new MessageCodeKey(EncodeConstants.OF_VERSION_1_0, 6, BarrierInput.class); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); } @@ -52,17 +52,17 @@ public class MessageCodeKeyTest { */ @Test public void testEquals() { - MessageCodeKey key1 = new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, 4, BarrierInput.class); + MessageCodeKey key1 = new MessageCodeKey(EncodeConstants.OF_VERSION_1_0, 4, BarrierInput.class); Assert.assertTrue("Wrong equal to identical object.", key1.equals(key1)); Assert.assertFalse("Wrong equal to null.", key1.equals(null)); Assert.assertFalse("Wrong equal to different class.", key1.equals(new Object())); - key1 = new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, 4, null); - MessageCodeKey key2 = new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, 4, BarrierInput.class); + key1 = new MessageCodeKey(EncodeConstants.OF_VERSION_1_0, 4, null); + MessageCodeKey key2 = new MessageCodeKey(EncodeConstants.OF_VERSION_1_0, 4, BarrierInput.class); Assert.assertFalse("Wrong equal by clazz.", key1.equals(key2)); - key2 = new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, 4, null); + key2 = new MessageCodeKey(EncodeConstants.OF_VERSION_1_0, 4, null); Assert.assertTrue("Wrong equal by clazz.", key1.equals(key2)); } @@ -71,7 +71,7 @@ public class MessageCodeKeyTest { */ @Test public void testToString() { - MessageCodeKey key1 = new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, 4, BarrierInput.class); + MessageCodeKey key1 = new MessageCodeKey(EncodeConstants.OF_VERSION_1_0, 4, BarrierInput.class); Assert.assertEquals("Wrong toString()", "msgVersion: 1 objectClass: org.opendaylight.yang.gen.v1.urn" + ".opendaylight.openflow.protocol.rev130731.BarrierInput msgType: 4", key1.toString()); diff --git a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/extensibility/MessageTypeKeyTest.java b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/extensibility/MessageTypeKeyTest.java index d997fa5aac..b622a3812c 100644 --- a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/extensibility/MessageTypeKeyTest.java +++ b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/extensibility/MessageTypeKeyTest.java @@ -28,18 +28,18 @@ public class MessageTypeKeyTest { @Test public void test() { MessageTypeKey key1 = - new MessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, BarrierInput.class); + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_0, BarrierInput.class); MessageTypeKey key2 = - new MessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, BarrierInput.class); + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_0, BarrierInput.class); Assert.assertTrue("Wrong equals", key1.equals(key2)); Assert.assertTrue("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, BarrierInput.class); + key2 = new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, BarrierInput.class); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new MessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, null); + key2 = new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_0, null); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new MessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, BarrierOutput.class); + key2 = new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_0, BarrierOutput.class); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); } @@ -49,17 +49,17 @@ public class MessageTypeKeyTest { */ @Test public void testEquals() { - MessageTypeKey key1 = new MessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, BarrierInput.class); + MessageTypeKey key1 = new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_0, BarrierInput.class); Assert.assertTrue("Wrong equal to identical object.", key1.equals(key1)); Assert.assertFalse("Wrong equal to null.", key1.equals(null)); Assert.assertFalse("Wrong equal to different class.", key1.equals(new Object())); - key1 = new MessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, null); - MessageTypeKey key2 = new MessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, BarrierInput.class); + key1 = new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_0, null); + MessageTypeKey key2 = new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_0, BarrierInput.class); Assert.assertFalse("Wrong equal by msgType.", key1.equals(key2)); - key2 = new MessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, null); + key2 = new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_0, null); Assert.assertTrue("Wrong equal by msgType.", key1.equals(key2)); } @@ -68,7 +68,7 @@ public class MessageTypeKeyTest { */ @Test public void testToString() { - MessageTypeKey key1 = new MessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, BarrierInput.class); + MessageTypeKey key1 = new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_0, BarrierInput.class); Assert.assertEquals("Wrong toString()", "msgVersion: 1 objectType: org.opendaylight.yang.gen.v1.urn" + ".opendaylight.openflow.protocol.rev130731.BarrierInput", key1.toString()); diff --git a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/ActionDeserializerKeyTest.java b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/ActionDeserializerKeyTest.java index 94f0609e4f..91d5e5b590 100644 --- a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/ActionDeserializerKeyTest.java +++ b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/ActionDeserializerKeyTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.api.keys; import org.junit.Assert; @@ -24,20 +23,20 @@ public class ActionDeserializerKeyTest { */ @Test public void test() { - ActionDeserializerKey key1 = new ActionDeserializerKey(EncodeConstants.OF10_VERSION_ID, 11, 42L); - ActionDeserializerKey key2 = new ActionDeserializerKey(EncodeConstants.OF10_VERSION_ID, 11, 42L); + ActionDeserializerKey key1 = new ActionDeserializerKey(EncodeConstants.OF_VERSION_1_0, 11, 42L); + ActionDeserializerKey key2 = new ActionDeserializerKey(EncodeConstants.OF_VERSION_1_0, 11, 42L); Assert.assertTrue("Wrong equals", key1.equals(key2)); Assert.assertTrue("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new ActionDeserializerKey(EncodeConstants.OF10_VERSION_ID, 11, null); + key2 = new ActionDeserializerKey(EncodeConstants.OF_VERSION_1_0, 11, null); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new ActionDeserializerKey(EncodeConstants.OF10_VERSION_ID, 11, 55L); + key2 = new ActionDeserializerKey(EncodeConstants.OF_VERSION_1_0, 11, 55L); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new ActionDeserializerKey(EncodeConstants.OF10_VERSION_ID, 0, 42L); + key2 = new ActionDeserializerKey(EncodeConstants.OF_VERSION_1_0, 0, 42L); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new ActionDeserializerKey(EncodeConstants.OF13_VERSION_ID, 11, 42L); + key2 = new ActionDeserializerKey(EncodeConstants.OF_VERSION_1_3, 11, 42L); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); } @@ -47,13 +46,13 @@ public class ActionDeserializerKeyTest { */ @Test public void testEquals() { - ActionDeserializerKey key1 = new ActionDeserializerKey(EncodeConstants.OF10_VERSION_ID, 11, null); - ActionDeserializerKey key2 = new ActionDeserializerKey(EncodeConstants.OF10_VERSION_ID, 11, 42L); + ActionDeserializerKey key1 = new ActionDeserializerKey(EncodeConstants.OF_VERSION_1_0, 11, null); + ActionDeserializerKey key2 = new ActionDeserializerKey(EncodeConstants.OF_VERSION_1_0, 11, 42L); Assert.assertTrue("Wrong equal to identical object.", key1.equals(key1)); Assert.assertFalse("Wrong equal to different class.", key1.equals(new Object())); Assert.assertFalse("Wrong equal by experimenterId", key1.equals(key2)); - key2 = new ActionDeserializerKey(EncodeConstants.OF10_VERSION_ID, 11, null); + key2 = new ActionDeserializerKey(EncodeConstants.OF_VERSION_1_0, 11, null); Assert.assertTrue("Wrong equal by experimenterId", key1.equals(key2)); } @@ -62,7 +61,7 @@ public class ActionDeserializerKeyTest { */ @Test public void testToString() { - ActionDeserializerKey key1 = new ActionDeserializerKey(EncodeConstants.OF10_VERSION_ID, 11, null); + ActionDeserializerKey key1 = new ActionDeserializerKey(EncodeConstants.OF_VERSION_1_0, 11, null); Assert.assertEquals("Wrong toString()", "msgVersion: 1 objectClass: org.opendaylight.yang.gen.v1.urn" + ".opendaylight.openflow.common.action.rev150203.actions.grouping.Action msgType: 11" diff --git a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/ActionSerializerKeyTest.java b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/ActionSerializerKeyTest.java index bba05c7494..6b8d5fedb0 100644 --- a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/ActionSerializerKeyTest.java +++ b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/ActionSerializerKeyTest.java @@ -29,24 +29,24 @@ public class ActionSerializerKeyTest { @Test public void test() { ActionSerializerKey key1 = - new ActionSerializerKey<>(EncodeConstants.OF10_VERSION_ID, CopyTtlInCase.class, FORTY_TWO); + new ActionSerializerKey<>(EncodeConstants.OF_VERSION_1_0, CopyTtlInCase.class, FORTY_TWO); ActionSerializerKey key2 = - new ActionSerializerKey<>(EncodeConstants.OF10_VERSION_ID, CopyTtlInCase.class, FORTY_TWO); + new ActionSerializerKey<>(EncodeConstants.OF_VERSION_1_0, CopyTtlInCase.class, FORTY_TWO); Assert.assertTrue("Wrong equals", key1.equals(key2)); Assert.assertTrue("Wrong hashCode", key1.hashCode() == key2.hashCode()); - key2 = new ActionSerializerKey<>(EncodeConstants.OF10_VERSION_ID, CopyTtlInCase.class, (Uint32) null); + key2 = new ActionSerializerKey<>(EncodeConstants.OF_VERSION_1_0, CopyTtlInCase.class, (Uint32) null); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode()); - key2 = new ActionSerializerKey<>(EncodeConstants.OF10_VERSION_ID, null, (Uint32) null); + key2 = new ActionSerializerKey<>(EncodeConstants.OF_VERSION_1_0, null, (Uint32) null); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode()); - key2 = new ActionSerializerKey<>(EncodeConstants.OF10_VERSION_ID, CopyTtlOutCase.class, FORTY_TWO); + key2 = new ActionSerializerKey<>(EncodeConstants.OF_VERSION_1_0, CopyTtlOutCase.class, FORTY_TWO); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode()); - key2 = new ActionSerializerKey<>(EncodeConstants.OF10_VERSION_ID, CopyTtlInCase.class, FIFTY_FIVE); + key2 = new ActionSerializerKey<>(EncodeConstants.OF_VERSION_1_0, CopyTtlInCase.class, FIFTY_FIVE); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode()); - key2 = new ActionSerializerKey<>(EncodeConstants.OF13_VERSION_ID, CopyTtlInCase.class, FIFTY_FIVE); + key2 = new ActionSerializerKey<>(EncodeConstants.OF_VERSION_1_3, CopyTtlInCase.class, FIFTY_FIVE); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode()); } @@ -56,18 +56,18 @@ public class ActionSerializerKeyTest { */ @Test public void testEquals() { - ActionSerializerKey key1 = new ActionSerializerKey<>(EncodeConstants.OF10_VERSION_ID, null, FORTY_TWO); - ActionSerializerKey key2 = new ActionSerializerKey<>(EncodeConstants.OF10_VERSION_ID, + ActionSerializerKey key1 = new ActionSerializerKey<>(EncodeConstants.OF_VERSION_1_0, null, FORTY_TWO); + ActionSerializerKey key2 = new ActionSerializerKey<>(EncodeConstants.OF_VERSION_1_0, CopyTtlInCase.class, FORTY_TWO); Assert.assertTrue("Wrong equal to identical object.", key1.equals(key1)); Assert.assertFalse("Wrong equal by actionType", key1.equals(key2)); - key2 = new ActionSerializerKey<>(EncodeConstants.OF10_VERSION_ID, null, FORTY_TWO); + key2 = new ActionSerializerKey<>(EncodeConstants.OF_VERSION_1_0, null, FORTY_TWO); Assert.assertTrue("Wrong equal by action type", key1.equals(key2)); - key1 = new ActionSerializerKey<>(EncodeConstants.OF10_VERSION_ID, CopyTtlInCase.class, (Uint32) null); + key1 = new ActionSerializerKey<>(EncodeConstants.OF_VERSION_1_0, CopyTtlInCase.class, (Uint32) null); Assert.assertFalse("Wrong equal by experimenterId", key1.equals(key2)); - key2 = new ActionSerializerKey<>(EncodeConstants.OF10_VERSION_ID, CopyTtlInCase.class, (Uint32) null); + key2 = new ActionSerializerKey<>(EncodeConstants.OF_VERSION_1_0, CopyTtlInCase.class, (Uint32) null); Assert.assertTrue("Wrong equal by experimenterId", key1.equals(key2)); } @@ -76,7 +76,7 @@ public class ActionSerializerKeyTest { */ @Test public void testToString() { - ActionSerializerKey key1 = new ActionSerializerKey<>(EncodeConstants.OF10_VERSION_ID, + ActionSerializerKey key1 = new ActionSerializerKey<>(EncodeConstants.OF_VERSION_1_0, CopyTtlInCase.class, FORTY_TWO); Assert.assertEquals("Wrong toString()", "msgVersion: 1 objectType: org.opendaylight.yang.gen.v1.urn" diff --git a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionDeserializerKeyTest.java b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionDeserializerKeyTest.java index b99c2aa2d7..4745ac3e87 100644 --- a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionDeserializerKeyTest.java +++ b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionDeserializerKeyTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.api.keys; import org.junit.Assert; @@ -18,26 +17,25 @@ import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; * @author michal.polkorab */ public class InstructionDeserializerKeyTest { - /** * Test InstructionDeserializerKey equals and hashCode. */ @Test public void test() { - InstructionDeserializerKey key1 = new InstructionDeserializerKey(EncodeConstants.OF10_VERSION_ID, 11, 42L); - InstructionDeserializerKey key2 = new InstructionDeserializerKey(EncodeConstants.OF10_VERSION_ID, 11, 42L); + InstructionDeserializerKey key1 = new InstructionDeserializerKey(EncodeConstants.OF_VERSION_1_0, 11, 42L); + InstructionDeserializerKey key2 = new InstructionDeserializerKey(EncodeConstants.OF_VERSION_1_0, 11, 42L); Assert.assertTrue("Wrong equals", key1.equals(key2)); Assert.assertTrue("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new InstructionDeserializerKey(EncodeConstants.OF10_VERSION_ID, 11, null); + key2 = new InstructionDeserializerKey(EncodeConstants.OF_VERSION_1_0, 11, null); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new InstructionDeserializerKey(EncodeConstants.OF10_VERSION_ID, 11, 55L); + key2 = new InstructionDeserializerKey(EncodeConstants.OF_VERSION_1_0, 11, 55L); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new InstructionDeserializerKey(EncodeConstants.OF10_VERSION_ID, 0, 42L); + key2 = new InstructionDeserializerKey(EncodeConstants.OF_VERSION_1_0, 0, 42L); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new InstructionDeserializerKey(EncodeConstants.OF13_VERSION_ID, 11, 42L); + key2 = new InstructionDeserializerKey(EncodeConstants.OF_VERSION_1_3, 11, 42L); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); } @@ -47,13 +45,13 @@ public class InstructionDeserializerKeyTest { */ @Test public void testEquals() { - InstructionDeserializerKey key1 = new InstructionDeserializerKey(EncodeConstants.OF10_VERSION_ID, 11, null); - InstructionDeserializerKey key2 = new InstructionDeserializerKey(EncodeConstants.OF10_VERSION_ID, 11, 24L); + InstructionDeserializerKey key1 = new InstructionDeserializerKey(EncodeConstants.OF_VERSION_1_0, 11, null); + InstructionDeserializerKey key2 = new InstructionDeserializerKey(EncodeConstants.OF_VERSION_1_0, 11, 24L); Assert.assertTrue("Wrong equal to identical object.", key1.equals(key1)); Assert.assertFalse("Wrong equal to different class.", key1.equals(new Object())); Assert.assertFalse("Wrong equal by experimenterId", key1.equals(key2)); - key2 = new InstructionDeserializerKey(EncodeConstants.OF10_VERSION_ID, 11, null); + key2 = new InstructionDeserializerKey(EncodeConstants.OF_VERSION_1_0, 11, null); Assert.assertTrue("Wrong equal by experimenterId", key1.equals(key2)); } @@ -62,7 +60,7 @@ public class InstructionDeserializerKeyTest { */ @Test public void testToString() { - InstructionDeserializerKey key1 = new InstructionDeserializerKey(EncodeConstants.OF10_VERSION_ID, 11, null); + InstructionDeserializerKey key1 = new InstructionDeserializerKey(EncodeConstants.OF_VERSION_1_0, 11, null); Assert.assertEquals("Wrong toString()", "msgVersion: 1 objectClass: org.opendaylight.yang.gen.v1.urn.opendaylight" diff --git a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionSerializerKeyTest.java b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionSerializerKeyTest.java index ab317e8de7..ae01d7ab05 100644 --- a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionSerializerKeyTest.java +++ b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionSerializerKeyTest.java @@ -27,24 +27,24 @@ public class InstructionSerializerKeyTest { @Test public void test() { InstructionSerializerKey key1 = - new InstructionSerializerKey<>(EncodeConstants.OF10_VERSION_ID, ApplyActionsCase.class, 42L); + new InstructionSerializerKey<>(EncodeConstants.OF_VERSION_1_0, ApplyActionsCase.class, 42L); InstructionSerializerKey key2 = - new InstructionSerializerKey<>(EncodeConstants.OF10_VERSION_ID, ApplyActionsCase.class, 42L); + new InstructionSerializerKey<>(EncodeConstants.OF_VERSION_1_0, ApplyActionsCase.class, 42L); Assert.assertTrue("Wrong equals", key1.equals(key2)); Assert.assertTrue("Wrong hashCode", key1.hashCode() == key2.hashCode()); - key2 = new InstructionSerializerKey<>(EncodeConstants.OF10_VERSION_ID, ApplyActionsCase.class, null); + key2 = new InstructionSerializerKey<>(EncodeConstants.OF_VERSION_1_0, ApplyActionsCase.class, null); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode()); - key2 = new InstructionSerializerKey<>(EncodeConstants.OF10_VERSION_ID, null, 42L); + key2 = new InstructionSerializerKey<>(EncodeConstants.OF_VERSION_1_0, null, 42L); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode()); - key2 = new InstructionSerializerKey<>(EncodeConstants.OF10_VERSION_ID, WriteActionsCase.class, 42L); + key2 = new InstructionSerializerKey<>(EncodeConstants.OF_VERSION_1_0, WriteActionsCase.class, 42L); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode()); - key2 = new InstructionSerializerKey<>(EncodeConstants.OF10_VERSION_ID, ApplyActionsCase.class, 55L); + key2 = new InstructionSerializerKey<>(EncodeConstants.OF_VERSION_1_0, ApplyActionsCase.class, 55L); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode()); - key2 = new InstructionSerializerKey<>(EncodeConstants.OF13_VERSION_ID, ApplyActionsCase.class, 42L); + key2 = new InstructionSerializerKey<>(EncodeConstants.OF_VERSION_1_3, ApplyActionsCase.class, 42L); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode()); } @@ -55,18 +55,18 @@ public class InstructionSerializerKeyTest { @Test public void testEquals() { InstructionSerializerKey key1 = - new InstructionSerializerKey<>(EncodeConstants.OF10_VERSION_ID, ApplyActionsCase.class, 42L); + new InstructionSerializerKey<>(EncodeConstants.OF_VERSION_1_0, ApplyActionsCase.class, 42L); Assert.assertTrue("Wrong equal to identical object.", key1.equals(key1)); Assert.assertFalse("Wrong equal to different class.", key1.equals(new Object())); InstructionSerializerKey key2 = - new InstructionSerializerKey<>(EncodeConstants.OF10_VERSION_ID, ApplyActionsCase.class, 42L); - key1 = new InstructionSerializerKey<>(EncodeConstants.OF10_VERSION_ID, ApplyActionsCase.class, null); + new InstructionSerializerKey<>(EncodeConstants.OF_VERSION_1_0, ApplyActionsCase.class, 42L); + key1 = new InstructionSerializerKey<>(EncodeConstants.OF_VERSION_1_0, ApplyActionsCase.class, null); Assert.assertFalse("Wrong equal by experimenterId.", key1.equals(key2)); - key1 = new InstructionSerializerKey<>(EncodeConstants.OF10_VERSION_ID, null, 42L); - key2 = new InstructionSerializerKey<>(EncodeConstants.OF10_VERSION_ID, null, 42L); + key1 = new InstructionSerializerKey<>(EncodeConstants.OF_VERSION_1_0, null, 42L); + key2 = new InstructionSerializerKey<>(EncodeConstants.OF_VERSION_1_0, null, 42L); Assert.assertTrue("Wrong equal by instructionType.", key1.equals(key2)); } @@ -76,7 +76,7 @@ public class InstructionSerializerKeyTest { @Test public void testToString() { InstructionSerializerKey key1 = - new InstructionSerializerKey<>(EncodeConstants.OF10_VERSION_ID, ApplyActionsCase.class, 42L); + new InstructionSerializerKey<>(EncodeConstants.OF_VERSION_1_0, ApplyActionsCase.class, 42L); Assert.assertEquals("Wrong toString()", "msgVersion: 1 objectType: org.opendaylight.yang.gen.v1.urn" + ".opendaylight.openflow.common.instruction.rev130731.instructions.grouping.Instruction " diff --git a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/KeysTest.java b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/KeysTest.java index 350a91a5bc..f17a165cd3 100644 --- a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/KeysTest.java +++ b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/KeysTest.java @@ -11,7 +11,7 @@ import org.junit.Assert; import org.junit.Test; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.openflowjava.protocol.api.util.OxmMatchConstants; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.action.container.action.choice.ExperimenterIdCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.action.ExperimenterIdCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.ExperimenterActionSubType; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.InPort; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OpenflowBasicClass; @@ -29,24 +29,23 @@ public class KeysTest { */ @Test public void testEqualsAndHashcodeOfDeserializerKeys() { - ActionDeserializerKey actionDeserializerKey = new ActionDeserializerKey(EncodeConstants.OF13_VERSION_ID, + ActionDeserializerKey actionDeserializerKey = new ActionDeserializerKey(EncodeConstants.OF_VERSION_1_3, EncodeConstants.EXPERIMENTER_VALUE, 1L); ExperimenterActionDeserializerKey experimenterActionDeserializerKey = new ExperimenterActionDeserializerKey( - EncodeConstants.OF13_VERSION_ID, 1L); + EncodeConstants.OF_VERSION_1_3, 1L); Assert.assertEquals(actionDeserializerKey, experimenterActionDeserializerKey); Assert.assertEquals(actionDeserializerKey.hashCode(), experimenterActionDeserializerKey.hashCode()); InstructionDeserializerKey instructionDeserializerKey = new InstructionDeserializerKey( - EncodeConstants.OF13_VERSION_ID, EncodeConstants.EXPERIMENTER_VALUE, 1L); + EncodeConstants.OF_VERSION_1_3, EncodeConstants.EXPERIMENTER_VALUE, 1L); ExperimenterInstructionDeserializerKey experimenterInstructionDeserializerKey = - new ExperimenterInstructionDeserializerKey( - EncodeConstants.OF13_VERSION_ID, 1L); + new ExperimenterInstructionDeserializerKey(EncodeConstants.OF_VERSION_1_3, 1L); Assert.assertEquals(instructionDeserializerKey, experimenterInstructionDeserializerKey); Assert.assertEquals(instructionDeserializerKey.hashCode(), experimenterInstructionDeserializerKey.hashCode()); - MatchEntryDeserializerKey matchKey = new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, + MatchEntryDeserializerKey matchKey = new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.ARP_OP); - MatchEntryDeserializerKey matchKey2 = new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, + MatchEntryDeserializerKey matchKey2 = new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.ARP_OP); Assert.assertEquals(matchKey, matchKey2); Assert.assertEquals(matchKey.hashCode(), matchKey2.hashCode()); @@ -58,26 +57,26 @@ public class KeysTest { @Test public void testEqualsAndHashcodeOfActionDeserializerKeys() { ActionSerializerKey actionSerializerKey = new ActionSerializerKey<>( - EncodeConstants.OF13_VERSION_ID, ExperimenterIdCase.class, Uint32.ONE); + EncodeConstants.OF_VERSION_1_3, ExperimenterIdCase.class, Uint32.ONE); ExperimenterActionSerializerKey experimenterActionSerializerKey = new ExperimenterActionSerializerKey( - EncodeConstants.OF13_VERSION_ID, Uint32.ONE, ExpSubType.class); + EncodeConstants.OF_VERSION_1_3, Uint32.ONE, ExpSubType.class); Assert.assertFalse(actionSerializerKey.equals(experimenterActionSerializerKey)); Assert.assertFalse(experimenterActionSerializerKey.equals(actionSerializerKey)); InstructionSerializerKey instructionSerializerKey = - new InstructionSerializerKey<>(EncodeConstants.OF13_VERSION_ID, org.opendaylight.yang.gen.v1.urn + new InstructionSerializerKey<>(EncodeConstants.OF_VERSION_1_3, org.opendaylight.yang.gen.v1.urn .opendaylight.openflow.augments.rev150225.instruction.container.instruction.choice .ExperimenterIdCase.class, 1L); ExperimenterInstructionSerializerKey experimenterInstructionSerializerKey = - new ExperimenterInstructionSerializerKey(EncodeConstants.OF13_VERSION_ID, 1L); + new ExperimenterInstructionSerializerKey(EncodeConstants.OF_VERSION_1_3, 1L); Assert.assertEquals(instructionSerializerKey, experimenterInstructionSerializerKey); Assert.assertEquals(instructionSerializerKey.hashCode(), experimenterInstructionSerializerKey.hashCode()); MatchEntrySerializerKey matchKey = new MatchEntrySerializerKey<>( - EncodeConstants.OF10_VERSION_ID, OpenflowBasicClass.class, InPort.class); + EncodeConstants.OF_VERSION_1_0, OpenflowBasicClass.class, InPort.class); MatchEntrySerializerKey matchKey2 = new MatchEntrySerializerKey<>( - EncodeConstants.OF10_VERSION_ID, OpenflowBasicClass.class, InPort.class); + EncodeConstants.OF_VERSION_1_0, OpenflowBasicClass.class, InPort.class); Assert.assertEquals(matchKey, matchKey2); Assert.assertEquals(matchKey.hashCode(), matchKey2.hashCode()); } @@ -85,5 +84,4 @@ public class KeysTest { private interface ExpSubType extends ExperimenterActionSubType { // empty class - only used in test for comparation } - } diff --git a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntryDeserializerKeyTest.java b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntryDeserializerKeyTest.java index 73044d6f38..0d902adca4 100644 --- a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntryDeserializerKeyTest.java +++ b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntryDeserializerKeyTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.api.keys; import org.junit.Assert; @@ -25,24 +24,24 @@ public class MatchEntryDeserializerKeyTest { */ @Test public void test() { - MatchEntryDeserializerKey key1 = new MatchEntryDeserializerKey(EncodeConstants.OF10_VERSION_ID, 0x8000, 42); - MatchEntryDeserializerKey key2 = new MatchEntryDeserializerKey(EncodeConstants.OF10_VERSION_ID, 0x8000, 42); + MatchEntryDeserializerKey key1 = new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_0, 0x8000, 42); + MatchEntryDeserializerKey key2 = new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_0, 0x8000, 42); Assert.assertTrue("Wrong equals", key1.equals(key2)); Assert.assertTrue("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new MatchEntryDeserializerKey(EncodeConstants.OF10_VERSION_ID, 0, 42); + key2 = new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_0, 0, 42); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new MatchEntryDeserializerKey(EncodeConstants.OF10_VERSION_ID, 0x8000, 0); + key2 = new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_0, 0x8000, 0); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, 0x8000, 42); + key2 = new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, 0x8000, 42); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, 0x8000, 42); + key2 = new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, 0x8000, 42); key2.setExperimenterId(Uint32.valueOf(158L)); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new MatchEntryDeserializerKey(EncodeConstants.OF10_VERSION_ID, 0x8000, 42); + key2 = new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_0, 0x8000, 42); key2.setExperimenterId(Uint32.valueOf(158L)); key1.setExperimenterId(Uint32.valueOf(158L)); Assert.assertTrue("Wrong equals", key1.equals(key2)); @@ -54,12 +53,12 @@ public class MatchEntryDeserializerKeyTest { */ @Test public void testEquals() { - MatchEntryDeserializerKey key1 = new MatchEntryDeserializerKey(EncodeConstants.OF10_VERSION_ID, 0x8000, 42); + MatchEntryDeserializerKey key1 = new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_0, 0x8000, 42); Assert.assertTrue("Wrong equal to identical object.", key1.equals(key1)); Assert.assertFalse("Wrong equal to different class.", key1.equals(new Object())); - MatchEntryDeserializerKey key2 = new MatchEntryDeserializerKey(EncodeConstants.OF10_VERSION_ID, 0x8000, 42); + MatchEntryDeserializerKey key2 = new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_0, 0x8000, 42); key1.setExperimenterId(null); key2.setExperimenterId(Uint32.valueOf(654321L)); @@ -75,7 +74,7 @@ public class MatchEntryDeserializerKeyTest { */ @Test public void testToString() { - MatchEntryDeserializerKey key1 = new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, 0x8000, 42); + MatchEntryDeserializerKey key1 = new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, 0x8000, 42); Assert.assertEquals("Wrong toString()", "msgVersion: 4 objectClass: org.opendaylight.yang.gen.v1.urn" + ".opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry" diff --git a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntrySerializerKeyTest.java b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntrySerializerKeyTest.java index 3bb916b0de..1585a6d9c7 100644 --- a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntrySerializerKeyTest.java +++ b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntrySerializerKeyTest.java @@ -30,28 +30,28 @@ public class MatchEntrySerializerKeyTest { @Test public void test() { MatchEntrySerializerKey key1 = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, OpenflowBasicClass.class, InPort.class); + EncodeConstants.OF_VERSION_1_3, OpenflowBasicClass.class, InPort.class); MatchEntrySerializerKey key2 = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, OpenflowBasicClass.class, InPort.class); + EncodeConstants.OF_VERSION_1_3, OpenflowBasicClass.class, InPort.class); Assert.assertTrue("Wrong equals", key1.equals(key2)); Assert.assertTrue("Wrong hashCode", key1.hashCode() == key2.hashCode()); - key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, + key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, OpenflowBasicClass.class, InPhyPort.class); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode()); - key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, + key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, InPort.class); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode()); - key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF10_VERSION_ID, + key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_0, OpenflowBasicClass.class, InPhyPort.class); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode()); - key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, + key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, OpenflowBasicClass.class, null); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode()); - key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, + key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, null, InPhyPort.class); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode()); @@ -66,8 +66,8 @@ public class MatchEntrySerializerKeyTest { public void testEquals() { MatchEntrySerializerKey key1; MatchEntrySerializerKey key2; - key1 = new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, OpenflowBasicClass.class, InPort.class); - key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, OpenflowBasicClass.class, InPort.class); + key1 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, OpenflowBasicClass.class, InPort.class); + key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, OpenflowBasicClass.class, InPort.class); Assert.assertTrue("Wrong equal to identical object.", key1.equals(key1)); Assert.assertFalse("Wrong equal to different class.", key1.equals(new Object())); @@ -80,16 +80,16 @@ public class MatchEntrySerializerKeyTest { Uint32 expId1 = Uint32.valueOf(987654331L); key1.setExperimenterId(expId1); Assert.assertFalse("Wrong equal by experimenterId", key1.equals(key2)); - key1 = new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, null, InPort.class); + key1 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, null, InPort.class); key1.setExperimenterId(expId2); Assert.assertFalse("Wrong equal by oxmClass", key1.equals(key2)); - key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, null, InPort.class); + key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, null, InPort.class); key2.setExperimenterId(expId2); Assert.assertTrue("Wrong equal by oxmClass", key1.equals(key2)); - key1 = new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, OpenflowBasicClass.class, null); + key1 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, OpenflowBasicClass.class, null); key1.setExperimenterId(expId2); Assert.assertFalse("Wrong equal by oxmField", key1.equals(key2)); - key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, OpenflowBasicClass.class, null); + key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, OpenflowBasicClass.class, null); key2.setExperimenterId(expId2); Assert.assertTrue("Wrong equal by oxmField", key1.equals(key2)); } @@ -100,7 +100,7 @@ public class MatchEntrySerializerKeyTest { @Test public void testToString() { MatchEntrySerializerKey key1; - key1 = new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, OpenflowBasicClass.class, InPort.class); + key1 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, OpenflowBasicClass.class, InPort.class); Assert.assertEquals("Wrong toString()", "msgVersion: 4 objectType: org.opendaylight.yang.gen.v1.urn" + ".opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry" diff --git a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/TypeToClassKeyTest.java b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/TypeToClassKeyTest.java index c161714a3b..6fc526542b 100644 --- a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/TypeToClassKeyTest.java +++ b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/TypeToClassKeyTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.api.keys; import org.junit.Assert; @@ -18,21 +17,18 @@ import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; * @author madamjak */ public class TypeToClassKeyTest { - /** * Test equals. */ @Test public void test() { - final short ver10 = EncodeConstants.OF10_VERSION_ID; - final short ver13 = EncodeConstants.OF13_VERSION_ID; final int type1 = 1; final int type2 = 2; - TypeToClassKey typeToClsKey10 = new TypeToClassKey(ver10,type1); + TypeToClassKey typeToClsKey10 = new TypeToClassKey(EncodeConstants.OF_VERSION_1_0, type1); Assert.assertTrue("Wrong - equals to same object", typeToClsKey10.equals(typeToClsKey10)); Assert.assertFalse("Wrong - equals to null", typeToClsKey10.equals(null)); Assert.assertFalse("Wrong - equals to different class", typeToClsKey10.equals(new Object())); - TypeToClassKey typeToClsKey13 = new TypeToClassKey(ver13,type2); + TypeToClassKey typeToClsKey13 = new TypeToClassKey(EncodeConstants.OF_VERSION_1_3, type2); Assert.assertFalse("Wrong - equals by different version", typeToClsKey13.equals(new Object())); Assert.assertFalse("Wrong - equals by different type", typeToClsKey13.equals(typeToClsKey10)); } diff --git a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterActionDeserializerKeyTest.java b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterActionDeserializerKeyTest.java index 4374c3502e..940a5196b4 100644 --- a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterActionDeserializerKeyTest.java +++ b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterActionDeserializerKeyTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.api.keys.experimenter; import org.junit.Assert; @@ -19,25 +18,24 @@ import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; * @author michal.polkorab */ public class ExperimenterActionDeserializerKeyTest { - /** * Test ExperimenterActionDeserializerKey equals and hashCode. */ @Test public void test() { ExperimenterActionDeserializerKey key1 = - new ExperimenterActionDeserializerKey(EncodeConstants.OF10_VERSION_ID, 42L); + new ExperimenterActionDeserializerKey(EncodeConstants.OF_VERSION_1_0, 42L); ExperimenterActionDeserializerKey key2 = - new ExperimenterActionDeserializerKey(EncodeConstants.OF10_VERSION_ID, 42L); + new ExperimenterActionDeserializerKey(EncodeConstants.OF_VERSION_1_0, 42L); Assert.assertTrue("Wrong equals", key1.equals(key2)); Assert.assertTrue("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new ExperimenterActionDeserializerKey(EncodeConstants.OF13_VERSION_ID, 42L); + key2 = new ExperimenterActionDeserializerKey(EncodeConstants.OF_VERSION_1_3, 42L); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new ExperimenterActionDeserializerKey(EncodeConstants.OF10_VERSION_ID, null); + key2 = new ExperimenterActionDeserializerKey(EncodeConstants.OF_VERSION_1_0, null); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new ExperimenterActionDeserializerKey(EncodeConstants.OF10_VERSION_ID, 55L); + key2 = new ExperimenterActionDeserializerKey(EncodeConstants.OF_VERSION_1_0, 55L); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); } diff --git a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterActionSerializerKeyTest.java b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterActionSerializerKeyTest.java index 734625c00c..ca7b8a2c1a 100644 --- a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterActionSerializerKeyTest.java +++ b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterActionSerializerKeyTest.java @@ -29,24 +29,24 @@ public class ExperimenterActionSerializerKeyTest { @Test public void test() { ExperimenterActionSerializerKey key1 = - new ExperimenterActionSerializerKey(EncodeConstants.OF10_VERSION_ID, FORTY_TWO, TestSubType.class); + new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_0, FORTY_TWO, TestSubType.class); ExperimenterActionSerializerKey key2 = - new ExperimenterActionSerializerKey(EncodeConstants.OF10_VERSION_ID, FORTY_TWO, TestSubType.class); + new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_0, FORTY_TWO, TestSubType.class); Assert.assertTrue("Wrong equals", key1.equals(key2)); Assert.assertTrue("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new ExperimenterActionSerializerKey(EncodeConstants.OF13_VERSION_ID, FORTY_TWO, TestSubType.class); + key2 = new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_3, FORTY_TWO, TestSubType.class); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new ExperimenterActionSerializerKey(EncodeConstants.OF10_VERSION_ID, (Uint32) null, TestSubType.class); + key2 = new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_0, (Uint32) null, TestSubType.class); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new ExperimenterActionSerializerKey(EncodeConstants.OF10_VERSION_ID, FIFTY_FIVE, TestSubType.class); + key2 = new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_0, FIFTY_FIVE, TestSubType.class); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new ExperimenterActionSerializerKey(EncodeConstants.OF10_VERSION_ID, FIFTY_FIVE, null); + key2 = new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_0, FIFTY_FIVE, null); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new ExperimenterActionSerializerKey(EncodeConstants.OF10_VERSION_ID, FIFTY_FIVE, TestSubType2.class); + key2 = new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_0, FIFTY_FIVE, TestSubType2.class); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); } @@ -58,11 +58,11 @@ public class ExperimenterActionSerializerKeyTest { public void testEquals() { ExperimenterActionSerializerKey key1; ExperimenterActionSerializerKey key2; - key1 = new ExperimenterActionSerializerKey(EncodeConstants.OF10_VERSION_ID, FORTY_TWO, null); + key1 = new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_0, FORTY_TWO, null); Assert.assertTrue("Wrong equal to identical object.", key1.equals(key1)); - key2 = new ExperimenterActionSerializerKey(EncodeConstants.OF10_VERSION_ID, FORTY_TWO, TestSubType2.class); + key2 = new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_0, FORTY_TWO, TestSubType2.class); Assert.assertFalse("Wrong equal by actionSubType.", key1.equals(key2)); - key1 = new ExperimenterActionSerializerKey(EncodeConstants.OF10_VERSION_ID, FORTY_TWO, TestSubType.class); + key1 = new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_0, FORTY_TWO, TestSubType.class); Assert.assertFalse("Wrong equal by actionSubType.", key1.equals(key2)); } diff --git a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterIdDeserializerKeyTest.java b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterIdDeserializerKeyTest.java index 9b5befc339..47b2385cab 100644 --- a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterIdDeserializerKeyTest.java +++ b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterIdDeserializerKeyTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.api.keys.experimenter; import org.junit.Assert; @@ -15,6 +14,7 @@ import org.opendaylight.openflowjava.protocol.api.keys.MessageCodeKey; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.ErrorMessage; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.ExperimenterMessage; +import org.opendaylight.yangtools.yang.common.Uint32; /** * Unit tests for ExperimenterIdDeserializerKey. @@ -28,25 +28,29 @@ public class ExperimenterIdDeserializerKeyTest { */ @Test public void test() { - ExperimenterIdDeserializerKey key1 = - new ExperimenterIdDeserializerKey(EncodeConstants.OF10_VERSION_ID, 42L, ExperimenterMessage.class); - ExperimenterIdDeserializerKey key2 = - new ExperimenterIdDeserializerKey(EncodeConstants.OF10_VERSION_ID, 42L, ExperimenterMessage.class); + ExperimenterIdDeserializerKey key1 = new ExperimenterIdDeserializerKey(EncodeConstants.OF_VERSION_1_0, + Uint32.valueOf(42), ExperimenterMessage.class); + ExperimenterIdDeserializerKey key2 = new ExperimenterIdDeserializerKey(EncodeConstants.OF_VERSION_1_0, + Uint32.valueOf(42), ExperimenterMessage.class); Assert.assertTrue("Wrong equals", key1.equals(key2)); Assert.assertTrue("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new ExperimenterIdDeserializerKey(EncodeConstants.OF13_VERSION_ID, 42L, ExperimenterMessage.class); + key2 = new ExperimenterIdDeserializerKey(EncodeConstants.OF_VERSION_1_3, Uint32.valueOf(42), + ExperimenterMessage.class); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new ExperimenterIdDeserializerKey(EncodeConstants.OF10_VERSION_ID, 0L, ExperimenterMessage.class); + key2 = new ExperimenterIdDeserializerKey(EncodeConstants.OF_VERSION_1_0, Uint32.ZERO, + ExperimenterMessage.class); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new ExperimenterIdDeserializerKey(EncodeConstants.OF10_VERSION_ID, 55L, ExperimenterMessage.class); + key2 = new ExperimenterIdDeserializerKey(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(55), + ExperimenterMessage.class); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new ExperimenterIdDeserializerKey(EncodeConstants.OF10_VERSION_ID, 55L, null); + key2 = new ExperimenterIdDeserializerKey(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(55), null); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new ExperimenterIdDeserializerKey(EncodeConstants.OF10_VERSION_ID, 55L, ErrorMessage.class); + key2 = new ExperimenterIdDeserializerKey(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(55), + ErrorMessage.class); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); } @@ -56,15 +60,14 @@ public class ExperimenterIdDeserializerKeyTest { */ @Test public void testEquals() { - ExperimenterIdDeserializerKey key1 = - new ExperimenterIdDeserializerKey(EncodeConstants.OF10_VERSION_ID, 0L, ExperimenterMessage.class); + ExperimenterIdDeserializerKey key1 = new ExperimenterIdDeserializerKey(EncodeConstants.OF_VERSION_1_0, + Uint32.ZERO, ExperimenterMessage.class); Assert.assertTrue("Wrong equal to identical object.", key1.equals(key1)); - MessageCodeKey mk = new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, - EncodeConstants.EXPERIMENTER_VALUE, ExperimenterMessage.class); + MessageCodeKey mk = new MessageCodeKey(EncodeConstants.OF_VERSION_1_0, EncodeConstants.EXPERIMENTER_VALUE, + ExperimenterMessage.class); Assert.assertFalse("Wrong equal to different class.", key1.equals(mk)); - ExperimenterIdDeserializerKey key2 = - new ExperimenterIdDeserializerKey(EncodeConstants.OF10_VERSION_ID, 42L, ExperimenterMessage.class); + ExperimenterIdDeserializerKey key2 = new ExperimenterIdDeserializerKey(EncodeConstants.OF_VERSION_1_0, + Uint32.valueOf(42), ExperimenterMessage.class); Assert.assertFalse("Wrong equal by experimenterId.", key1.equals(key2)); } - } diff --git a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterIdSerializerKeyTest.java b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterIdSerializerKeyTest.java index c5239a01ae..7f3cca17fe 100644 --- a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterIdSerializerKeyTest.java +++ b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterIdSerializerKeyTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.api.keys.experimenter; import org.junit.Assert; @@ -15,6 +14,7 @@ import org.opendaylight.openflowjava.protocol.api.keys.MessageTypeKey; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.ErrorMessage; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.ExperimenterMessage; +import org.opendaylight.yangtools.yang.common.Uint32; /** * Unit tests for ExperimenterIdSerializerKey. @@ -28,22 +28,25 @@ public class ExperimenterIdSerializerKeyTest { */ @Test public void testHashCodeAndEquals() { - ExperimenterIdSerializerKey key1 = - new ExperimenterIdSerializerKey<>(EncodeConstants.OF10_VERSION_ID, 42L, ExperimenterMessage.class); - ExperimenterIdSerializerKey key2 = - new ExperimenterIdSerializerKey<>(EncodeConstants.OF10_VERSION_ID, 42L, ExperimenterMessage.class); + ExperimenterIdSerializerKey key1 = new ExperimenterIdSerializerKey<>(EncodeConstants.OF_VERSION_1_0, + Uint32.valueOf(42), ExperimenterMessage.class); + ExperimenterIdSerializerKey key2 = new ExperimenterIdSerializerKey<>(EncodeConstants.OF_VERSION_1_0, + Uint32.valueOf(42), ExperimenterMessage.class); Assert.assertTrue("Wrong equals", key1.equals(key2)); Assert.assertTrue("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new ExperimenterIdSerializerKey<>(EncodeConstants.OF13_VERSION_ID, 42L, ExperimenterMessage.class); + key2 = new ExperimenterIdSerializerKey<>(EncodeConstants.OF_VERSION_1_3, Uint32.valueOf(42), + ExperimenterMessage.class); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new ExperimenterIdSerializerKey<>(EncodeConstants.OF10_VERSION_ID, 55L, ExperimenterMessage.class); + key2 = new ExperimenterIdSerializerKey<>(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(55), + ExperimenterMessage.class); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new ExperimenterIdSerializerKey<>(EncodeConstants.OF10_VERSION_ID, 55L, null); + key2 = new ExperimenterIdSerializerKey<>(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(55), null); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new ExperimenterIdSerializerKey<>(EncodeConstants.OF10_VERSION_ID, 55L, ErrorMessage.class); + key2 = new ExperimenterIdSerializerKey<>(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(55), + ErrorMessage.class); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); } @@ -53,14 +56,13 @@ public class ExperimenterIdSerializerKeyTest { */ @Test public void testEquals() { - ExperimenterIdSerializerKey key1 = - new ExperimenterIdSerializerKey<>(EncodeConstants.OF10_VERSION_ID, 41L, ExperimenterMessage.class); + ExperimenterIdSerializerKey key1 = new ExperimenterIdSerializerKey<>(EncodeConstants.OF_VERSION_1_0, + Uint32.valueOf(41), ExperimenterMessage.class); Assert.assertTrue("Wrong equal to identical object.", key1.equals(key1)); - MessageTypeKey mk = new MessageTypeKey<>(EncodeConstants.OF10_VERSION_ID,ExperimenterMessage.class); + MessageTypeKey mk = new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_0, ExperimenterMessage.class); Assert.assertFalse("Wrong equal to different class.", key1.equals(mk)); - ExperimenterIdSerializerKey key2 = - new ExperimenterIdSerializerKey<>(EncodeConstants.OF10_VERSION_ID, 42L, ExperimenterMessage.class); + ExperimenterIdSerializerKey key2 = new ExperimenterIdSerializerKey<>(EncodeConstants.OF_VERSION_1_0, + Uint32.valueOf(42), ExperimenterMessage.class); Assert.assertFalse("Wrong equal by experimenterId.", key1.equals(key2)); } - } diff --git a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterIdTypeDeserializerKeyTest.java b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterIdTypeDeserializerKeyTest.java index dc69f8b8b7..80dc7e1a2b 100644 --- a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterIdTypeDeserializerKeyTest.java +++ b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterIdTypeDeserializerKeyTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.api.keys.experimenter; import org.junit.Assert; @@ -15,6 +14,7 @@ import org.opendaylight.openflowjava.protocol.api.keys.ExperimenterIdTypeDeseria import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.ErrorMessage; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.ExperimenterMessage; +import org.opendaylight.yangtools.yang.common.Uint32; /** * Unit tests for ExperimenterIdTypeDeserializerKey. @@ -28,28 +28,29 @@ public class ExperimenterIdTypeDeserializerKeyTest { */ @Test public void testHashCodeAndEquals() { - ExperimenterIdTypeDeserializerKey key1 = new ExperimenterIdTypeDeserializerKey(EncodeConstants.OF10_VERSION_ID, - 42L, 1L, ExperimenterMessage.class); - ExperimenterIdTypeDeserializerKey key2 = new ExperimenterIdTypeDeserializerKey(EncodeConstants.OF10_VERSION_ID, - 42L, 1L, ExperimenterMessage.class); + ExperimenterIdTypeDeserializerKey key1 = new ExperimenterIdTypeDeserializerKey(EncodeConstants.OF_VERSION_1_0, + Uint32.valueOf(42), 1L, ExperimenterMessage.class); + ExperimenterIdTypeDeserializerKey key2 = new ExperimenterIdTypeDeserializerKey(EncodeConstants.OF_VERSION_1_0, + Uint32.valueOf(42), 1L, ExperimenterMessage.class); Assert.assertTrue("Wrong equals", key1.equals(key2)); Assert.assertTrue("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new ExperimenterIdTypeDeserializerKey(EncodeConstants.OF13_VERSION_ID, 42L, 1L, + key2 = new ExperimenterIdTypeDeserializerKey(EncodeConstants.OF_VERSION_1_3, Uint32.valueOf(42), 1L, ExperimenterMessage.class); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new ExperimenterIdTypeDeserializerKey(EncodeConstants.OF10_VERSION_ID, 55L, 1L, + key2 = new ExperimenterIdTypeDeserializerKey(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(55), 1L, ExperimenterMessage.class); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new ExperimenterIdTypeDeserializerKey(EncodeConstants.OF10_VERSION_ID, 55L, 1L, null); + key2 = new ExperimenterIdTypeDeserializerKey(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(55), 1L, null); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new ExperimenterIdTypeDeserializerKey(EncodeConstants.OF10_VERSION_ID, 55L, 1L, ErrorMessage.class); + key2 = new ExperimenterIdTypeDeserializerKey(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(55), 1L, + ErrorMessage.class); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new ExperimenterIdTypeDeserializerKey(EncodeConstants.OF10_VERSION_ID, 42L, 2L, + key2 = new ExperimenterIdTypeDeserializerKey(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(42), 2L, ExperimenterMessage.class); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); @@ -60,19 +61,18 @@ public class ExperimenterIdTypeDeserializerKeyTest { */ @Test public void testEquals() { - ExperimenterIdTypeDeserializerKey key1 = new ExperimenterIdTypeDeserializerKey(EncodeConstants.OF10_VERSION_ID, - 41L, 1L, ExperimenterMessage.class); + ExperimenterIdTypeDeserializerKey key1 = new ExperimenterIdTypeDeserializerKey(EncodeConstants.OF_VERSION_1_0, + Uint32.valueOf(41), 1L, ExperimenterMessage.class); Assert.assertTrue("Wrong equal to identical object.", key1.equals(key1)); - ExperimenterIdSerializerKey mk = new ExperimenterIdSerializerKey<>(EncodeConstants.OF10_VERSION_ID, 42L, - ExperimenterMessage.class); + ExperimenterIdSerializerKey mk = new ExperimenterIdSerializerKey<>(EncodeConstants.OF_VERSION_1_0, + Uint32.valueOf(42), ExperimenterMessage.class); Assert.assertFalse("Wrong equal to different class.", key1.equals(mk)); - ExperimenterIdTypeDeserializerKey key2 = new ExperimenterIdTypeDeserializerKey(EncodeConstants.OF10_VERSION_ID, - 42L, 1L, ExperimenterMessage.class); + ExperimenterIdTypeDeserializerKey key2 = new ExperimenterIdTypeDeserializerKey(EncodeConstants.OF_VERSION_1_0, + Uint32.valueOf(42), 1L, ExperimenterMessage.class); Assert.assertFalse("Wrong equal by experimenterId.", key1.equals(key2)); - ExperimenterIdTypeDeserializerKey key3 = new ExperimenterIdTypeDeserializerKey(EncodeConstants.OF10_VERSION_ID, - 41L, 2L, ExperimenterMessage.class); + ExperimenterIdTypeDeserializerKey key3 = new ExperimenterIdTypeDeserializerKey(EncodeConstants.OF_VERSION_1_0, + Uint32.valueOf(41), 2L, ExperimenterMessage.class); Assert.assertFalse("Wrong equal by type.", key1.equals(key3)); } - } diff --git a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterIdTypeSerializerKeyTest.java b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterIdTypeSerializerKeyTest.java index 43bbddb26c..228a08ada0 100644 --- a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterIdTypeSerializerKeyTest.java +++ b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterIdTypeSerializerKeyTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.api.keys.experimenter; import org.junit.Assert; @@ -15,6 +14,7 @@ import org.opendaylight.openflowjava.protocol.api.keys.ExperimenterIdTypeSeriali import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.ErrorMessage; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.ExperimenterMessage; +import org.opendaylight.yangtools.yang.common.Uint32; /** * Unit tests for ExperimenterIdTypeSerializerKey. @@ -28,29 +28,29 @@ public class ExperimenterIdTypeSerializerKeyTest { */ @Test public void testHashCodeAndEquals() { - ExperimenterIdTypeSerializerKey key1 = - new ExperimenterIdTypeSerializerKey<>(EncodeConstants.OF10_VERSION_ID, 42L, 1L, - ExperimenterMessage.class); - ExperimenterIdTypeSerializerKey key2 = new ExperimenterIdTypeSerializerKey<>(EncodeConstants.OF10_VERSION_ID, - 42L, 1L, ExperimenterMessage.class); + ExperimenterIdTypeSerializerKey key1 = new ExperimenterIdTypeSerializerKey<>(EncodeConstants.OF_VERSION_1_0, + Uint32.valueOf(42), 1L, ExperimenterMessage.class); + ExperimenterIdTypeSerializerKey key2 = new ExperimenterIdTypeSerializerKey<>(EncodeConstants.OF_VERSION_1_0, + Uint32.valueOf(42), 1L, ExperimenterMessage.class); Assert.assertTrue("Wrong equals", key1.equals(key2)); Assert.assertTrue("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new ExperimenterIdTypeSerializerKey<>(EncodeConstants.OF13_VERSION_ID, 42L, 1L, + key2 = new ExperimenterIdTypeSerializerKey<>(EncodeConstants.OF_VERSION_1_3, Uint32.valueOf(42), 1L, ExperimenterMessage.class); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new ExperimenterIdTypeSerializerKey<>(EncodeConstants.OF10_VERSION_ID, 55L, 1L, + key2 = new ExperimenterIdTypeSerializerKey<>(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(55), 1L, ExperimenterMessage.class); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new ExperimenterIdTypeSerializerKey<>(EncodeConstants.OF10_VERSION_ID, 55L, 1L, null); + key2 = new ExperimenterIdTypeSerializerKey<>(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(55), 1L, null); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new ExperimenterIdTypeSerializerKey<>(EncodeConstants.OF10_VERSION_ID, 55L, 1L, ErrorMessage.class); + key2 = new ExperimenterIdTypeSerializerKey<>(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(55), 1L, + ErrorMessage.class); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new ExperimenterIdTypeSerializerKey<>(EncodeConstants.OF10_VERSION_ID, 42L, 2L, + key2 = new ExperimenterIdTypeSerializerKey<>(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(42), 2L, ExperimenterMessage.class); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); @@ -61,18 +61,18 @@ public class ExperimenterIdTypeSerializerKeyTest { */ @Test public void testEquals() { - ExperimenterIdTypeSerializerKey key1 = new ExperimenterIdTypeSerializerKey<>(EncodeConstants.OF10_VERSION_ID, - 41L, 1L, ExperimenterMessage.class); + ExperimenterIdTypeSerializerKey key1 = new ExperimenterIdTypeSerializerKey<>(EncodeConstants.OF_VERSION_1_0, + Uint32.valueOf(41), 1L, ExperimenterMessage.class); Assert.assertTrue("Wrong equal to identical object.", key1.equals(key1)); - ExperimenterIdSerializerKey mk = new ExperimenterIdSerializerKey<>(EncodeConstants.OF10_VERSION_ID, 42L, - ExperimenterMessage.class); + ExperimenterIdSerializerKey mk = new ExperimenterIdSerializerKey<>(EncodeConstants.OF_VERSION_1_0, + Uint32.valueOf(42), ExperimenterMessage.class); Assert.assertFalse("Wrong equal to different class.", key1.equals(mk)); - ExperimenterIdTypeSerializerKey key2 = new ExperimenterIdTypeSerializerKey<>(EncodeConstants.OF10_VERSION_ID, - 42L, 1L, ExperimenterMessage.class); + ExperimenterIdTypeSerializerKey key2 = new ExperimenterIdTypeSerializerKey<>(EncodeConstants.OF_VERSION_1_0, + Uint32.valueOf(42), 1L, ExperimenterMessage.class); Assert.assertFalse("Wrong equal by experimenterId.", key1.equals(key2)); - ExperimenterIdTypeSerializerKey key3 = new ExperimenterIdTypeSerializerKey<>(EncodeConstants.OF10_VERSION_ID, - 41L, 2L, ExperimenterMessage.class); + ExperimenterIdTypeSerializerKey key3 = new ExperimenterIdTypeSerializerKey<>(EncodeConstants.OF_VERSION_1_0, + Uint32.valueOf(41), 2L, ExperimenterMessage.class); Assert.assertFalse("Wrong equal by type.", key1.equals(key3)); } } diff --git a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterInstructionDeserializerKeyTest.java b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterInstructionDeserializerKeyTest.java index 090a37eca1..6c93848c80 100644 --- a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterInstructionDeserializerKeyTest.java +++ b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterInstructionDeserializerKeyTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.api.keys.experimenter; import org.junit.Assert; @@ -26,18 +25,18 @@ public class ExperimenterInstructionDeserializerKeyTest { @Test public void test() { ExperimenterInstructionDeserializerKey key1 = - new ExperimenterInstructionDeserializerKey(EncodeConstants.OF10_VERSION_ID, 42L); + new ExperimenterInstructionDeserializerKey(EncodeConstants.OF_VERSION_1_0, 42L); ExperimenterInstructionDeserializerKey key2 = - new ExperimenterInstructionDeserializerKey(EncodeConstants.OF10_VERSION_ID, 42L); + new ExperimenterInstructionDeserializerKey(EncodeConstants.OF_VERSION_1_0, 42L); Assert.assertTrue("Wrong equals", key1.equals(key2)); Assert.assertTrue("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new ExperimenterInstructionDeserializerKey(EncodeConstants.OF13_VERSION_ID, 42L); + key2 = new ExperimenterInstructionDeserializerKey(EncodeConstants.OF_VERSION_1_3, 42L); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new ExperimenterInstructionDeserializerKey(EncodeConstants.OF10_VERSION_ID, null); + key2 = new ExperimenterInstructionDeserializerKey(EncodeConstants.OF_VERSION_1_0, null); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new ExperimenterInstructionDeserializerKey(EncodeConstants.OF10_VERSION_ID, 55L); + key2 = new ExperimenterInstructionDeserializerKey(EncodeConstants.OF_VERSION_1_0, 55L); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); } diff --git a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterInstructionSerializerKeyTest.java b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterInstructionSerializerKeyTest.java index 83bad8daec..444d93bbf9 100644 --- a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterInstructionSerializerKeyTest.java +++ b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterInstructionSerializerKeyTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.api.keys.experimenter; import org.junit.Assert; @@ -19,27 +18,25 @@ import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; * @author michal.polkorab */ public class ExperimenterInstructionSerializerKeyTest { - /** * Test ExperimenterInstructionSerializerKey equals and hashCode. */ @Test public void test() { ExperimenterInstructionSerializerKey key1 = - new ExperimenterInstructionSerializerKey(EncodeConstants.OF10_VERSION_ID, 42L); + new ExperimenterInstructionSerializerKey(EncodeConstants.OF_VERSION_1_0, 42L); ExperimenterInstructionSerializerKey key2 = - new ExperimenterInstructionSerializerKey(EncodeConstants.OF10_VERSION_ID, 42L); + new ExperimenterInstructionSerializerKey(EncodeConstants.OF_VERSION_1_0, 42L); Assert.assertTrue("Wrong equals", key1.equals(key2)); Assert.assertTrue("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new ExperimenterInstructionSerializerKey(EncodeConstants.OF13_VERSION_ID, 42L); + key2 = new ExperimenterInstructionSerializerKey(EncodeConstants.OF_VERSION_1_3, 42L); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new ExperimenterInstructionSerializerKey(EncodeConstants.OF10_VERSION_ID, null); + key2 = new ExperimenterInstructionSerializerKey(EncodeConstants.OF_VERSION_1_0, null); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new ExperimenterInstructionSerializerKey(EncodeConstants.OF10_VERSION_ID, 55L); + key2 = new ExperimenterInstructionSerializerKey(EncodeConstants.OF_VERSION_1_0, 55L); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - } } diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/OFDatagramPacketDecoder.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/OFDatagramPacketDecoder.java index 91b9947d6c..3fa1ef506e 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/OFDatagramPacketDecoder.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/OFDatagramPacketDecoder.java @@ -35,7 +35,7 @@ public class OFDatagramPacketDecoder extends SimpleChannelInboundHandler out) throws Exception { + protected void encode(final ChannelHandlerContext ctx, + final UdpMessageListenerWrapper wrapper, final List out) throws Exception { LOG.trace("Encoding"); try { ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer(); - serializationFactory.messageToBuffer(wrapper.getMsg().getVersion().toJava(), buffer, wrapper.getMsg()); + serializationFactory.messageToBuffer(wrapper.getMsg().getVersion(), buffer, wrapper.getMsg()); out.add(new DatagramPacket(buffer, wrapper.getAddress())); } catch (RuntimeException e) { LOG.warn("Message serialization failed: {}", e.getMessage()); @@ -47,7 +47,7 @@ public class OFDatagramPacketEncoder extends MessageToMessageEncoder out) { + protected void decode(final ChannelHandlerContext ctx, final DatagramPacket msg, + final List out) { LOG.debug("OFDatagramPacketFramer"); MessageConsumer consumer = UdpConnectionMap.getMessageConsumer(msg.sender()); if (consumer == null) { @@ -94,8 +96,8 @@ public class OFDatagramPacketHandler extends MessageToMessageDecoder { throws Exception { LOG.trace("Encoding"); try { - serializationFactory.messageToBuffer(wrapper.getMsg().getVersion().toJava(), out, wrapper.getMsg()); + serializationFactory.messageToBuffer(wrapper.getMsg().getVersion(), out, wrapper.getMsg()); if (wrapper.getMsg() instanceof FlowModInput) { statisticsCounters.incrementCounter(CounterEventTypes.DS_FLOW_MODS_SENT); } diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/OFVersionDetector.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/OFVersionDetector.java index 7ca6bfd755..c57cdf9473 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/OFVersionDetector.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/OFVersionDetector.java @@ -5,18 +5,19 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.impl.core; +import static org.opendaylight.yangtools.yang.common.netty.ByteBufUtils.readUint8; + import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.ByteToMessageDecoder; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; +import java.util.Set; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.openflowjava.statistics.CounterEventTypes; import org.opendaylight.openflowjava.statistics.StatisticsCounters; +import org.opendaylight.yangtools.yang.common.Uint8; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,10 +30,10 @@ public class OFVersionDetector extends ByteToMessageDecoder { private static final Logger LOG = LoggerFactory.getLogger(OFVersionDetector.class); /** IDs of accepted OpenFlow protocol versions. */ - private static final List OF_VERSIONS = new ArrayList<>(Arrays.asList( - EncodeConstants.OF10_VERSION_ID, - EncodeConstants.OF13_VERSION_ID - )); + private static final Set OF_VERSIONS = Set.of( + EncodeConstants.OF_VERSION_1_0, + EncodeConstants.OF_VERSION_1_3 + ); private final StatisticsCounters statisticsCounters; private volatile boolean filterPacketIns; @@ -53,7 +54,7 @@ public class OFVersionDetector extends ByteToMessageDecoder { return; } - final byte version = in.readByte(); + final Uint8 version = readUint8(in); final short messageType = in.getUnsignedByte(in.readerIndex()); if (messageType == EncodeConstants.OF_HELLO_MESSAGE_TYPE_VALUE || OF_VERSIONS.contains(version)) { LOG.debug("detected version: {}", version); diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/VersionMessageUdpWrapper.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/VersionMessageUdpWrapper.java index fa2765330e..5d56dfb401 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/VersionMessageUdpWrapper.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/VersionMessageUdpWrapper.java @@ -5,11 +5,11 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.impl.core; import io.netty.buffer.ByteBuf; import java.net.InetSocketAddress; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Wraps received messages (includes version) and sender address. @@ -26,7 +26,7 @@ public class VersionMessageUdpWrapper extends VersionMessageWrapper { * @param messageBuffer ByteBuf containing binary message * @param address sender address */ - public VersionMessageUdpWrapper(final short version, final ByteBuf messageBuffer, final InetSocketAddress address) { + public VersionMessageUdpWrapper(final Uint8 version, final ByteBuf messageBuffer, final InetSocketAddress address) { super(version, messageBuffer); this.address = address; } diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/VersionMessageWrapper.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/VersionMessageWrapper.java index e40d680f55..082e6eef01 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/VersionMessageWrapper.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/VersionMessageWrapper.java @@ -10,6 +10,7 @@ package org.opendaylight.openflowjava.protocol.impl.core; import static java.util.Objects.requireNonNull; import io.netty.buffer.ByteBuf; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Wraps received messages (includes version). @@ -17,7 +18,7 @@ import io.netty.buffer.ByteBuf; * @author michal.polkorab */ public class VersionMessageWrapper { - private final short version; + private final Uint8 version; private final ByteBuf messageBuffer; /** @@ -26,8 +27,8 @@ public class VersionMessageWrapper { * @param version version decoded in {@link OFVersionDetector} * @param messageBuffer message received from {@link OFFrameDecoder} */ - public VersionMessageWrapper(final short version, final ByteBuf messageBuffer) { - this.version = version; + public VersionMessageWrapper(final Uint8 version, final ByteBuf messageBuffer) { + this.version = requireNonNull(version); this.messageBuffer = requireNonNull(messageBuffer); } @@ -36,7 +37,7 @@ public class VersionMessageWrapper { * * @return the version version decoded in {@link OFVersionDetector} */ - public short getVersion() { + public Uint8 getVersion() { return version; } diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/AbstractStackedOutboundQueue.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/AbstractStackedOutboundQueue.java index 8f9e5e4709..969fb4fa62 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/AbstractStackedOutboundQueue.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/AbstractStackedOutboundQueue.java @@ -23,6 +23,7 @@ import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.openflowjava.protocol.api.connection.OutboundQueue; import org.opendaylight.openflowjava.protocol.api.connection.OutboundQueueException; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader; +import org.opendaylight.yangtools.yang.common.Uint32; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -58,7 +59,7 @@ abstract class AbstractStackedOutboundQueue implements OutboundQueue { } @Override - public void commitEntry(final Long xid, final OfHeader message, final FutureCallback callback) { + public void commitEntry(final Uint32 xid, final OfHeader message, final FutureCallback callback) { commitEntry(xid, message, callback, OutboundQueueEntry.DEFAULT_IS_COMPLETE); } @@ -82,7 +83,7 @@ abstract class AbstractStackedOutboundQueue implements OutboundQueue { * This method is expected to be called from multiple threads concurrently. */ @Override - public Long reserveEntry() { + public Uint32 reserveEntry() { final long xid = LAST_XID_OFFSET_UPDATER.incrementAndGet(this); final StackedSegment fastSegment = firstSegment; @@ -116,7 +117,8 @@ abstract class AbstractStackedOutboundQueue implements OutboundQueue { } LOG.trace("Queue {} allocated XID {}", this, xid); - return xid; + // FIXME: reconcile uint32 vs. long overflows + return Uint32.valueOf(xid); } /** @@ -299,7 +301,7 @@ abstract class AbstractStackedOutboundQueue implements OutboundQueue { return !needsFlush; } - protected OutboundQueueEntry getEntry(final Long xid) { + protected OutboundQueueEntry getEntry(final long xid) { final StackedSegment fastSegment = firstSegment; final long calcOffset = xid - fastSegment.getBaseXid(); checkArgument(calcOffset >= 0, "Commit of XID %s does not match up with base XID %s", @@ -338,7 +340,7 @@ abstract class AbstractStackedOutboundQueue implements OutboundQueue { * @return number of failed entries */ @GuardedBy("unflushedSegments") - private long lockedFailSegments(Iterator iterator) { + private long lockedFailSegments(final Iterator iterator) { long entries = 0; // Fail all queues diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/OutboundQueueManager.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/OutboundQueueManager.java index b0b2270c76..f0e992ce9b 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/OutboundQueueManager.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/OutboundQueueManager.java @@ -13,6 +13,7 @@ import java.util.concurrent.TimeUnit; import org.opendaylight.openflowjava.protocol.api.connection.OutboundQueueHandler; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.BarrierInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader; +import org.opendaylight.yangtools.yang.common.Uint32; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -59,7 +60,7 @@ final class OutboundQueueManager extends } private void scheduleBarrierMessage() { - final Long xid = currentQueue.reserveBarrierIfNeeded(); + final Uint32 xid = currentQueue.reserveBarrierIfNeeded(); if (xid == null) { LOG.trace("Queue {} already contains a barrier, not scheduling one", currentQueue); return; diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/StackedOutboundQueue.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/StackedOutboundQueue.java index 50621ab186..7d13701f4b 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/StackedOutboundQueue.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/StackedOutboundQueue.java @@ -11,6 +11,7 @@ import com.google.common.util.concurrent.FutureCallback; import java.util.concurrent.atomic.AtomicLongFieldUpdater; import java.util.function.Function; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader; +import org.opendaylight.yangtools.yang.common.Uint32; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,13 +30,14 @@ final class StackedOutboundQueue extends AbstractStackedOutboundQueue { * This method is expected to be called from multiple threads concurrently */ @Override - public void commitEntry(final Long xid, final OfHeader message, final FutureCallback callback, + public void commitEntry(final Uint32 xid, final OfHeader message, final FutureCallback callback, final Function isCompletedFunction) { - final OutboundQueueEntry entry = getEntry(xid); + final long longXid = xid.toJava(); + final OutboundQueueEntry entry = getEntry(longXid); entry.commit(message, callback, isCompletedFunction); if (entry.isBarrier()) { - long my = xid; + long my = longXid; for (;;) { final long prev = BARRIER_XID_UPDATER.getAndSet(this, my); if (prev < my) { @@ -53,7 +55,7 @@ final class StackedOutboundQueue extends AbstractStackedOutboundQueue { manager.ensureFlushing(); } - Long reserveBarrierIfNeeded() { + Uint32 reserveBarrierIfNeeded() { if (isBarrierNeeded()) { return reserveEntry(); } diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/StackedOutboundQueueNoBarrier.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/StackedOutboundQueueNoBarrier.java index 119a5438f6..72e975e8f4 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/StackedOutboundQueueNoBarrier.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/StackedOutboundQueueNoBarrier.java @@ -14,6 +14,7 @@ import java.util.function.Function; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.FlowModInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader; +import org.opendaylight.yangtools.yang.common.Uint32; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -22,7 +23,6 @@ import org.slf4j.LoggerFactory; * another requests. */ public class StackedOutboundQueueNoBarrier extends AbstractStackedOutboundQueue { - private static final Logger LOG = LoggerFactory.getLogger(StackedOutboundQueueNoBarrier.class); StackedOutboundQueueNoBarrier(final AbstractOutboundQueueManager manager) { @@ -33,9 +33,9 @@ public class StackedOutboundQueueNoBarrier extends AbstractStackedOutboundQueue * This method is expected to be called from multiple threads concurrently */ @Override - public void commitEntry(final Long xid, final OfHeader message, final FutureCallback callback, + public void commitEntry(final Uint32 xid, final OfHeader message, final FutureCallback callback, final Function isCompletedFunction) { - final OutboundQueueEntry entry = getEntry(xid); + final OutboundQueueEntry entry = getEntry(xid.toJava()); if (message instanceof FlowModInput) { callback.onSuccess(null); diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/ActionDeserializerInitializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/ActionDeserializerInitializer.java index a9bd3334bb..89d3734c4e 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/ActionDeserializerInitializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/ActionDeserializerInitializer.java @@ -59,7 +59,7 @@ public final class ActionDeserializerInitializer { public static void registerDeserializers(final DeserializerRegistry registry) { // register OF v1.0 action deserializers ActionDeserializerRegistryHelper helper = - new ActionDeserializerRegistryHelper(EncodeConstants.OF10_VERSION_ID, registry); + new ActionDeserializerRegistryHelper(EncodeConstants.OF_VERSION_1_0, registry); helper.registerDeserializer(ActionConstants.OUTPUT_CODE, new OF10OutputActionDeserializer()); helper.registerDeserializer(ActionConstants.SET_VLAN_VID_CODE, new OF10SetVlanVidActionDeserializer()); helper.registerDeserializer(ActionConstants.SET_VLAN_PCP_CODE, new OF10SetVlanPcpActionDeserializer()); @@ -74,7 +74,7 @@ public final class ActionDeserializerInitializer { helper.registerDeserializer(ActionConstants.SET_TP_DST_CODE, new OF10SetTpDstActionDeserializer()); helper.registerDeserializer(ActionConstants.ENQUEUE_CODE, new OF10EnqueueActionDeserializer()); // register OF v1.3 action deserializers - helper = new ActionDeserializerRegistryHelper(EncodeConstants.OF13_VERSION_ID, registry); + helper = new ActionDeserializerRegistryHelper(EncodeConstants.OF_VERSION_1_3, registry); helper.registerDeserializer(ActionConstants.OUTPUT_CODE, new OF13OutputActionDeserializer()); helper.registerDeserializer(ActionConstants.COPY_TTL_OUT_CODE, new EmptyActionDeserializer<>(new CopyTtlOutCaseBuilder().build())); diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/DeserializationFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/DeserializationFactory.java index debbaf645e..5c48b32549 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/DeserializationFactory.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/DeserializationFactory.java @@ -15,6 +15,7 @@ import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer; import org.opendaylight.openflowjava.protocol.api.keys.MessageCodeKey; import org.opendaylight.openflowjava.protocol.api.keys.TypeToClassKey; import org.opendaylight.yangtools.yang.binding.DataObject; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Factory for deserialization. @@ -44,7 +45,7 @@ public class DeserializationFactory { * version decoded from OpenFlow protocol message * @return correct POJO as DataObject */ - public DataObject deserialize(final ByteBuf rawMessage, final short version) { + public DataObject deserialize(final ByteBuf rawMessage, final Uint8 version) { DataObject dataObject = null; int type = rawMessage.readUnsignedByte(); Class clazz = messageClassMap.get(new TypeToClassKey(version, type)); diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/DeserializerRegistryImpl.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/DeserializerRegistryImpl.java index 368e3b2dd8..25779853f1 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/DeserializerRegistryImpl.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/DeserializerRegistryImpl.java @@ -47,10 +47,10 @@ public class DeserializerRegistryImpl implements DeserializerRegistry { // register common structure deserializers registerDeserializer( - new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, EncodeConstants.EMPTY_VALUE, MatchV10.class), + new MessageCodeKey(EncodeConstants.OF_VERSION_1_0, EncodeConstants.EMPTY_VALUE, MatchV10.class), new OF10MatchDeserializer()); registerDeserializer( - new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, EncodeConstants.EMPTY_VALUE, Match.class), + new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, EncodeConstants.EMPTY_VALUE, Match.class), new MatchDeserializer()); // register match entry deserializers @@ -63,7 +63,7 @@ public class DeserializerRegistryImpl implements DeserializerRegistry { @Override @SuppressWarnings("unchecked") - public T getDeserializer(MessageCodeKey key) { + public T getDeserializer(final MessageCodeKey key) { OFGeneralDeserializer deserializer = registry.get(key); if (deserializer == null) { throw new IllegalStateException("Deserializer for key: " + key @@ -73,7 +73,7 @@ public class DeserializerRegistryImpl implements DeserializerRegistry { } @Override - public void registerDeserializer(MessageCodeKey key, OFGeneralDeserializer deserializer) { + public void registerDeserializer(final MessageCodeKey key, final OFGeneralDeserializer deserializer) { if (key == null || deserializer == null) { throw new IllegalArgumentException("MessageCodeKey or Deserializer is null"); } @@ -88,7 +88,7 @@ public class DeserializerRegistryImpl implements DeserializerRegistry { } @Override - public boolean unregisterDeserializer(MessageCodeKey key) { + public boolean unregisterDeserializer(final MessageCodeKey key) { if (key == null) { throw new IllegalArgumentException("MessageCodeKey is null"); } diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/InstructionDeserializerInitializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/InstructionDeserializerInitializer.java index 60e684a9de..c91e77ef50 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/InstructionDeserializerInitializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/InstructionDeserializerInitializer.java @@ -34,10 +34,10 @@ public final class InstructionDeserializerInitializer { * * @param registry registry to be filled with deserializers */ - public static void registerDeserializers(DeserializerRegistry registry) { + public static void registerDeserializers(final DeserializerRegistry registry) { // register OF v1.3 instruction deserializers InstructionDeserializerRegistryHelper helper = - new InstructionDeserializerRegistryHelper(EncodeConstants.OF13_VERSION_ID, registry); + new InstructionDeserializerRegistryHelper(EncodeConstants.OF_VERSION_1_3, registry); helper.registerDeserializer(1, new GoToTableInstructionDeserializer()); helper.registerDeserializer(2, new WriteMetadataInstructionDeserializer()); helper.registerDeserializer(3, new WriteActionsInstructionDeserializer()); diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/MatchEntryDeserializerInitializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/MatchEntryDeserializerInitializer.java index fad2812995..11c63acc55 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/MatchEntryDeserializerInitializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/MatchEntryDeserializerInitializer.java @@ -68,10 +68,10 @@ public final class MatchEntryDeserializerInitializer { * Registers match entry deserializers. * @param registry registry to be filled with deserializers */ - public static void registerMatchEntryDeserializers(DeserializerRegistry registry) { + public static void registerMatchEntryDeserializers(final DeserializerRegistry registry) { // register OpenflowBasicClass match entry deserializers MatchEntryDeserializerRegistryHelper helper = - new MatchEntryDeserializerRegistryHelper(EncodeConstants.OF13_VERSION_ID, + new MatchEntryDeserializerRegistryHelper(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, registry); helper.register(OxmMatchConstants.IN_PORT, new OxmInPortDeserializer()); helper.register(OxmMatchConstants.IN_PHY_PORT, new OxmInPhyPortDeserializer()); diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/TypeToClassMapInitializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/TypeToClassMapInitializer.java index ec0cac6611..47bf905449 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/TypeToClassMapInitializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/TypeToClassMapInitializer.java @@ -61,7 +61,7 @@ public final class TypeToClassMapInitializer { TypeToClassInitHelper helper; // init OF v1.0 mapping - helper = new TypeToClassInitHelper(EncodeConstants.OF10_VERSION_ID, messageClassMap); + helper = new TypeToClassInitHelper(EncodeConstants.OF_VERSION_1_0, messageClassMap); helper.registerTypeToClass((short) 0, HelloMessage.class); helper.registerTypeToClass((short) 1, ErrorMessage.class); helper.registerTypeToClass((short) 2, EchoRequestMessage.class); @@ -77,7 +77,7 @@ public final class TypeToClassMapInitializer { helper.registerTypeToClass((short) 21, GetQueueConfigOutput.class); // init OF v1.3 mapping - helper = new TypeToClassInitHelper(EncodeConstants.OF13_VERSION_ID, messageClassMap); + helper = new TypeToClassInitHelper(EncodeConstants.OF_VERSION_1_3, messageClassMap); helper.registerTypeToClass((short) 0, HelloMessage.class); helper.registerTypeToClass((short) 1, ErrorMessage.class); helper.registerTypeToClass((short) 2, EchoRequestMessage.class); @@ -95,7 +95,7 @@ public final class TypeToClassMapInitializer { helper.registerTypeToClass((short) 27, GetAsyncOutput.class); // init OF v1.4 mapping - helper = new TypeToClassInitHelper(EncodeConstants.OF14_VERSION_ID, messageClassMap); + helper = new TypeToClassInitHelper(EncodeConstants.OF_VERSION_1_4, messageClassMap); helper.registerTypeToClass((short) 0, HelloMessage.class); helper.registerTypeToClass((short) 2, EchoRequestMessage.class); helper.registerTypeToClass((short) 3, EchoOutput.class); @@ -103,7 +103,7 @@ public final class TypeToClassMapInitializer { helper.registerTypeToClass((short) 21, BarrierOutput.class); // init OF v1.5 mapping - helper = new TypeToClassInitHelper(EncodeConstants.OF15_VERSION_ID, messageClassMap); + helper = new TypeToClassInitHelper(EncodeConstants.OF_VERSION_1_5, messageClassMap); helper.registerTypeToClass((short) 0, HelloMessage.class); helper.registerTypeToClass((short) 2, EchoRequestMessage.class); helper.registerTypeToClass((short) 3, EchoOutput.class); @@ -119,7 +119,7 @@ public final class TypeToClassMapInitializer { TypeToClassInitHelper helper; // init OF v1.0 mapping - helper = new TypeToClassInitHelper(EncodeConstants.OF10_VERSION_ID, messageClassMap); + helper = new TypeToClassInitHelper(EncodeConstants.OF_VERSION_1_0, messageClassMap); helper.registerTypeToClass((short) 5, GetFeaturesInput.class); helper.registerTypeToClass((short) 7, GetConfigInput.class); helper.registerTypeToClass((short) 9, SetConfigInput.class); @@ -131,7 +131,7 @@ public final class TypeToClassMapInitializer { helper.registerTypeToClass((short) 20, GetQueueConfigInput.class); // init OF v1.3 mapping - helper = new TypeToClassInitHelper(EncodeConstants.OF13_VERSION_ID, messageClassMap); + helper = new TypeToClassInitHelper(EncodeConstants.OF_VERSION_1_3, messageClassMap); helper.registerTypeToClass((short) 5, GetFeaturesInput.class); helper.registerTypeToClass((short) 7, GetConfigInput.class); helper.registerTypeToClass((short) 9, SetConfigInput.class); @@ -149,13 +149,13 @@ public final class TypeToClassMapInitializer { helper.registerTypeToClass((short) 29, MeterModInput.class); // init OF v1.4 mapping - helper = new TypeToClassInitHelper(EncodeConstants.OF14_VERSION_ID, messageClassMap); + helper = new TypeToClassInitHelper(EncodeConstants.OF_VERSION_1_4, messageClassMap); helper.registerTypeToClass((short) 7, GetConfigInput.class); helper.registerTypeToClass((short) 9, SetConfigInput.class); helper.registerTypeToClass((short) 20, BarrierInput.class); // init OF v1.5 mapping - helper = new TypeToClassInitHelper(EncodeConstants.OF15_VERSION_ID, messageClassMap); + helper = new TypeToClassInitHelper(EncodeConstants.OF_VERSION_1_5, messageClassMap); helper.registerTypeToClass((short) 7, GetConfigInput.class); helper.registerTypeToClass((short) 9, SetConfigInput.class); helper.registerTypeToClass((short) 20, BarrierInput.class); diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/action/OF13SetFieldActionDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/action/OF13SetFieldActionDeserializer.java index d6d61bcd20..ad73ade075 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/action/OF13SetFieldActionDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/action/OF13SetFieldActionDeserializer.java @@ -43,7 +43,7 @@ public class OF13SetFieldActionDeserializer extends AbstractActionCaseDeserializ int oxmClass = input.getUnsignedShort(input.readerIndex()); // get oxm_field & hasMask byte and extract the field value int oxmField = input.getUnsignedByte(input.readerIndex() + Short.BYTES) >>> 1; - MatchEntryDeserializerKey key = new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, + MatchEntryDeserializerKey key = new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, oxmClass, oxmField); if (oxmClass == EncodeConstants.EXPERIMENTER_VALUE) { long expId = input.getUnsignedInt(input.readerIndex() + Short.BYTES + 2 * Byte.BYTES); diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/ErrorMessageFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/ErrorMessageFactory.java index 934361486e..3e81ed60c3 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/ErrorMessageFactory.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/ErrorMessageFactory.java @@ -35,6 +35,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev13 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.ErrorMessage; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.ErrorMessageBuilder; import org.opendaylight.yangtools.yang.common.Uint16; +import org.opendaylight.yangtools.yang.common.Uint32; /** * Translates Error messages. @@ -63,8 +64,8 @@ public class ErrorMessageFactory implements OFDeserializer, if (ErrorType.EXPERIMENTER.equals(errorType)) { OFDeserializer deserializer = registry.getDeserializer( ExperimenterDeserializerKeyFactory.createExperimenterErrorDeserializerKey( - EncodeConstants.OF13_VERSION_ID, rawMessage.getUnsignedInt( - rawMessage.readerIndex() + Short.BYTES))); + EncodeConstants.OF_VERSION_1_3, Uint32.fromIntBits(rawMessage.getInt( + rawMessage.readerIndex() + Short.BYTES)))); rawMessage.readerIndex(startIndex); return deserializer.deserialize(rawMessage); } diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/ExperimenterMessageFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/ExperimenterMessageFactory.java index 6636ae37d0..d5694e0135 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/ExperimenterMessageFactory.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/ExperimenterMessageFactory.java @@ -39,7 +39,7 @@ public class ExperimenterMessageFactory implements OFDeserializer deserializer = deserializerRegistry.getDeserializer( ExperimenterDeserializerKeyFactory.createExperimenterMessageDeserializerKey( - EncodeConstants.OF13_VERSION_ID, expId.toJava(), expType.toJava())); + EncodeConstants.OF_VERSION_1_3, expId, expType.toJava())); return new ExperimenterMessageBuilder() .setVersion(EncodeConstants.OF_VERSION_1_3) diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/FlowModInputMessageFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/FlowModInputMessageFactory.java index 0c6e7cf019..3642c54b0f 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/FlowModInputMessageFactory.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/FlowModInputMessageFactory.java @@ -55,12 +55,12 @@ public class FlowModInputMessageFactory implements OFDeserializer, .setFlags(createFlowModFlagsFromBitmap(rawMessage.readUnsignedShort())); rawMessage.skipBytes(PADDING); OFDeserializer matchDeserializer = registry.getDeserializer( - new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, EncodeConstants.EMPTY_VALUE, Match.class)); + new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, EncodeConstants.EMPTY_VALUE, Match.class)); return builder .setMatch(matchDeserializer.deserialize(rawMessage)) .setInstruction(ListDeserializer.deserializeList(EncodeConstants.OF13_VERSION_ID, rawMessage.readableBytes(), rawMessage, - CodeKeyMakerFactory.createInstructionsKeyMaker(EncodeConstants.OF13_VERSION_ID), registry)) + CodeKeyMakerFactory.createInstructionsKeyMaker(EncodeConstants.OF_VERSION_1_3), registry)) .build(); } diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/FlowRemovedMessageFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/FlowRemovedMessageFactory.java index 69c81f7fa3..64e1f51bd6 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/FlowRemovedMessageFactory.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/FlowRemovedMessageFactory.java @@ -54,7 +54,7 @@ public class FlowRemovedMessageFactory implements OFDeserializer matchDeserializer = registry.getDeserializer(new MessageCodeKey( - EncodeConstants.OF13_VERSION_ID, EncodeConstants.EMPTY_VALUE, Match.class)); + EncodeConstants.OF_VERSION_1_3, EncodeConstants.EMPTY_VALUE, Match.class)); return builder.setMatch(matchDeserializer.deserialize(rawMessage)).build(); } diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GroupModInputMessageFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GroupModInputMessageFactory.java index 15431a2038..0c715892df 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GroupModInputMessageFactory.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GroupModInputMessageFactory.java @@ -43,12 +43,12 @@ public class GroupModInputMessageFactory implements OFDeserializer actions = ListDeserializer.deserializeList(EncodeConstants.OF13_VERSION_ID, bucketsLength - BUCKETS_HEADER_LENGTH, rawMessage, keyMaker, registry); bucketsBuilder.setAction(actions); diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MeterModInputMessageFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MeterModInputMessageFactory.java index 3b24c92f27..9593fb89f4 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MeterModInputMessageFactory.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MeterModInputMessageFactory.java @@ -32,6 +32,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.band.header.meter.band.meter.band.dscp.remark._case.MeterBandDscpRemarkBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.mod.Bands; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.mod.BandsBuilder; +import org.opendaylight.yangtools.yang.common.Uint32; /** * Translates MeterModInput messages. @@ -88,11 +89,11 @@ public class MeterModInputMessageFactory implements OFDeserializer deserializer = registry .getDeserializer(ExperimenterDeserializerKeyFactory - .createMeterBandDeserializerKey(EncodeConstants.OF13_VERSION_ID, expId)); + .createMeterBandDeserializerKey(EncodeConstants.OF_VERSION_1_3, expId)); bandsBuilder.setMeterBand(deserializer.deserialize(rawMessage)); break; default: diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactory.java index 8917d3661f..6ce1f45fa0 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactory.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactory.java @@ -30,8 +30,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.InstructionRelatedTableFeaturePropertyBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.NextTableRelatedTableFeaturePropertyBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.OxmRelatedTableFeaturePropertyBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.table.features.properties.container.table.feature.properties.NextTableIds; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.table.features.properties.container.table.feature.properties.NextTableIdsBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.next.table.related.table.feature.property.NextTableIds; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.next.table.related.table.feature.property.NextTableIdsBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction.rev130731.instructions.grouping.Instruction; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ActionType; @@ -292,10 +292,10 @@ public class MultipartReplyMessageFactory implements OFDeserializer matchDeserializer = registry.getDeserializer(new MessageCodeKey( - EncodeConstants.OF13_VERSION_ID, EncodeConstants.EMPTY_VALUE, Match.class)); + EncodeConstants.OF_VERSION_1_3, EncodeConstants.EMPTY_VALUE, Match.class)); flowStatsBuilder.setMatch(matchDeserializer.deserialize(subInput)); CodeKeyMaker keyMaker = CodeKeyMakerFactory - .createInstructionsKeyMaker(EncodeConstants.OF13_VERSION_ID); + .createInstructionsKeyMaker(EncodeConstants.OF_VERSION_1_3); List instructions = ListDeserializer.deserializeList( EncodeConstants.OF13_VERSION_ID, subInput.readableBytes(), subInput, keyMaker, registry); flowStatsBuilder.setInstruction(instructions); @@ -390,7 +390,7 @@ public class MultipartReplyMessageFactory implements OFDeserializer instructions = ListDeserializer.deserializeHeaders(EncodeConstants.OF13_VERSION_ID, propertyLength - COMMON_PROPERTY_LENGTH, input, keyMaker, registry); builder.addAugmentation(new InstructionRelatedTableFeaturePropertyBuilder() @@ -411,7 +411,7 @@ public class MultipartReplyMessageFactory implements OFDeserializer actions = ListDeserializer.deserializeHeaders(EncodeConstants.OF13_VERSION_ID, propertyLength - COMMON_PROPERTY_LENGTH, input, keyMaker, registry); builder.addAugmentation(new ActionRelatedTableFeaturePropertyBuilder().setAction(actions).build()); @@ -421,17 +421,17 @@ public class MultipartReplyMessageFactory implements OFDeserializer entries = ListDeserializer.deserializeHeaders(EncodeConstants.OF13_VERSION_ID, propertyLength - COMMON_PROPERTY_LENGTH, input, keyMaker, registry); builder.addAugmentation(new OxmRelatedTableFeaturePropertyBuilder().setMatchEntry(entries).build()); } else if (type.equals(TableFeaturesPropType.OFPTFPTEXPERIMENTER) || type.equals(TableFeaturesPropType.OFPTFPTEXPERIMENTERMISS)) { - long expId = input.readUnsignedInt(); + final Uint32 expId = readUint32(input); input.readerIndex(propStartIndex); OFDeserializer propDeserializer = registry.getDeserializer( ExperimenterDeserializerKeyFactory.createMultipartReplyTFDeserializerKey( - EncodeConstants.OF13_VERSION_ID, expId)); + EncodeConstants.OF_VERSION_1_3, expId)); TableFeatureProperties expProp = propDeserializer.deserialize(input); properties.add(expProp); continue; @@ -628,11 +628,11 @@ public class MultipartReplyMessageFactory implements OFDeserializer deserializer = registry.getDeserializer( ExperimenterDeserializerKeyFactory.createMeterBandDeserializerKey( - EncodeConstants.OF13_VERSION_ID, expId)); + EncodeConstants.OF_VERSION_1_3, expId)); bandsBuilder.setMeterBand(deserializer.deserialize(input)); break; default: @@ -654,7 +654,7 @@ public class MultipartReplyMessageFactory implements OFDeserializer deserializer = registry.getDeserializer( ExperimenterDeserializerKeyFactory.createMultipartReplyMessageDeserializerKey( - EncodeConstants.OF13_VERSION_ID, expId.toJava(), expType.toJava())); + EncodeConstants.OF_VERSION_1_3, expId, expType.toJava())); final MultipartReplyExperimenterBuilder mpExperimenterBld = new MultipartReplyExperimenterBuilder() .setExperimenter(new ExperimenterId(expId)) @@ -806,7 +806,7 @@ public class MultipartReplyMessageFactory implements OFDeserializer actions = ListDeserializer.deserializeList(EncodeConstants.OF13_VERSION_ID, bucketsLength - BUCKETS_HEADER_LENGTH, input, keyMaker, registry); bucketsBuilder.setAction(actions); diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestInputMessageFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestInputMessageFactory.java index 6ae703ccc1..0a375b62fc 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestInputMessageFactory.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestInputMessageFactory.java @@ -30,8 +30,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.InstructionRelatedTableFeaturePropertyBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.NextTableRelatedTableFeaturePropertyBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.OxmRelatedTableFeaturePropertyBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.table.features.properties.container.table.feature.properties.NextTableIds; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.table.features.properties.container.table.feature.properties.NextTableIdsBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.next.table.related.table.feature.property.NextTableIds; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.next.table.related.table.feature.property.NextTableIdsBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction.rev130731.instructions.grouping.Instruction; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.GroupId; @@ -94,6 +94,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.table.features.properties.grouping.TableFeatureProperties; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.table.features.properties.grouping.TableFeaturePropertiesBuilder; import org.opendaylight.yangtools.yang.common.Empty; +import org.opendaylight.yangtools.yang.common.Uint32; /** * Translates MultipartRequestInput messages. @@ -116,12 +117,12 @@ public class MultipartRequestInputMessageFactory private DeserializerRegistry registry; @Override - public void injectDeserializerRegistry(DeserializerRegistry deserializerRegistry) { + public void injectDeserializerRegistry(final DeserializerRegistry deserializerRegistry) { registry = deserializerRegistry; } @Override - public MultipartRequestInput deserialize(ByteBuf rawMessage) { + public MultipartRequestInput deserialize(final ByteBuf rawMessage) { Objects.requireNonNull(registry); MultipartRequestInputBuilder builder = new MultipartRequestInputBuilder() @@ -184,18 +185,18 @@ public class MultipartRequestInputMessageFactory return builder.build(); } - private static MultipartType getMultipartType(int input) { + private static MultipartType getMultipartType(final int input) { return MultipartType.forValue(input); } @SuppressWarnings("checkstyle:AbbreviationAsWordInName") - private static MultipartRequestFlags getMultipartRequestFlags(int input) { + private static MultipartRequestFlags getMultipartRequestFlags(final int input) { final Boolean _oFPMPFREQMORE = (input & 1 << 0) != 0; MultipartRequestFlags flag = new MultipartRequestFlags(_oFPMPFREQMORE); return flag; } - private MultipartRequestTableFeaturesCase setTableFeatures(ByteBuf input) { + private MultipartRequestTableFeaturesCase setTableFeatures(final ByteBuf input) { MultipartRequestTableFeaturesCaseBuilder caseBuilder = new MultipartRequestTableFeaturesCaseBuilder(); MultipartRequestTableFeaturesBuilder tableFeaturesBuilder = new MultipartRequestTableFeaturesBuilder(); List features = new ArrayList<>(); @@ -218,7 +219,7 @@ public class MultipartRequestInputMessageFactory return caseBuilder.build(); } - private List createTableFeaturesProperties(ByteBuf input, int length) { + private List createTableFeaturesProperties(final ByteBuf input, final int length) { List properties = new ArrayList<>(); int tableFeaturesLength = length; while (tableFeaturesLength > 0) { @@ -231,7 +232,7 @@ public class MultipartRequestInputMessageFactory tableFeaturesLength -= propertyLength; if (type.equals(TableFeaturesPropType.OFPTFPTINSTRUCTIONS) || type.equals(TableFeaturesPropType.OFPTFPTINSTRUCTIONSMISS)) { - CodeKeyMaker keyMaker = CodeKeyMakerFactory.createInstructionsKeyMaker(EncodeConstants.OF13_VERSION_ID); + CodeKeyMaker keyMaker = CodeKeyMakerFactory.createInstructionsKeyMaker(EncodeConstants.OF_VERSION_1_3); List instructions = ListDeserializer.deserializeHeaders(EncodeConstants.OF13_VERSION_ID, propertyLength - COMMON_PROPERTY_LENGTH, input, keyMaker, registry); builder.addAugmentation(new InstructionRelatedTableFeaturePropertyBuilder() @@ -252,7 +253,7 @@ public class MultipartRequestInputMessageFactory || type.equals(TableFeaturesPropType.OFPTFPTWRITEACTIONSMISS) || type.equals(TableFeaturesPropType.OFPTFPTAPPLYACTIONS) || type.equals(TableFeaturesPropType.OFPTFPTAPPLYACTIONSMISS)) { - CodeKeyMaker keyMaker = CodeKeyMakerFactory.createActionsKeyMaker(EncodeConstants.OF13_VERSION_ID); + CodeKeyMaker keyMaker = CodeKeyMakerFactory.createActionsKeyMaker(EncodeConstants.OF_VERSION_1_3); List actions = ListDeserializer.deserializeHeaders(EncodeConstants.OF13_VERSION_ID, propertyLength - COMMON_PROPERTY_LENGTH, input, keyMaker, registry); builder.addAugmentation(new ActionRelatedTableFeaturePropertyBuilder().setAction(actions).build()); @@ -262,17 +263,17 @@ public class MultipartRequestInputMessageFactory || type.equals(TableFeaturesPropType.OFPTFPTWRITESETFIELDMISS) || type.equals(TableFeaturesPropType.OFPTFPTAPPLYSETFIELD) || type.equals(TableFeaturesPropType.OFPTFPTAPPLYSETFIELDMISS)) { - CodeKeyMaker keyMaker = CodeKeyMakerFactory.createMatchEntriesKeyMaker(EncodeConstants.OF13_VERSION_ID); + CodeKeyMaker keyMaker = CodeKeyMakerFactory.createMatchEntriesKeyMaker(EncodeConstants.OF_VERSION_1_3); List entries = ListDeserializer.deserializeHeaders(EncodeConstants.OF13_VERSION_ID, propertyLength - COMMON_PROPERTY_LENGTH, input, keyMaker, registry); builder.addAugmentation(new OxmRelatedTableFeaturePropertyBuilder().setMatchEntry(entries).build()); } else if (type.equals(TableFeaturesPropType.OFPTFPTEXPERIMENTER) || type.equals(TableFeaturesPropType.OFPTFPTEXPERIMENTERMISS)) { - long expId = input.readUnsignedInt(); + final Uint32 expId = readUint32(input); input.readerIndex(propStartIndex); OFDeserializer propDeserializer = registry .getDeserializer(ExperimenterDeserializerKeyFactory - .createMultipartReplyTFDeserializerKey(EncodeConstants.OF13_VERSION_ID, expId)); + .createMultipartReplyTFDeserializerKey(EncodeConstants.OF_VERSION_1_3, expId)); TableFeatureProperties expProp = propDeserializer.deserialize(input); properties.add(expProp); continue; @@ -286,12 +287,12 @@ public class MultipartRequestInputMessageFactory return properties; } - private static TableConfig createTableConfig(long input) { + private static TableConfig createTableConfig(final long input) { boolean deprecated = (input & 3) != 0; return new TableConfig(deprecated); } - private static MultipartRequestDescCase setDesc(ByteBuf input) { + private static MultipartRequestDescCase setDesc(final ByteBuf input) { MultipartRequestDescCaseBuilder caseBuilder = new MultipartRequestDescCaseBuilder(); MultipartRequestDescBuilder descBuilder = new MultipartRequestDescBuilder(); descBuilder.setEmpty(Empty.getInstance()); @@ -299,7 +300,7 @@ public class MultipartRequestInputMessageFactory return caseBuilder.build(); } - private MultipartRequestFlowCase setFlow(ByteBuf input) { + private MultipartRequestFlowCase setFlow(final ByteBuf input) { final MultipartRequestFlowCaseBuilder caseBuilder = new MultipartRequestFlowCaseBuilder(); MultipartRequestFlowBuilder flowBuilder = new MultipartRequestFlowBuilder(); flowBuilder.setTableId(readUint8(input)); @@ -310,13 +311,13 @@ public class MultipartRequestInputMessageFactory flowBuilder.setCookie(readUint64(input)); flowBuilder.setCookieMask(readUint64(input)); OFDeserializer matchDeserializer = registry.getDeserializer( - new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, EncodeConstants.EMPTY_VALUE, Match.class)); + new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, EncodeConstants.EMPTY_VALUE, Match.class)); flowBuilder.setMatch(matchDeserializer.deserialize(input)); caseBuilder.setMultipartRequestFlow(flowBuilder.build()); return caseBuilder.build(); } - private MultipartRequestAggregateCase setAggregate(ByteBuf input) { + private MultipartRequestAggregateCase setAggregate(final ByteBuf input) { final MultipartRequestAggregateCaseBuilder caseBuilder = new MultipartRequestAggregateCaseBuilder(); MultipartRequestAggregateBuilder aggregateBuilder = new MultipartRequestAggregateBuilder(); aggregateBuilder.setTableId(readUint8(input)); @@ -327,13 +328,13 @@ public class MultipartRequestInputMessageFactory aggregateBuilder.setCookie(readUint64(input)); aggregateBuilder.setCookieMask(readUint64(input)); OFDeserializer matchDeserializer = registry.getDeserializer( - new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, EncodeConstants.EMPTY_VALUE, Match.class)); + new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, EncodeConstants.EMPTY_VALUE, Match.class)); aggregateBuilder.setMatch(matchDeserializer.deserialize(input)); caseBuilder.setMultipartRequestAggregate(aggregateBuilder.build()); return caseBuilder.build(); } - private static MultipartRequestPortDescCase setPortDesc(ByteBuf input) { + private static MultipartRequestPortDescCase setPortDesc(final ByteBuf input) { MultipartRequestPortDescCaseBuilder caseBuilder = new MultipartRequestPortDescCaseBuilder(); MultipartRequestPortDescBuilder portBuilder = new MultipartRequestPortDescBuilder(); portBuilder.setEmpty(Empty.getInstance()); @@ -341,7 +342,7 @@ public class MultipartRequestInputMessageFactory return caseBuilder.build(); } - private static MultipartRequestPortStatsCase setPortStats(ByteBuf input) { + private static MultipartRequestPortStatsCase setPortStats(final ByteBuf input) { MultipartRequestPortStatsCaseBuilder caseBuilder = new MultipartRequestPortStatsCaseBuilder(); MultipartRequestPortStatsBuilder portBuilder = new MultipartRequestPortStatsBuilder(); portBuilder.setPortNo(readUint32(input)); @@ -349,7 +350,7 @@ public class MultipartRequestInputMessageFactory return caseBuilder.build(); } - private static MultipartRequestQueueCase setQueue(ByteBuf input) { + private static MultipartRequestQueueCase setQueue(final ByteBuf input) { MultipartRequestQueueCaseBuilder caseBuilder = new MultipartRequestQueueCaseBuilder(); MultipartRequestQueueBuilder queueBuilder = new MultipartRequestQueueBuilder(); queueBuilder.setPortNo(readUint32(input)); @@ -358,7 +359,7 @@ public class MultipartRequestInputMessageFactory return caseBuilder.build(); } - private static MultipartRequestGroupCase setGroup(ByteBuf input) { + private static MultipartRequestGroupCase setGroup(final ByteBuf input) { MultipartRequestGroupCaseBuilder caseBuilder = new MultipartRequestGroupCaseBuilder(); MultipartRequestGroupBuilder groupBuilder = new MultipartRequestGroupBuilder(); groupBuilder.setGroupId(new GroupId(readUint32(input))); @@ -366,7 +367,7 @@ public class MultipartRequestInputMessageFactory return caseBuilder.build(); } - private static MultipartRequestGroupDescCase setGroupDesc(ByteBuf input) { + private static MultipartRequestGroupDescCase setGroupDesc(final ByteBuf input) { MultipartRequestGroupDescCaseBuilder caseBuilder = new MultipartRequestGroupDescCaseBuilder(); MultipartRequestGroupDescBuilder groupBuilder = new MultipartRequestGroupDescBuilder(); groupBuilder.setEmpty(Empty.getInstance()); @@ -374,7 +375,7 @@ public class MultipartRequestInputMessageFactory return caseBuilder.build(); } - private static MultipartRequestGroupFeaturesCase setGroupFeatures(ByteBuf input) { + private static MultipartRequestGroupFeaturesCase setGroupFeatures(final ByteBuf input) { MultipartRequestGroupFeaturesCaseBuilder caseBuilder = new MultipartRequestGroupFeaturesCaseBuilder(); MultipartRequestGroupFeaturesBuilder groupBuilder = new MultipartRequestGroupFeaturesBuilder(); groupBuilder.setEmpty(Empty.getInstance()); @@ -382,7 +383,7 @@ public class MultipartRequestInputMessageFactory return caseBuilder.build(); } - private static MultipartRequestMeterCase setMeter(ByteBuf input) { + private static MultipartRequestMeterCase setMeter(final ByteBuf input) { MultipartRequestMeterCaseBuilder caseBuilder = new MultipartRequestMeterCaseBuilder(); MultipartRequestMeterBuilder meterBuilder = new MultipartRequestMeterBuilder(); meterBuilder.setMeterId(new MeterId(readUint32(input))); @@ -390,7 +391,7 @@ public class MultipartRequestInputMessageFactory return caseBuilder.build(); } - private static MultipartRequestMeterConfigCase setMeterConfig(ByteBuf input) { + private static MultipartRequestMeterConfigCase setMeterConfig(final ByteBuf input) { MultipartRequestMeterConfigCaseBuilder caseBuilder = new MultipartRequestMeterConfigCaseBuilder(); MultipartRequestMeterConfigBuilder meterBuilder = new MultipartRequestMeterConfigBuilder(); meterBuilder.setMeterId(new MeterId(readUint32(input))); @@ -398,7 +399,7 @@ public class MultipartRequestInputMessageFactory return caseBuilder.build(); } - private static MultipartRequestMeterFeaturesCase setMeterFeatures(ByteBuf input) { + private static MultipartRequestMeterFeaturesCase setMeterFeatures(final ByteBuf input) { MultipartRequestMeterFeaturesCaseBuilder caseBuilder = new MultipartRequestMeterFeaturesCaseBuilder(); MultipartRequestMeterFeaturesBuilder meterBuilder = new MultipartRequestMeterFeaturesBuilder(); meterBuilder.setEmpty(Empty.getInstance()); @@ -406,7 +407,7 @@ public class MultipartRequestInputMessageFactory return caseBuilder.build(); } - private static MultipartRequestTableCase setTable(ByteBuf input) { + private static MultipartRequestTableCase setTable(final ByteBuf input) { MultipartRequestTableCaseBuilder caseBuilder = new MultipartRequestTableCaseBuilder(); MultipartRequestTableBuilder tableBuilder = new MultipartRequestTableBuilder(); tableBuilder.setEmpty(Empty.getInstance()); @@ -414,7 +415,7 @@ public class MultipartRequestInputMessageFactory return caseBuilder.build(); } - private static MultipartRequestExperimenterCase setExperimenter(ByteBuf input) { + private static MultipartRequestExperimenterCase setExperimenter(final ByteBuf input) { MultipartRequestExperimenterCaseBuilder caseBuilder = new MultipartRequestExperimenterCaseBuilder(); MultipartRequestExperimenterBuilder experimenterBuilder = new MultipartRequestExperimenterBuilder(); caseBuilder.setMultipartRequestExperimenter(experimenterBuilder.build()); diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FlowModInputMessageFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FlowModInputMessageFactory.java index 68208323d8..76c0a9cb1e 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FlowModInputMessageFactory.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FlowModInputMessageFactory.java @@ -41,20 +41,20 @@ public class OF10FlowModInputMessageFactory implements OFDeserializer matchDeserializer = registry.getDeserializer( - new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, EncodeConstants.EMPTY_VALUE, MatchV10.class)); + new MessageCodeKey(EncodeConstants.OF_VERSION_1_0, EncodeConstants.EMPTY_VALUE, MatchV10.class)); builder.setMatchV10(matchDeserializer.deserialize(rawMessage)); builder.setCookie(readUint64(rawMessage)); builder.setCommand(FlowModCommand.forValue(rawMessage.readUnsignedShort())); @@ -64,7 +64,7 @@ public class OF10FlowModInputMessageFactory implements OFDeserializer actions = ListDeserializer.deserializeList(EncodeConstants.OF10_VERSION_ID, rawMessage.readableBytes(), rawMessage, keyMaker, registry); @@ -73,7 +73,7 @@ public class OF10FlowModInputMessageFactory implements OFDeserializer matchDeserializer = registry.getDeserializer( - new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, EncodeConstants.EMPTY_VALUE, MatchV10.class)); + new MessageCodeKey(EncodeConstants.OF_VERSION_1_0, EncodeConstants.EMPTY_VALUE, MatchV10.class)); builder.setMatchV10(matchDeserializer.deserialize(rawMessage)); builder.setCookie(readUint64(rawMessage)); builder.setPriority(readUint16(rawMessage)); @@ -61,7 +61,7 @@ public class OF10FlowRemovedMessageFactory implements OFDeserializer actions = ListDeserializer.deserializeList(EncodeConstants.OF10_VERSION_ID, actions_len, rawMessage, keyMaker, registry); builder.setAction(actions); diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsReplyMessageFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsReplyMessageFactory.java index 91c99f37d9..7712660273 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsReplyMessageFactory.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsReplyMessageFactory.java @@ -91,7 +91,7 @@ public class OF10StatsReplyMessageFactory implements OFDeserializer flowStatsList = new ArrayList<>(); @@ -165,7 +165,7 @@ public class OF10StatsReplyMessageFactory implements OFDeserializer matchDeserializer = registry.getDeserializer( - new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, EncodeConstants.EMPTY_VALUE, MatchV10.class)); + new MessageCodeKey(EncodeConstants.OF_VERSION_1_0, EncodeConstants.EMPTY_VALUE, MatchV10.class)); flowStatsBuilder.setMatchV10(matchDeserializer.deserialize(input)); flowStatsBuilder.setDurationSec(readUint32(input)); flowStatsBuilder.setDurationNsec(readUint32(input)); @@ -176,7 +176,7 @@ public class OF10StatsReplyMessageFactory implements OFDeserializer actions = ListDeserializer.deserializeList(EncodeConstants.OF10_VERSION_ID, length - LENGTH_OF_FLOW_STATS, input, keyMaker, registry); flowStatsBuilder.setAction(actions); @@ -187,7 +187,7 @@ public class OF10StatsReplyMessageFactory implements OFDeserializer tableStatsList = new ArrayList<>(); @@ -224,7 +224,7 @@ public class OF10StatsReplyMessageFactory implements OFDeserializer portStatsList = new ArrayList<>(); @@ -251,7 +251,7 @@ public class OF10StatsReplyMessageFactory implements OFDeserializer queueStatsList = new ArrayList<>(); @@ -270,11 +270,11 @@ public class OF10StatsReplyMessageFactory implements OFDeserializer deserializer = registry.getDeserializer( ExperimenterDeserializerKeyFactory.createMultipartReplyVendorMessageDeserializerKey( - EncodeConstants.OF10_VERSION_ID, expId.toJava())); + EncodeConstants.OF_VERSION_1_0, expId)); final MultipartReplyExperimenterBuilder mpExperimenterBld = new MultipartReplyExperimenterBuilder() .setExperimenter(new ExperimenterId(expId)) @@ -285,7 +285,7 @@ public class OF10StatsReplyMessageFactory implements OFDeserializer matchDeserializer = registry.getDeserializer( - new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, EncodeConstants.EMPTY_VALUE, MatchV10.class)); + new MessageCodeKey(EncodeConstants.OF_VERSION_1_0, EncodeConstants.EMPTY_VALUE, MatchV10.class)); aggregateBuilder.setMatchV10(matchDeserializer.deserialize(input)); aggregateBuilder.setTableId(readUint8(input)); input.skipBytes(AGGREGATE_PADDING_1); @@ -144,11 +144,11 @@ public class OF10StatsRequestInputFactory return caseBuilder.build(); } - private MultipartRequestFlowCase setFlow(ByteBuf input) { + private MultipartRequestFlowCase setFlow(final ByteBuf input) { final MultipartRequestFlowCaseBuilder caseBuilder = new MultipartRequestFlowCaseBuilder(); MultipartRequestFlowBuilder flowBuilder = new MultipartRequestFlowBuilder(); OFDeserializer matchDeserializer = registry.getDeserializer( - new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, EncodeConstants.EMPTY_VALUE, MatchV10.class)); + new MessageCodeKey(EncodeConstants.OF_VERSION_1_0, EncodeConstants.EMPTY_VALUE, MatchV10.class)); flowBuilder.setMatchV10(matchDeserializer.deserialize(input)); flowBuilder.setTableId(readUint8(input)); input.skipBytes(FLOW_PADDING_1); @@ -157,7 +157,7 @@ public class OF10StatsRequestInputFactory return caseBuilder.build(); } - private static MultipartRequestDescCase setDesc(ByteBuf input) { + private static MultipartRequestDescCase setDesc(final ByteBuf input) { MultipartRequestDescCaseBuilder caseBuilder = new MultipartRequestDescCaseBuilder(); MultipartRequestDescBuilder descBuilder = new MultipartRequestDescBuilder(); descBuilder.setEmpty(Empty.getInstance()); @@ -166,18 +166,18 @@ public class OF10StatsRequestInputFactory } @SuppressWarnings("checkstyle:AbbreviationAsWordInName") - private static MultipartRequestFlags getMultipartRequestFlags(int input) { + private static MultipartRequestFlags getMultipartRequestFlags(final int input) { final Boolean _oFPMPFREQMORE = (input & 1 << 0) != 0; MultipartRequestFlags flag = new MultipartRequestFlags(_oFPMPFREQMORE); return flag; } - private static MultipartType getMultipartType(int input) { + private static MultipartType getMultipartType(final int input) { return MultipartType.forValue(input); } @Override - public void injectDeserializerRegistry(DeserializerRegistry deserializerRegistry) { + public void injectDeserializerRegistry(final DeserializerRegistry deserializerRegistry) { registry = deserializerRegistry; } } diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PacketInMessageFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PacketInMessageFactory.java index 20e68d26cb..c3ccfa88be 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PacketInMessageFactory.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PacketInMessageFactory.java @@ -37,7 +37,7 @@ public class PacketInMessageFactory implements OFDeserializer, private static final byte PADDING_IN_PACKET_IN_HEADER = 2; private static final MessageCodeKey MATCH_KEY = new MessageCodeKey( - EncodeConstants.OF13_VERSION_ID, EncodeConstants.EMPTY_VALUE, Match.class); + EncodeConstants.OF_VERSION_1_3, EncodeConstants.EMPTY_VALUE, Match.class); private DeserializerRegistry registry; @Override diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PacketOutInputMessageFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PacketOutInputMessageFactory.java index d9a9367394..1d7c5c20d9 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PacketOutInputMessageFactory.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PacketOutInputMessageFactory.java @@ -29,7 +29,7 @@ public class PacketOutInputMessageFactory implements OFDeserializer actions = ListDeserializer.deserializeList(EncodeConstants.OF13_VERSION_ID, actionsLen, rawMessage, keyMaker, registry); builder.setAction(actions); @@ -49,7 +49,7 @@ public class PacketOutInputMessageFactory implements OFDeserializer createQueuesList(ByteBuf input) { + private List createQueuesList(final ByteBuf input) { List queuesList = new ArrayList<>(); while (input.readableBytes() > 0) { QueuesBuilder queueBuilder = new QueuesBuilder() @@ -75,7 +76,7 @@ public class QueueGetConfigReplyMessageFactory implements OFDeserializer createPropertiesList(ByteBuf input, int length) { + private List createPropertiesList(final ByteBuf input, final int length) { int propertiesLength = length; List propertiesList = new ArrayList<>(); while (propertiesLength > 0) { @@ -92,11 +93,11 @@ public class QueueGetConfigReplyMessageFactory implements OFDeserializer deserializer = registry.getDeserializer( ExperimenterDeserializerKeyFactory.createQueuePropertyDeserializerKey( - EncodeConstants.OF13_VERSION_ID, expId)); + EncodeConstants.OF_VERSION_1_3, expId)); propertiesList.add(deserializer.deserialize(input)); continue; } @@ -106,7 +107,7 @@ public class QueueGetConfigReplyMessageFactory implements OFDeserializer @Override @SuppressFBWarnings("UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR") // FB doesn't recognize Objects.requireNonNull - public ExperimenterMessage deserialize(ByteBuf message) { + public ExperimenterMessage deserialize(final ByteBuf message) { Objects.requireNonNull(deserializerRegistry); final Uint32 xid = readUint32(message); final Uint32 expId = readUint32(message); OFDeserializer deserializer = deserializerRegistry.getDeserializer( ExperimenterDeserializerKeyFactory.createVendorMessageDeserializerKey( - EncodeConstants.OF10_VERSION_ID, expId.toJava())); + EncodeConstants.OF_VERSION_1_0, expId)); final ExperimenterDataOfChoice vendorData = deserializer.deserialize(message); final ExperimenterMessageBuilder messageBld = new ExperimenterMessageBuilder() @@ -54,7 +54,7 @@ public class VendorMessageFactory implements OFDeserializer } @Override - public void injectDeserializerRegistry(DeserializerRegistry registry) { + public void injectDeserializerRegistry(final DeserializerRegistry registry) { this.deserializerRegistry = registry; } } diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/instruction/AbstractActionInstructionDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/instruction/AbstractActionInstructionDeserializer.java index 557b9a4d98..08b0f87665 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/instruction/AbstractActionInstructionDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/instruction/AbstractActionInstructionDeserializer.java @@ -30,9 +30,9 @@ public abstract class AbstractActionInstructionDeserializer implements OFDeseria private DeserializerRegistry registry; - protected List deserializeActions(ByteBuf input, int instructionLength) { + protected List deserializeActions(final ByteBuf input, final int instructionLength) { int length = instructionLength - InstructionConstants.STANDARD_INSTRUCTION_LENGTH; - CodeKeyMaker keyMaker = CodeKeyMakerFactory.createActionsKeyMaker(EncodeConstants.OF13_VERSION_ID); + CodeKeyMaker keyMaker = CodeKeyMakerFactory.createActionsKeyMaker(EncodeConstants.OF_VERSION_1_3); List actions = ListDeserializer.deserializeList( EncodeConstants.OF13_VERSION_ID, length, input, keyMaker, getRegistry()); return actions; @@ -43,7 +43,7 @@ public abstract class AbstractActionInstructionDeserializer implements OFDeseria } @Override - public void injectDeserializerRegistry(DeserializerRegistry deserializerRegistry) { + public void injectDeserializerRegistry(final DeserializerRegistry deserializerRegistry) { this.registry = deserializerRegistry; } } diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/ext/AbstractOxmExperimenterMatchEntryDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/ext/AbstractOxmExperimenterMatchEntryDeserializer.java index 04e2102c12..e315b791ea 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/ext/AbstractOxmExperimenterMatchEntryDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/ext/AbstractOxmExperimenterMatchEntryDeserializer.java @@ -11,8 +11,8 @@ import static org.opendaylight.yangtools.yang.common.netty.ByteBufUtils.readUint import io.netty.buffer.ByteBuf; import org.opendaylight.openflowjava.protocol.impl.deserialization.match.AbstractOxmMatchEntryDeserializer; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.experimenter.id._case.ExperimenterBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.experimenter.id._case.ExperimenterBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ExperimenterId; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.ExperimenterClass; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.MatchField; diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/ext/OnfOxmTcpFlagsDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/ext/OnfOxmTcpFlagsDeserializer.java index 14bd1bc8a7..f88e0b27c3 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/ext/OnfOxmTcpFlagsDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/ext/OnfOxmTcpFlagsDeserializer.java @@ -12,8 +12,8 @@ import static org.opendaylight.yangtools.yang.common.netty.ByteBufUtils.readUint import io.netty.buffer.ByteBuf; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.approved.extensions.rev160802.TcpFlags; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.approved.extensions.rev160802.TcpFlagsContainerBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.approved.extensions.rev160802.oxm.container.match.entry.value.experimenter.id._case.TcpFlagsBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.approved.extensions.rev160802.tcp.flags.container.TcpFlagsBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCaseBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder; /** diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/ActionsInitializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/ActionsInitializer.java index 9aa5148adb..debfd30962 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/ActionsInitializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/ActionsInitializer.java @@ -81,7 +81,7 @@ public final class ActionsInitializer { public static void registerActionSerializers(final SerializerRegistry serializerRegistry) { // register OF v1.0 action serializers ActionSerializerRegistryHelper helper = new ActionSerializerRegistryHelper( - EncodeConstants.OF10_VERSION_ID, serializerRegistry); + EncodeConstants.OF_VERSION_1_0, serializerRegistry); helper.registerSerializer(OutputActionCase.class, new OF10OutputActionSerializer()); helper.registerSerializer(SetVlanVidCase.class, new OF10SetVlanVidActionSerializer()); helper.registerSerializer(SetVlanPcpCase.class, new OF10SetVlanPcpActionSerializer()); @@ -96,7 +96,7 @@ public final class ActionsInitializer { helper.registerSerializer(EnqueueCase.class, new OF10EnqueueActionSerializer()); // register OF v1.0 action serializers helper = new ActionSerializerRegistryHelper( - EncodeConstants.OF13_VERSION_ID, serializerRegistry); + EncodeConstants.OF_VERSION_1_3, serializerRegistry); helper.registerSerializer(OutputActionCase.class, new OF13OutputActionSerializer()); helper.registerSerializer(CopyTtlOutCase.class, new EmptyActionSerializer(ActionConstants.COPY_TTL_OUT_CODE)); helper.registerSerializer(CopyTtlInCase.class, new EmptyActionSerializer(ActionConstants.COPY_TTL_IN_CODE)); diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/AdditionalMessageFactoryInitializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/AdditionalMessageFactoryInitializer.java index 32c3f2629d..ee0539982e 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/AdditionalMessageFactoryInitializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/AdditionalMessageFactoryInitializer.java @@ -49,6 +49,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PacketOutInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PortStatusMessage; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.RoleRequestOutput; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Initializes serializer registry with additional action serializers. @@ -66,9 +67,9 @@ public final class AdditionalMessageFactoryInitializer { * @param serializerRegistry * registry to be initialized with message serializers */ - public static void registerMessageSerializers(SerializerRegistry serializerRegistry) { + public static void registerMessageSerializers(final SerializerRegistry serializerRegistry) { // register OF v1.0 message serializers - short version = EncodeConstants.OF10_VERSION_ID; + Uint8 version = EncodeConstants.OF_VERSION_1_0; CommonMessageRegistryHelper registryHelper = new CommonMessageRegistryHelper(version, serializerRegistry); registryHelper.registerSerializer(ErrorMessage.class, new ErrorMessageFactory()); registryHelper.registerSerializer(EchoRequestMessage.class, new EchoRequestMessageFactory()); @@ -83,7 +84,7 @@ public final class AdditionalMessageFactoryInitializer { registryHelper.registerSerializer(GetQueueConfigOutput.class, new OF10QueueGetConfigReplyMessageFactory()); // register OF v1.3 message serializers - version = EncodeConstants.OF13_VERSION_ID; + version = EncodeConstants.OF_VERSION_1_3; registryHelper = new CommonMessageRegistryHelper(version, serializerRegistry); registryHelper.registerSerializer(EchoOutput.class, new EchoOutputMessageFactory()); registryHelper.registerSerializer(PacketInMessage.class, new PacketInMessageFactory()); diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/InstructionsInitializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/InstructionsInitializer.java index 4fb153e9fa..1838fda400 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/InstructionsInitializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/InstructionsInitializer.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.impl.serialization; import org.opendaylight.openflowjava.protocol.api.extensibility.SerializerRegistry; @@ -30,7 +29,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction * @author michal.polkorab */ public final class InstructionsInitializer { - private InstructionsInitializer() { throw new UnsupportedOperationException("Utility class shouldn't be instantiated"); } @@ -40,10 +38,10 @@ public final class InstructionsInitializer { * * @param serializerRegistry registry to be initialized with instruction serializers */ - public static void registerInstructionSerializers(SerializerRegistry serializerRegistry) { + public static void registerInstructionSerializers(final SerializerRegistry serializerRegistry) { // register OF v1.3 instruction serializers InstructionSerializerRegistryHelper helper = new InstructionSerializerRegistryHelper( - EncodeConstants.OF13_VERSION_ID, serializerRegistry); + EncodeConstants.OF_VERSION_1_3, serializerRegistry); helper.registerSerializer(GotoTableCase.class, new GoToTableInstructionSerializer()); helper.registerSerializer(WriteMetadataCase.class, new WriteMetadataInstructionSerializer()); helper.registerSerializer(WriteActionsCase.class, new WriteActionsInstructionSerializer()); diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/MatchEntriesInitializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/MatchEntriesInitializer.java index c169143212..4ebfcce0c0 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/MatchEntriesInitializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/MatchEntriesInitializer.java @@ -110,11 +110,11 @@ public final class MatchEntriesInitializer { * Registers match entry serializers into provided registry. * @param serializerRegistry registry to be initialized with match entry serializers */ - public static void registerMatchEntrySerializers(SerializerRegistry serializerRegistry) { + public static void registerMatchEntrySerializers(final SerializerRegistry serializerRegistry) { // register OF v1.3 OpenflowBasicClass match entry serializers Class oxmClass = OpenflowBasicClass.class; MatchEntrySerializerRegistryHelper helper = - new MatchEntrySerializerRegistryHelper<>(EncodeConstants.OF13_VERSION_ID, + new MatchEntrySerializerRegistryHelper<>(EncodeConstants.OF_VERSION_1_3, oxmClass, serializerRegistry); helper.registerSerializer(InPort.class, new OxmInPortSerializer()); helper.registerSerializer(InPhyPort.class, new OxmInPhyPortSerializer()); diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/MessageFactoryInitializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/MessageFactoryInitializer.java index 401a292727..ca5ffe1a60 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/MessageFactoryInitializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/MessageFactoryInitializer.java @@ -71,11 +71,11 @@ public final class MessageFactoryInitializer { * Registers message serializers into provided registry. * @param serializerRegistry registry to be initialized with message serializers */ - public static void registerMessageSerializers(SerializerRegistry serializerRegistry) { + public static void registerMessageSerializers(final SerializerRegistry serializerRegistry) { CommonMessageRegistryHelper registryHelper; // register OF v1.0 message serializers - registryHelper = new CommonMessageRegistryHelper(EncodeConstants.OF10_VERSION_ID, serializerRegistry); + registryHelper = new CommonMessageRegistryHelper(EncodeConstants.OF_VERSION_1_0, serializerRegistry); registryHelper.registerSerializer(BarrierInput.class, new OF10BarrierInputMessageFactory()); registryHelper.registerSerializer(EchoInput.class, new EchoInputMessageFactory()); registryHelper.registerSerializer(EchoReplyInput.class, new EchoReplyInputMessageFactory()); @@ -91,7 +91,7 @@ public final class MessageFactoryInitializer { registryHelper.registerSerializer(SetConfigInput.class, new SetConfigMessageFactory()); // register OF v1.3 message serializers - registryHelper = new CommonMessageRegistryHelper(EncodeConstants.OF13_VERSION_ID, serializerRegistry); + registryHelper = new CommonMessageRegistryHelper(EncodeConstants.OF_VERSION_1_3, serializerRegistry); registryHelper.registerSerializer(BarrierInput.class, new BarrierInputMessageFactory()); registryHelper.registerSerializer(EchoInput.class, new EchoInputMessageFactory()); registryHelper.registerSerializer(EchoReplyInput.class, new EchoReplyInputMessageFactory()); diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/SerializationFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/SerializationFactory.java index 3b3aecbfdd..702cd87ea3 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/SerializationFactory.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/SerializationFactory.java @@ -13,6 +13,7 @@ import org.opendaylight.openflowjava.protocol.api.extensibility.OFSerializer; import org.opendaylight.openflowjava.protocol.api.extensibility.SerializerRegistry; import org.opendaylight.openflowjava.protocol.api.keys.MessageTypeKey; import org.opendaylight.yangtools.yang.binding.DataObject; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Serializes messages. @@ -21,10 +22,9 @@ import org.opendaylight.yangtools.yang.binding.DataObject; * @author timotej.kubas */ public class SerializationFactory { - private final SerializerRegistry registry; - public SerializationFactory(SerializerRegistry registry) { + public SerializationFactory(final SerializerRegistry registry) { this.registry = registry; } @@ -35,7 +35,7 @@ public class SerializationFactory { * @param out ByteBuf for storing and sending transformed message * @param message POJO message */ - public void messageToBuffer(short version, ByteBuf out, DataObject message) { + public void messageToBuffer(final Uint8 version, final ByteBuf out, final DataObject message) { OFSerializer serializer = registry.getSerializer( new MessageTypeKey<>(version, message.implementedInterface())); serializer.serialize(message, out); diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/SerializerRegistryImpl.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/SerializerRegistryImpl.java index 5967483d42..e59340a60f 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/SerializerRegistryImpl.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/SerializerRegistryImpl.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.impl.serialization; import java.util.HashMap; @@ -35,10 +34,8 @@ import org.slf4j.LoggerFactory; public class SerializerRegistryImpl implements SerializerRegistry { private static final Logger LOG = LoggerFactory.getLogger(SerializerRegistryImpl.class); - private static final short OF10 = EncodeConstants.OF10_VERSION_ID; - private static final short OF13 = EncodeConstants.OF13_VERSION_ID; - private Map, OFGeneralSerializer> registry; + private Map, OFGeneralSerializer> registry; private boolean isGroupAddModEnabled = false; @Override @@ -51,8 +48,10 @@ public class SerializerRegistryImpl implements SerializerRegistry { AdditionalMessageFactoryInitializer.registerMessageSerializers(this); // match structure serializers - registerSerializer(new MessageTypeKey<>(OF10, MatchV10.class), new OF10MatchSerializer()); - registerSerializer(new MessageTypeKey<>(OF13, Match.class), new OF13MatchSerializer()); + registerSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_0, MatchV10.class), + new OF10MatchSerializer()); + registerSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, Match.class), + new OF13MatchSerializer()); // match entry serializers MatchEntriesInitializer.registerMatchEntrySerializers(this); @@ -62,7 +61,8 @@ public class SerializerRegistryImpl implements SerializerRegistry { InstructionsInitializer.registerInstructionSerializers(this); } - public void setGroupAddModConfig(boolean value) { + @Override + public void setGroupAddModConfig(final boolean value) { this.isGroupAddModEnabled = value; } @@ -79,7 +79,7 @@ public class SerializerRegistryImpl implements SerializerRegistry { */ @Override @SuppressWarnings("unchecked") - public S getSerializer(MessageTypeKey msgTypeKey) { + public S getSerializer(final MessageTypeKey msgTypeKey) { OFGeneralSerializer serializer = registry.get(msgTypeKey); if (serializer == null) { throw new IllegalStateException("Serializer for key: " + msgTypeKey @@ -90,7 +90,7 @@ public class SerializerRegistryImpl implements SerializerRegistry { } @Override - public void registerSerializer(MessageTypeKey msgTypeKey, OFGeneralSerializer serializer) { + public void registerSerializer(final MessageTypeKey msgTypeKey, final OFGeneralSerializer serializer) { if (msgTypeKey == null || serializer == null) { throw new IllegalArgumentException("MessageTypeKey or Serializer is null"); } @@ -105,7 +105,7 @@ public class SerializerRegistryImpl implements SerializerRegistry { } @Override - public boolean unregisterSerializer(MessageTypeKey msgTypeKey) { + public boolean unregisterSerializer(final MessageTypeKey msgTypeKey) { if (msgTypeKey == null) { throw new IllegalArgumentException("MessageTypeKey is null"); } diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/action/OF13SetFieldActionSerializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/action/OF13SetFieldActionSerializer.java index 12a58982c9..82d899acf0 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/action/OF13SetFieldActionSerializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/action/OF13SetFieldActionSerializer.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.impl.serialization.action; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; @@ -18,7 +17,7 @@ import org.opendaylight.openflowjava.protocol.api.extensibility.SerializerRegist import org.opendaylight.openflowjava.protocol.api.keys.MatchEntrySerializerKey; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.openflowjava.protocol.impl.util.ActionConstants; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetFieldCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.ExperimenterClass; @@ -46,7 +45,7 @@ public class OF13SetFieldActionSerializer implements OFSerializer, MatchEntry entry = ((SetFieldCase) action.getActionChoice()).getSetFieldAction() .getMatchEntry().get(0); MatchEntrySerializerKey key = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, entry.getOxmClass(), entry.getOxmMatchField()); + EncodeConstants.OF_VERSION_1_3, entry.getOxmClass(), entry.getOxmMatchField()); if (entry.getOxmClass().equals(ExperimenterClass.class)) { ExperimenterIdCase experimenterIdCase = (ExperimenterIdCase) entry.getMatchEntryValue(); key.setExperimenterId(experimenterIdCase.getExperimenter().getExperimenter().getValue()); @@ -72,5 +71,4 @@ public class OF13SetFieldActionSerializer implements OFSerializer, public void injectSerializerRegistry(final SerializerRegistry serializerRegistry) { registry = serializerRegistry; } - } diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/ExperimenterInputMessageFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/ExperimenterInputMessageFactory.java index 554a0170e0..ea39417915 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/ExperimenterInputMessageFactory.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/ExperimenterInputMessageFactory.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.impl.serialization.factories; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; @@ -19,6 +18,7 @@ import org.opendaylight.openflowjava.util.ByteBufUtils; import org.opendaylight.openflowjava.util.ExperimenterSerializerKeyFactory; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.ExperimenterOfMessage; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.experimenter.core.ExperimenterDataOfChoice; +import org.opendaylight.yangtools.yang.common.Uint32; /** * Translates Experimenter messages (both: symmetric request and single reply). @@ -35,13 +35,13 @@ public class ExperimenterInputMessageFactory implements OFSerializer serializer = registry.getSerializer( ExperimenterSerializerKeyFactory.createExperimenterMessageSerializerKey( - EncodeConstants.OF13_VERSION_ID, expId, message.getExpType().longValue())); + EncodeConstants.OF_VERSION_1_3, expId, message.getExpType().longValue())); ByteBufUtils.writeOFHeader(MESSAGE_TYPE, message, outBuffer, EncodeConstants.EMPTY_LENGTH); // write experimenterId and type @@ -53,7 +53,7 @@ public class ExperimenterInputMessageFactory implements OFSerializer, SerializerRegistryInjector { +public class FlowModInputMessageFactory implements OFSerializer, SerializerRegistryInjector { private static final byte MESSAGE_TYPE = 14; private static final byte PADDING_IN_FLOW_MOD_MESSAGE = 2; private static final TypeKeyMaker INSTRUCTION_KEY_MAKER = - TypeKeyMakerFactory.createInstructionKeyMaker(EncodeConstants.OF13_VERSION_ID); + TypeKeyMakerFactory.createInstructionKeyMaker(EncodeConstants.OF_VERSION_1_3); private SerializerRegistry registry; @Override @SuppressFBWarnings("UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR") // FB doesn't recognize Objects.requireNonNull - public void serialize(final FlowMod message, final ByteBuf outBuffer) { + public void serialize(final FlowMod$G message, final ByteBuf outBuffer) { Objects.requireNonNull(registry); final int index = outBuffer.writerIndex(); @@ -57,7 +57,7 @@ public class FlowModInputMessageFactory implements OFSerializer, Serial outBuffer.writeShort(createFlowModFlagsBitmask(message.getFlags())); outBuffer.writeZero(PADDING_IN_FLOW_MOD_MESSAGE); registry.>getSerializer( - new MessageTypeKey<>(message.getVersion().toJava(), Match.class)) .serialize(message.getMatch(), outBuffer); + new MessageTypeKey<>(message.getVersion(), Match.class)) .serialize(message.getMatch(), outBuffer); ListSerializer.serializeList(message.getInstruction(), INSTRUCTION_KEY_MAKER, registry, outBuffer); ByteBufUtils.updateOFHeaderLength(outBuffer, index); } diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/FlowRemovedMessageFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/FlowRemovedMessageFactory.java index 597d84af81..3098b2049e 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/FlowRemovedMessageFactory.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/FlowRemovedMessageFactory.java @@ -30,13 +30,13 @@ public class FlowRemovedMessageFactory implements OFSerializer matchSerializer = registry.getSerializer( - new MessageTypeKey<>(message.getVersion().toJava(), Match.class)); + new MessageTypeKey<>(message.getVersion(), Match.class)); matchSerializer.serialize(message.getMatch(), outBuffer); ByteBufUtils.updateOFHeaderLength(outBuffer, index); } - } diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GroupModInputMessageFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GroupModInputMessageFactory.java index eda35364aa..41cd6293e8 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GroupModInputMessageFactory.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GroupModInputMessageFactory.java @@ -18,7 +18,7 @@ import org.opendaylight.openflowjava.protocol.impl.util.ListSerializer; import org.opendaylight.openflowjava.protocol.impl.util.TypeKeyMakerFactory; import org.opendaylight.openflowjava.util.ByteBufUtils; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.GroupModCommand; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GroupMod; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GroupMod$G; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.buckets.grouping.BucketsList; /** @@ -27,7 +27,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 * @author timotej.kubas * @author michal.polkorab */ -public class GroupModInputMessageFactory implements OFSerializer, SerializerRegistryInjector { +public class GroupModInputMessageFactory implements OFSerializer, SerializerRegistryInjector { private static final byte MESSAGE_TYPE = 15; private static final byte PADDING_IN_GROUP_MOD_MESSAGE = 1; private static final byte PADDING_IN_BUCKET = 4; @@ -40,7 +40,7 @@ public class GroupModInputMessageFactory implements OFSerializer, Seri } @Override - public void serialize(GroupMod message, ByteBuf outBuffer) { + public void serialize(final GroupMod$G message, final ByteBuf outBuffer) { final int index = outBuffer.writerIndex(); ByteBufUtils.writeOFHeader(MESSAGE_TYPE, message, outBuffer, EncodeConstants.EMPTY_LENGTH); if (isGroupAddModEnaled) { @@ -60,7 +60,7 @@ public class GroupModInputMessageFactory implements OFSerializer, Seri ByteBufUtils.updateOFHeaderLength(outBuffer, index); } - private void serializerBuckets(List buckets, ByteBuf outBuffer) { + private void serializerBuckets(final List buckets, final ByteBuf outBuffer) { if (buckets != null) { for (BucketsList currentBucket : buckets) { final int bucketLengthIndex = outBuffer.writerIndex(); @@ -70,14 +70,14 @@ public class GroupModInputMessageFactory implements OFSerializer, Seri outBuffer.writeInt(currentBucket.getWatchGroup().intValue()); outBuffer.writeZero(PADDING_IN_BUCKET); ListSerializer.serializeList(currentBucket.getAction(), TypeKeyMakerFactory - .createActionKeyMaker(EncodeConstants.OF13_VERSION_ID), registry, outBuffer); + .createActionKeyMaker(EncodeConstants.OF_VERSION_1_3), registry, outBuffer); outBuffer.setShort(bucketLengthIndex, outBuffer.writerIndex() - bucketLengthIndex); } } } @Override - public void injectSerializerRegistry(SerializerRegistry serializerRegistry) { + public void injectSerializerRegistry(final SerializerRegistry serializerRegistry) { this.registry = serializerRegistry; } diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MeterModInputMessageFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MeterModInputMessageFactory.java index c5eff16470..7a4872b23a 100755 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MeterModInputMessageFactory.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MeterModInputMessageFactory.java @@ -28,6 +28,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.band.header.meter.band.meter.band.dscp.remark._case.MeterBandDscpRemark; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.band.header.meter.band.meter.band.experimenter._case.MeterBandExperimenter; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.mod.Bands; +import org.opendaylight.yangtools.yang.common.Uint32; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -87,17 +88,17 @@ public class MeterModInputMessageFactory implements OFSerializer, ExperimenterIdMeterBand expIdMeterBand = experimenterBand.augmentation(ExperimenterIdMeterBand.class); if (expIdMeterBand != null) { - long expId = expIdMeterBand.getExperimenter().getValue().toJava(); + Uint32 expId = expIdMeterBand.getExperimenter().getValue(); Class meterBandSubType = expIdMeterBand.getSubType(); try { OFSerializer serializer = registry.getSerializer( ExperimenterSerializerKeyFactory.createMeterBandSerializerKey( - EncodeConstants.OF13_VERSION_ID, expId, meterBandSubType)); + EncodeConstants.OF_VERSION_1_3, expId, meterBandSubType)); serializer.serialize(experimenterBandCase, outBuffer); } catch (final IllegalStateException e) { LOG.warn("Serializer for key: {} wasn't found", ExperimenterSerializerKeyFactory.createMeterBandSerializerKey( - EncodeConstants.OF13_VERSION_ID, expId, meterBandSubType)); + EncodeConstants.OF_VERSION_1_3, expId, meterBandSubType)); } } } diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MultipartReplyMessageFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MultipartReplyMessageFactory.java index d104479d15..e56d4894c5 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MultipartReplyMessageFactory.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MultipartReplyMessageFactory.java @@ -31,7 +31,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.InstructionRelatedTableFeatureProperty; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.NextTableRelatedTableFeatureProperty; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.OxmRelatedTableFeatureProperty; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.table.features.properties.container.table.feature.properties.NextTableIds; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.next.table.related.table.feature.property.NextTableIds; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction.rev130731.instructions.grouping.Instruction; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ActionType; @@ -302,10 +302,9 @@ public class MultipartReplyMessageFactory implements OFSerializer serializer = registry.getSerializer(ExperimenterSerializerKeyFactory - .createMultipartRequestTFSerializerKey(EncodeConstants.OF13_VERSION_ID, expId)); + .createMultipartRequestTFSerializerKey(EncodeConstants.OF_VERSION_1_3, expId)); serializer.serialize(property, output); } @@ -318,7 +317,7 @@ public class MultipartReplyMessageFactory implements OFSerializer entries = property.augmentation(OxmRelatedTableFeatureProperty.class).getMatchEntry(); if (entries != null) { TypeKeyMaker keyMaker = TypeKeyMakerFactory - .createMatchEntriesKeyMaker(EncodeConstants.OF13_VERSION_ID); + .createMatchEntriesKeyMaker(EncodeConstants.OF_VERSION_1_3); ListSerializer.serializeHeaderList(entries, keyMaker, registry, output); } int length = output.writerIndex() - startIndex; @@ -334,7 +333,7 @@ public class MultipartReplyMessageFactory implements OFSerializer actions = property.augmentation(ActionRelatedTableFeatureProperty.class).getAction(); if (actions != null) { - TypeKeyMaker keyMaker = TypeKeyMakerFactory.createActionKeyMaker(EncodeConstants.OF13_VERSION_ID); + TypeKeyMaker keyMaker = TypeKeyMakerFactory.createActionKeyMaker(EncodeConstants.OF_VERSION_1_3); ListSerializer.serializeHeaderList(actions, keyMaker, registry, output); } int length = output.writerIndex() - startIndex; @@ -370,7 +369,7 @@ public class MultipartReplyMessageFactory implements OFSerializer keyMaker = TypeKeyMakerFactory - .createInstructionKeyMaker(EncodeConstants.OF13_VERSION_ID); + .createInstructionKeyMaker(EncodeConstants.OF_VERSION_1_3); ListSerializer.serializeHeaderList(instructions, keyMaker, registry, output); } int length = output.writerIndex() - startIndex; @@ -555,7 +554,7 @@ public class MultipartReplyMessageFactory implements OFSerializer matchSerializer = registry.getSerializer( - new MessageTypeKey<>(message.getVersion().toJava(), Match.class)); + new MessageTypeKey<>(message.getVersion(), Match.class)); matchSerializer.serialize(flowStats.getMatch(), flowStatsBuff); ListSerializer.serializeList(flowStats.getInstruction(), - TypeKeyMakerFactory.createInstructionKeyMaker(message.getVersion().toJava()), registry, + TypeKeyMakerFactory.createInstructionKeyMaker(message.getVersion()), registry, flowStatsBuff); flowStatsBuff.setShort(FLOW_STATS_LENGTH_INDEX, flowStatsBuff.readableBytes()); diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MultipartRequestInputFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MultipartRequestInputFactory.java index 713493e63b..ae9b643191 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MultipartRequestInputFactory.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MultipartRequestInputFactory.java @@ -7,6 +7,8 @@ */ package org.opendaylight.openflowjava.protocol.impl.serialization.factories; +import static org.opendaylight.yangtools.yang.common.netty.ByteBufUtils.writeUint32; + import io.netty.buffer.ByteBuf; import java.nio.charset.StandardCharsets; import java.util.List; @@ -25,7 +27,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.InstructionRelatedTableFeatureProperty; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.NextTableRelatedTableFeatureProperty; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.OxmRelatedTableFeatureProperty; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.table.features.properties.container.table.feature.properties.NextTableIds; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.next.table.related.table.feature.property.NextTableIds; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction.rev130731.instructions.grouping.Instruction; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MultipartRequestFlags; @@ -62,6 +64,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.table.features._case.MultipartRequestTableFeatures; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.table.features._case.multipart.request.table.features.TableFeatures; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.table.features.properties.grouping.TableFeatureProperties; +import org.opendaylight.yangtools.yang.common.Uint32; /** * Translates MultipartRequest messages. @@ -143,17 +146,17 @@ public class MultipartRequestInputFactory implements OFSerializer serializer = registry.getSerializer( ExperimenterSerializerKeyFactory.createMultipartRequestSerializerKey( - EncodeConstants.OF13_VERSION_ID, expId, expType)); + EncodeConstants.OF_VERSION_1_3, expId, expType)); serializer.serialize(experimenter.getExperimenterDataOfChoice(), outBuffer); } @@ -196,7 +199,7 @@ public class MultipartRequestInputFactory implements OFSerializer serializer = registry.getSerializer(new MessageTypeKey<>( - EncodeConstants.OF13_VERSION_ID, Match.class)); + EncodeConstants.OF_VERSION_1_3, Match.class)); serializer.serialize(flow.getMatch(), output); } @@ -211,7 +214,7 @@ public class MultipartRequestInputFactory implements OFSerializer serializer = registry.getSerializer(new MessageTypeKey<>( - EncodeConstants.OF13_VERSION_ID, Match.class)); + EncodeConstants.OF_VERSION_1_3, Match.class)); serializer.serialize(aggregate.getMatch(), output); } @@ -327,7 +330,7 @@ public class MultipartRequestInputFactory implements OFSerializer keyMaker = TypeKeyMakerFactory - .createInstructionKeyMaker(EncodeConstants.OF13_VERSION_ID); + .createInstructionKeyMaker(EncodeConstants.OF_VERSION_1_3); ListSerializer.serializeHeaderList(instructions, keyMaker, registry, output); } int length = output.writerIndex() - startIndex; @@ -371,7 +374,7 @@ public class MultipartRequestInputFactory implements OFSerializer actions = property.augmentation(ActionRelatedTableFeatureProperty.class).getAction(); if (actions != null) { TypeKeyMaker keyMaker = TypeKeyMakerFactory - .createActionKeyMaker(EncodeConstants.OF13_VERSION_ID); + .createActionKeyMaker(EncodeConstants.OF_VERSION_1_3); ListSerializer.serializeHeaderList(actions, keyMaker, registry, output); } int length = output.writerIndex() - startIndex; @@ -388,7 +391,7 @@ public class MultipartRequestInputFactory implements OFSerializer entries = property.augmentation(OxmRelatedTableFeatureProperty.class).getMatchEntry(); if (entries != null) { TypeKeyMaker keyMaker = TypeKeyMakerFactory - .createMatchEntriesKeyMaker(EncodeConstants.OF13_VERSION_ID); + .createMatchEntriesKeyMaker(EncodeConstants.OF_VERSION_1_3); ListSerializer.serializeHeaderList(entries, keyMaker, registry, output); } int length = output.writerIndex() - startIndex; @@ -398,11 +401,10 @@ public class MultipartRequestInputFactory implements OFSerializer serializer = registry.getSerializer( ExperimenterSerializerKeyFactory.createMultipartRequestTFSerializerKey( - EncodeConstants.OF13_VERSION_ID, expId)); + EncodeConstants.OF_VERSION_1_3, expId)); serializer.serialize(property, output); } diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10FlowModInputMessageFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10FlowModInputMessageFactory.java index 7fad17e281..24bae24bb9 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10FlowModInputMessageFactory.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10FlowModInputMessageFactory.java @@ -33,7 +33,7 @@ public class OF10FlowModInputMessageFactory implements OFSerializer ACTION_KEY_MAKER = - TypeKeyMakerFactory.createActionKeyMaker(EncodeConstants.OF10_VERSION_ID); + TypeKeyMakerFactory.createActionKeyMaker(EncodeConstants.OF_VERSION_1_0); private SerializerRegistry registry; @Override @@ -42,8 +42,8 @@ public class OF10FlowModInputMessageFactory implements OFSerializer matchSerializer = registry.getSerializer(new MessageTypeKey<>( - message.getVersion().toJava(), MatchV10.class)); + OFSerializer matchSerializer = registry.getSerializer(new MessageTypeKey<>(message.getVersion(), + MatchV10.class)); matchSerializer.serialize(message.getMatchV10(), outBuffer); outBuffer.writeLong(message.getCookie().longValue()); outBuffer.writeShort(message.getCommand().getIntValue()); diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10FlowRemovedMessageFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10FlowRemovedMessageFactory.java index f55d4cfb0e..8dbfffa3e7 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10FlowRemovedMessageFactory.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10FlowRemovedMessageFactory.java @@ -31,19 +31,19 @@ public class OF10FlowRemovedMessageFactory implements OFSerializer matchSerializer = registry - .getSerializer(new MessageTypeKey<>(message.getVersion().toJava(), MatchV10.class)); + .getSerializer(new MessageTypeKey<>(message.getVersion(), MatchV10.class)); matchSerializer.serialize(message.getMatchV10(), outBuffer); @@ -60,5 +60,4 @@ public class OF10FlowRemovedMessageFactory implements OFSerializer, SerializerRegistryInjector { - private static final byte MESSAGE_TYPE = 13; + private SerializerRegistry registry; @Override - public void serialize(PacketOutInput message, ByteBuf outBuffer) { + public void serialize(final PacketOutInput message, final ByteBuf outBuffer) { ByteBufUtils.writeOFHeader(MESSAGE_TYPE, message, outBuffer, EncodeConstants.EMPTY_LENGTH); outBuffer.writeInt(message.getBufferId().intValue()); outBuffer.writeShort(message.getInPort().getValue().intValue()); @@ -37,7 +36,7 @@ public class OF10PacketOutInputMessageFactory implements OFSerializer ACTION_KEY_MAKER = TypeKeyMakerFactory - .createActionKeyMaker(EncodeConstants.OF10_VERSION_ID); + .createActionKeyMaker(EncodeConstants.OF_VERSION_1_0); private static final int FLOW_STATS_LENGTH_INDEX = 0; private static final int QUEUE_STATS_LENGTH_INDEX = 0; private static final byte AGGREGATE_PADDING = 4; @@ -200,7 +200,7 @@ public class OF10StatsReplyMessageFactory implements OFSerializer matchSerializer = registry - .getSerializer(new MessageTypeKey<>(message.getVersion().toJava(), MatchV10.class)); + .getSerializer(new MessageTypeKey<>(message.getVersion(), MatchV10.class)); matchSerializer.serialize(flowStats.getMatchV10(), flowStatsBuff); flowStatsBuff.writeInt(flowStats.getDurationSec().intValue()); flowStatsBuff.writeInt(flowStats.getDurationNsec().intValue()); diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10StatsRequestInputFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10StatsRequestInputFactory.java index 7d428129e4..03e64f9aeb 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10StatsRequestInputFactory.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10StatsRequestInputFactory.java @@ -7,6 +7,8 @@ */ package org.opendaylight.openflowjava.protocol.impl.serialization.factories; +import static org.opendaylight.yangtools.yang.common.netty.ByteBufUtils.writeUint32; + import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.netty.buffer.ByteBuf; import java.util.Objects; @@ -34,6 +36,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.flow._case.MultipartRequestFlow; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.port.stats._case.MultipartRequestPortStats; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.queue._case.MultipartRequestQueue; +import org.opendaylight.yangtools.yang.common.Uint32; /** * Translates StatsRequest messages. @@ -92,7 +95,7 @@ public class OF10StatsRequestInputFactory implements OFSerializer matchSerializer = registry.getSerializer(new MessageTypeKey<>( - EncodeConstants.OF10_VERSION_ID, MatchV10.class)); + EncodeConstants.OF_VERSION_1_0, MatchV10.class)); matchSerializer.serialize(flow.getMatchV10(), output); output.writeByte(flow.getTableId().shortValue()); output.writeZero(PADDING_IN_MULTIPART_REQUEST_FLOW_BODY); @@ -103,7 +106,7 @@ public class OF10StatsRequestInputFactory implements OFSerializer matchSerializer = registry.getSerializer(new MessageTypeKey<>( - EncodeConstants.OF10_VERSION_ID, MatchV10.class)); + EncodeConstants.OF_VERSION_1_0, MatchV10.class)); matchSerializer.serialize(aggregate.getMatchV10(), output); output.writeByte(aggregate.getTableId().shortValue()); output.writeZero(PADDING_IN_MULTIPART_REQUEST_AGGREGATE_BODY); @@ -128,14 +131,14 @@ public class OF10StatsRequestInputFactory implements OFSerializer serializer = registry.getSerializer( ExperimenterSerializerKeyFactory.createMultipartRequestSerializerKey( - EncodeConstants.OF10_VERSION_ID, expId, + EncodeConstants.OF_VERSION_1_0, expId, -1 /* in order not to collide with OF >= 1.3 codecs*/)); serializer.serialize(experimenter.getExperimenterDataOfChoice(), output); } diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/PacketInMessageFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/PacketInMessageFactory.java index 36a8d7d47c..deb1e68cc1 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/PacketInMessageFactory.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/PacketInMessageFactory.java @@ -29,7 +29,7 @@ public class PacketInMessageFactory implements OFSerializer, Se @Override @SuppressFBWarnings("UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR") // FB doesn't recognize Objects.requireNonNull - public void serialize(PacketInMessage message, ByteBuf outBuffer) { + public void serialize(final PacketInMessage message, final ByteBuf outBuffer) { Objects.requireNonNull(registry); ByteBufUtils.writeOFHeader(MESSAGE_TYPE, message, outBuffer, EncodeConstants.EMPTY_LENGTH); @@ -39,7 +39,7 @@ public class PacketInMessageFactory implements OFSerializer, Se outBuffer.writeByte(message.getTableId().getValue().byteValue()); outBuffer.writeLong(message.getCookie().longValue()); OFSerializer matchSerializer = registry.getSerializer( - new MessageTypeKey<>(message.getVersion().toJava(), Match.class)); + new MessageTypeKey<>(message.getVersion(), Match.class)); matchSerializer.serialize(message.getMatch(), outBuffer); outBuffer.writeZero(PADDING); @@ -55,5 +55,4 @@ public class PacketInMessageFactory implements OFSerializer, Se public void injectSerializerRegistry(final SerializerRegistry serializerRegistry) { this.registry = serializerRegistry; } - } diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/PacketOutInputMessageFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/PacketOutInputMessageFactory.java index afa9a66fec..728ad26740 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/PacketOutInputMessageFactory.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/PacketOutInputMessageFactory.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.impl.serialization.factories; import io.netty.buffer.ByteBuf; @@ -32,7 +31,7 @@ public class PacketOutInputMessageFactory implements OFSerializer { +public class PortModInputMessageFactory implements OFSerializer { private static final byte MESSAGE_TYPE = 16; private static final byte PADDING_IN_PORT_MOD_MESSAGE_01 = 4; private static final byte PADDING_IN_PORT_MOD_MESSAGE_02 = 2; private static final byte PADDING_IN_PORT_MOD_MESSAGE_03 = 4; @Override - public void serialize(final PortMod message, final ByteBuf outBuffer) { + public void serialize(final PortMod$G message, final ByteBuf outBuffer) { final int index = outBuffer.writerIndex(); ByteBufUtils.writeOFHeader(MESSAGE_TYPE, message, outBuffer, EncodeConstants.EMPTY_LENGTH); outBuffer.writeInt(message.getPortNo().getValue().intValue()); diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/VendorInputMessageFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/VendorInputMessageFactory.java index fef8e5afa7..b15ce2e511 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/VendorInputMessageFactory.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/VendorInputMessageFactory.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.impl.serialization.factories; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; @@ -18,6 +17,7 @@ import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.openflowjava.util.ExperimenterSerializerKeyFactory; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.ExperimenterOfMessage; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.experimenter.core.ExperimenterDataOfChoice; +import org.opendaylight.yangtools.yang.common.Uint32; /** * Translates Vendor messages (OF-1.0 limited version - skipping experimenter type). @@ -31,13 +31,13 @@ public class VendorInputMessageFactory implements OFSerializer serializer = registry.getSerializer( ExperimenterSerializerKeyFactory.createExperimenterMessageSerializerKey( - EncodeConstants.OF10_VERSION_ID, expId, message.getExpType().longValue())); + EncodeConstants.OF_VERSION_1_0, expId, message.getExpType().longValue())); // write experimenterId outBuffer.writeInt(message.getExperimenter().getValue().intValue()); @@ -46,7 +46,7 @@ public class VendorInputMessageFactory implements OFSerializer ACTION_KEY_MAKER = - TypeKeyMakerFactory.createActionKeyMaker(EncodeConstants.OF13_VERSION_ID); + TypeKeyMakerFactory.createActionKeyMaker(EncodeConstants.OF_VERSION_1_3); private SerializerRegistry registry; diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/ext/AbstractOxmExperimenterMatchEntrySerializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/ext/AbstractOxmExperimenterMatchEntrySerializer.java index 5110c40f7c..f16b644472 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/ext/AbstractOxmExperimenterMatchEntrySerializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/ext/AbstractOxmExperimenterMatchEntrySerializer.java @@ -9,7 +9,7 @@ package org.opendaylight.openflowjava.protocol.impl.serialization.match.ext; import io.netty.buffer.ByteBuf; import org.opendaylight.openflowjava.protocol.impl.serialization.match.AbstractOxmMatchEntrySerializer; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yangtools.yang.common.Uint32; diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/ext/OnfOxmTcpFlagsSerializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/ext/OnfOxmTcpFlagsSerializer.java index f0243bd055..781419cc34 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/ext/OnfOxmTcpFlagsSerializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/ext/OnfOxmTcpFlagsSerializer.java @@ -11,8 +11,8 @@ import io.netty.buffer.ByteBuf; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.openflowjava.protocol.api.util.OxmMatchConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.approved.extensions.rev160802.TcpFlagsContainer; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.approved.extensions.rev160802.oxm.container.match.entry.value.experimenter.id._case.TcpFlags; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.approved.extensions.rev160802.tcp.flags.container.TcpFlags; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yangtools.yang.common.Uint32; diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/AbstractCodeKeyMaker.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/AbstractCodeKeyMaker.java index 0307668d12..2d17a52290 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/AbstractCodeKeyMaker.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/AbstractCodeKeyMaker.java @@ -7,29 +7,32 @@ */ package org.opendaylight.openflowjava.protocol.impl.util; +import static java.util.Objects.requireNonNull; + +import org.opendaylight.yangtools.yang.common.Uint8; + /** * Base class for a CodeKeyMaker. * * @author michal.polkorab */ public abstract class AbstractCodeKeyMaker implements CodeKeyMaker { - - private final short version; + private final Uint8 version; /** * Constractor. * * @param version openflow wire version */ - public AbstractCodeKeyMaker(short version) { - this.version = version; + public AbstractCodeKeyMaker(final Uint8 version) { + this.version = requireNonNull(version); } /** * Returns the version. */ - public short getVersion() { + public Uint8 getVersion() { return version; } } diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/AbstractTypeKeyMaker.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/AbstractTypeKeyMaker.java index 8b4ef77fb8..286517541e 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/AbstractTypeKeyMaker.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/AbstractTypeKeyMaker.java @@ -5,9 +5,11 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.impl.util; +import static java.util.Objects.requireNonNull; + +import org.opendaylight.yangtools.yang.common.Uint8; /** * Base class for a TypeKeyMaker. @@ -16,23 +18,22 @@ package org.opendaylight.openflowjava.protocol.impl.util; * @param type the key maker is based on */ public abstract class AbstractTypeKeyMaker implements TypeKeyMaker { - - private final short version; + private final Uint8 version; /** * Constructor. * * @param version openflow wire version */ - public AbstractTypeKeyMaker(short version) { - this.version = version; + public AbstractTypeKeyMaker(final Uint8 version) { + this.version = requireNonNull(version); } /** * Returns the version. */ - public short getVersion() { + public final Uint8 getVersion() { return version; } } diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/ActionDeserializerRegistryHelper.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/ActionDeserializerRegistryHelper.java index 7afbf79a97..175f8dca43 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/ActionDeserializerRegistryHelper.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/ActionDeserializerRegistryHelper.java @@ -7,9 +7,12 @@ */ package org.opendaylight.openflowjava.protocol.impl.util; +import static java.util.Objects.requireNonNull; + import org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerRegistry; import org.opendaylight.openflowjava.protocol.api.extensibility.OFGeneralDeserializer; import org.opendaylight.openflowjava.protocol.api.keys.ActionDeserializerKey; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Helper for registering deserializers. @@ -17,8 +20,7 @@ import org.opendaylight.openflowjava.protocol.api.keys.ActionDeserializerKey; * @author michal.polkorab */ public class ActionDeserializerRegistryHelper { - - private final short version; + private final Uint8 version; private final DeserializerRegistry registry; /** @@ -27,8 +29,8 @@ public class ActionDeserializerRegistryHelper { * @param version wire protocol version * @param deserializerRegistry registry to be filled with message deserializers */ - public ActionDeserializerRegistryHelper(short version, DeserializerRegistry deserializerRegistry) { - this.version = version; + public ActionDeserializerRegistryHelper(final Uint8 version, final DeserializerRegistry deserializerRegistry) { + this.version = requireNonNull(version); this.registry = deserializerRegistry; } @@ -38,8 +40,7 @@ public class ActionDeserializerRegistryHelper { * @param code code / value to distinguish between deserializers * @param deserializer deserializer instance */ - public void registerDeserializer(int code, OFGeneralDeserializer deserializer) { - registry.registerDeserializer(new ActionDeserializerKey(version, code, - null), deserializer); + public void registerDeserializer(final int code, final OFGeneralDeserializer deserializer) { + registry.registerDeserializer(new ActionDeserializerKey(version, code, null), deserializer); } } diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/ActionSerializerRegistryHelper.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/ActionSerializerRegistryHelper.java index 0f888ae8ef..ceceb4d727 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/ActionSerializerRegistryHelper.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/ActionSerializerRegistryHelper.java @@ -7,11 +7,14 @@ */ package org.opendaylight.openflowjava.protocol.impl.util; +import static java.util.Objects.requireNonNull; + import org.opendaylight.openflowjava.protocol.api.extensibility.OFGeneralSerializer; import org.opendaylight.openflowjava.protocol.api.extensibility.SerializerRegistry; import org.opendaylight.openflowjava.protocol.api.keys.ActionSerializerKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.ActionChoice; import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Helper for registering serializers. @@ -19,8 +22,7 @@ import org.opendaylight.yangtools.yang.common.Uint32; * @author michal.polkorab */ public class ActionSerializerRegistryHelper { - - private final short version; + private final Uint8 version; private final SerializerRegistry serializerRegistry; /** @@ -29,8 +31,8 @@ public class ActionSerializerRegistryHelper { * @param version Openflow wire version * @param serializerRegistry registry to be filled with message serializers */ - public ActionSerializerRegistryHelper(final short version, final SerializerRegistry serializerRegistry) { - this.version = version; + public ActionSerializerRegistryHelper(final Uint8 version, final SerializerRegistry serializerRegistry) { + this.version = requireNonNull(version); this.serializerRegistry = serializerRegistry; } diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/CodeKeyMakerFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/CodeKeyMakerFactory.java index 85337cbfef..651f2385e0 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/CodeKeyMakerFactory.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/CodeKeyMakerFactory.java @@ -17,6 +17,7 @@ import org.opendaylight.openflowjava.protocol.api.keys.MatchEntryDeserializerKey import org.opendaylight.openflowjava.protocol.api.keys.MessageCodeKey; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Factory for creating CodeKeyMaker instances. @@ -29,7 +30,7 @@ public final class CodeKeyMakerFactory { //not called } - public static CodeKeyMaker createMatchEntriesKeyMaker(final short version) { + public static CodeKeyMaker createMatchEntriesKeyMaker(final Uint8 version) { return new AbstractCodeKeyMaker(version) { @Override public MessageCodeKey make(final ByteBuf input) { @@ -48,7 +49,7 @@ public final class CodeKeyMakerFactory { }; } - public static CodeKeyMaker createActionsKeyMaker(final short version) { + public static CodeKeyMaker createActionsKeyMaker(final Uint8 version) { return new AbstractCodeKeyMaker(version) { @Override public MessageCodeKey make(final ByteBuf input) { @@ -63,7 +64,7 @@ public final class CodeKeyMakerFactory { }; } - public static CodeKeyMaker createInstructionsKeyMaker(final short version) { + public static CodeKeyMaker createInstructionsKeyMaker(final Uint8 version) { return new AbstractCodeKeyMaker(version) { @Override public MessageCodeKey make(final ByteBuf input) { diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/CommonMessageRegistryHelper.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/CommonMessageRegistryHelper.java index 2f481a6441..4c260782e7 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/CommonMessageRegistryHelper.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/CommonMessageRegistryHelper.java @@ -7,9 +7,12 @@ */ package org.opendaylight.openflowjava.protocol.impl.util; +import static java.util.Objects.requireNonNull; + import org.opendaylight.openflowjava.protocol.api.extensibility.OFGeneralSerializer; import org.opendaylight.openflowjava.protocol.api.extensibility.SerializerRegistry; import org.opendaylight.openflowjava.protocol.api.keys.MessageTypeKey; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Helper class for serializer registration. @@ -17,8 +20,7 @@ import org.opendaylight.openflowjava.protocol.api.keys.MessageTypeKey; * @author michal.polkorab */ public class CommonMessageRegistryHelper { - - private final short version; + private final Uint8 version; private final SerializerRegistry serializerRegistry; /** @@ -27,8 +29,8 @@ public class CommonMessageRegistryHelper { * @param version wire protocol version * @param serializerRegistry registry to be filled with message serializers */ - public CommonMessageRegistryHelper(short version, SerializerRegistry serializerRegistry) { - this.version = version; + public CommonMessageRegistryHelper(final Uint8 version, final SerializerRegistry serializerRegistry) { + this.version = requireNonNull(version); this.serializerRegistry = serializerRegistry; } @@ -37,7 +39,7 @@ public class CommonMessageRegistryHelper { * @param msgType class of object that will be serialized by given serializer * @param serializer serializer instance */ - public void registerSerializer(Class msgType, OFGeneralSerializer serializer) { + public void registerSerializer(final Class msgType, final OFGeneralSerializer serializer) { serializerRegistry.registerSerializer(new MessageTypeKey<>(version, msgType), serializer); } } diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/InstructionDeserializerRegistryHelper.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/InstructionDeserializerRegistryHelper.java index 36cf2c529f..19a8f17085 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/InstructionDeserializerRegistryHelper.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/InstructionDeserializerRegistryHelper.java @@ -7,9 +7,12 @@ */ package org.opendaylight.openflowjava.protocol.impl.util; +import static java.util.Objects.requireNonNull; + import org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerRegistry; import org.opendaylight.openflowjava.protocol.api.extensibility.OFGeneralDeserializer; import org.opendaylight.openflowjava.protocol.api.keys.InstructionDeserializerKey; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Helper class for registering instruction deserializers. @@ -17,8 +20,7 @@ import org.opendaylight.openflowjava.protocol.api.keys.InstructionDeserializerKe * @author michal.polkorab */ public class InstructionDeserializerRegistryHelper { - - private final short version; + private final Uint8 version; private final DeserializerRegistry registry; /** @@ -27,8 +29,8 @@ public class InstructionDeserializerRegistryHelper { * @param version wire protocol version * @param deserializerRegistry registry to be filled with message deserializers */ - public InstructionDeserializerRegistryHelper(short version, DeserializerRegistry deserializerRegistry) { - this.version = version; + public InstructionDeserializerRegistryHelper(final Uint8 version, final DeserializerRegistry deserializerRegistry) { + this.version = requireNonNull(version); this.registry = deserializerRegistry; } @@ -38,8 +40,7 @@ public class InstructionDeserializerRegistryHelper { * @param code code / value to distinguish between deserializers * @param deserializer deserializer instance */ - public void registerDeserializer(int code, OFGeneralDeserializer deserializer) { - registry.registerDeserializer(new InstructionDeserializerKey(version, code, - null), deserializer); + public void registerDeserializer(final int code, final OFGeneralDeserializer deserializer) { + registry.registerDeserializer(new InstructionDeserializerKey(version, code, null), deserializer); } } diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/InstructionSerializerRegistryHelper.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/InstructionSerializerRegistryHelper.java index ea909f2f87..d6477ea2b8 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/InstructionSerializerRegistryHelper.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/InstructionSerializerRegistryHelper.java @@ -7,10 +7,13 @@ */ package org.opendaylight.openflowjava.protocol.impl.util; +import static java.util.Objects.requireNonNull; + import org.opendaylight.openflowjava.protocol.api.extensibility.OFGeneralSerializer; import org.opendaylight.openflowjava.protocol.api.extensibility.SerializerRegistry; import org.opendaylight.openflowjava.protocol.api.keys.InstructionSerializerKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction.rev130731.instruction.grouping.InstructionChoice; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Helper class for registering instruction serializers. @@ -19,7 +22,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction */ public class InstructionSerializerRegistryHelper { - private final short version; + private final Uint8 version; private final SerializerRegistry serializerRegistry; /** @@ -28,8 +31,8 @@ public class InstructionSerializerRegistryHelper { * @param version Openflow wire version * @param serializerRegistry registry to be filled with message serializers */ - public InstructionSerializerRegistryHelper(short version, SerializerRegistry serializerRegistry) { - this.version = version; + public InstructionSerializerRegistryHelper(final Uint8 version, final SerializerRegistry serializerRegistry) { + this.version = requireNonNull(version); this.serializerRegistry = serializerRegistry; } @@ -39,9 +42,9 @@ public class InstructionSerializerRegistryHelper { * @param instructionType instruction type * @param serializer serializer instance */ - public void registerSerializer(Class instructionType, - OFGeneralSerializer serializer) { - serializerRegistry.registerSerializer(new InstructionSerializerKey<>(version, - instructionType, null), serializer); + public void registerSerializer(final Class instructionType, + final OFGeneralSerializer serializer) { + serializerRegistry.registerSerializer(new InstructionSerializerKey<>(version, instructionType, null), + serializer); } } diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/MatchDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/MatchDeserializer.java index 79d2b63a04..031e48200b 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/MatchDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/MatchDeserializer.java @@ -32,7 +32,7 @@ public class MatchDeserializer implements OFDeserializer, private DeserializerRegistry registry; @Override - public Match deserialize(ByteBuf input) { + public Match deserialize(final ByteBuf input) { if (input.readableBytes() > 0) { MatchBuilder builder = new MatchBuilder(); int type = input.readUnsignedShort(); @@ -47,8 +47,7 @@ public class MatchDeserializer implements OFDeserializer, default: break; } - CodeKeyMaker keyMaker = CodeKeyMakerFactory - .createMatchEntriesKeyMaker(EncodeConstants.OF13_VERSION_ID); + CodeKeyMaker keyMaker = CodeKeyMakerFactory.createMatchEntriesKeyMaker(EncodeConstants.OF_VERSION_1_3); List entries = ListDeserializer.deserializeList(EncodeConstants.OF13_VERSION_ID, length - 2 * Short.BYTES, input, keyMaker, registry); builder.setMatchEntry(entries); @@ -62,7 +61,7 @@ public class MatchDeserializer implements OFDeserializer, } @Override - public void injectDeserializerRegistry(DeserializerRegistry deserializerRegistry) { + public void injectDeserializerRegistry(final DeserializerRegistry deserializerRegistry) { this.registry = deserializerRegistry; } } diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/MatchEntryDeserializerRegistryHelper.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/MatchEntryDeserializerRegistryHelper.java index f204910848..daf08b4d80 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/MatchEntryDeserializerRegistryHelper.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/MatchEntryDeserializerRegistryHelper.java @@ -7,11 +7,14 @@ */ package org.opendaylight.openflowjava.protocol.impl.util; +import static java.util.Objects.requireNonNull; + import org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerRegistry; import org.opendaylight.openflowjava.protocol.api.extensibility.OFGeneralDeserializer; import org.opendaylight.openflowjava.protocol.api.keys.MatchEntryDeserializerKey; import org.opendaylight.openflowjava.protocol.api.util.OxmMatchConstants; import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Helper class for registering match entry deserializers. @@ -19,8 +22,7 @@ import org.opendaylight.yangtools.yang.common.Uint32; * @author michal.polkorab */ public class MatchEntryDeserializerRegistryHelper { - - private final short version; + private final Uint8 version; private final DeserializerRegistry registry; private final int oxmClass; @@ -31,9 +33,9 @@ public class MatchEntryDeserializerRegistryHelper { * @param oxmClass oxm_class that will be used for match entry deserializer registration * @param deserializerRegistry registry to be filled with message deserializers */ - public MatchEntryDeserializerRegistryHelper(final short version, final int oxmClass, + public MatchEntryDeserializerRegistryHelper(final Uint8 version, final int oxmClass, final DeserializerRegistry deserializerRegistry) { - this.version = version; + this.version = requireNonNull(version); this.oxmClass = oxmClass; this.registry = deserializerRegistry; } diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/MatchEntrySerializerRegistryHelper.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/MatchEntrySerializerRegistryHelper.java index 17c4265b49..1cfd49725c 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/MatchEntrySerializerRegistryHelper.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/MatchEntrySerializerRegistryHelper.java @@ -7,6 +7,8 @@ */ package org.opendaylight.openflowjava.protocol.impl.util; +import static java.util.Objects.requireNonNull; + import org.opendaylight.openflowjava.protocol.api.extensibility.OFGeneralSerializer; import org.opendaylight.openflowjava.protocol.api.extensibility.SerializerRegistry; import org.opendaylight.openflowjava.protocol.api.keys.MatchEntrySerializerKey; @@ -14,6 +16,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Expe import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.MatchField; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmClassBase; import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Helper class for registering match entry serializers. @@ -23,7 +26,7 @@ import org.opendaylight.yangtools.yang.common.Uint32; */ public class MatchEntrySerializerRegistryHelper { - private final short version; + private final Uint8 version; private final Class generalClass; private final SerializerRegistry serializerRegistry; @@ -34,9 +37,9 @@ public class MatchEntrySerializerRegistryHelper { * @param generalClass class that will be used for match entry serializer registration * @param serializerRegistry registry to be filled with message serializers */ - public MatchEntrySerializerRegistryHelper(final short version, final Class generalClass, + public MatchEntrySerializerRegistryHelper(final Uint8 version, final Class generalClass, final SerializerRegistry serializerRegistry) { - this.version = version; + this.version = requireNonNull(version); this.generalClass = generalClass; this.serializerRegistry = serializerRegistry; } diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/OF13MatchSerializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/OF13MatchSerializer.java index 21a18df9d3..fa072741a3 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/OF13MatchSerializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/OF13MatchSerializer.java @@ -15,7 +15,7 @@ import org.opendaylight.openflowjava.protocol.api.extensibility.SerializerRegist import org.opendaylight.openflowjava.protocol.api.extensibility.SerializerRegistryInjector; import org.opendaylight.openflowjava.protocol.api.keys.MatchEntrySerializerKey; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.StandardMatchType; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.ExperimenterClass; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmMatchType; @@ -78,7 +78,7 @@ public class OF13MatchSerializer implements OFSerializer, SerializerRegis for (MatchEntry entry : matchEntries) { MatchEntrySerializerKey key = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, entry.getOxmClass(), entry.getOxmMatchField()); + EncodeConstants.OF_VERSION_1_3, entry.getOxmClass(), entry.getOxmMatchField()); if (entry.getOxmClass().equals(ExperimenterClass.class)) { ExperimenterIdCase entryValue = (ExperimenterIdCase) entry.getMatchEntryValue(); key.setExperimenterId(entryValue.getExperimenter().getExperimenter().getValue()); diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/SimpleDeserializerRegistryHelper.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/SimpleDeserializerRegistryHelper.java index 2351160969..8e8917abe3 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/SimpleDeserializerRegistryHelper.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/SimpleDeserializerRegistryHelper.java @@ -19,9 +19,7 @@ import org.opendaylight.yangtools.yang.common.Uint8; * @author michal.polkorab */ public class SimpleDeserializerRegistryHelper { - - private final short version; - private final @NonNull Uint8 uintVersion; + private final @NonNull Uint8 version; private final DeserializerRegistry registry; /** @@ -31,9 +29,8 @@ public class SimpleDeserializerRegistryHelper { * @param deserializerRegistry registry to be filled with message deserializers */ public SimpleDeserializerRegistryHelper(final short version, final DeserializerRegistry deserializerRegistry) { - this.version = version; + this.version = Uint8.valueOf(version); this.registry = deserializerRegistry; - this.uintVersion = Uint8.valueOf(version); } /** @@ -47,7 +44,7 @@ public class SimpleDeserializerRegistryHelper { registry.registerDeserializer(new MessageCodeKey(version, code, deserializedObjectClass), deserializer); if (deserializer instanceof VersionAssignableFactory) { - ((VersionAssignableFactory) deserializer).assignVersion(uintVersion); + ((VersionAssignableFactory) deserializer).assignVersion(version); } } } diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/TypeKeyMakerFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/TypeKeyMakerFactory.java index 569b54e6e9..9253a28b6a 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/TypeKeyMakerFactory.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/TypeKeyMakerFactory.java @@ -12,7 +12,7 @@ import org.opendaylight.openflowjava.protocol.api.keys.ActionSerializerKey; import org.opendaylight.openflowjava.protocol.api.keys.InstructionSerializerKey; import org.opendaylight.openflowjava.protocol.api.keys.MatchEntrySerializerKey; import org.opendaylight.openflowjava.protocol.api.keys.MessageTypeKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.ActionChoice; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction.rev130731.instruction.grouping.InstructionChoice; @@ -20,6 +20,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.ExperimenterClass; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Creates KeyMakers. @@ -38,7 +39,7 @@ public final class TypeKeyMakerFactory { * @param version openflow wire version that shall be used in lookup key * @return lookup key */ - public static TypeKeyMaker createMatchEntriesKeyMaker(final short version) { + public static TypeKeyMaker createMatchEntriesKeyMaker(final Uint8 version) { return new AbstractTypeKeyMaker<>(version) { @Override public MatchEntrySerializerKey make(final MatchEntry entry) { @@ -62,7 +63,7 @@ public final class TypeKeyMakerFactory { * @param version openflow wire version that shall be used in lookup key * @return lookup key */ - public static TypeKeyMaker createActionKeyMaker(final short version) { + public static TypeKeyMaker createActionKeyMaker(final Uint8 version) { return new AbstractTypeKeyMaker<>(version) { @Override public MessageTypeKey make(final Action entry) { @@ -83,7 +84,7 @@ public final class TypeKeyMakerFactory { * @param version openflow wire version that shall be used in lookup key * @return lookup key */ - public static TypeKeyMaker createInstructionKeyMaker(final short version) { + public static TypeKeyMaker createInstructionKeyMaker(final Uint8 version) { return new AbstractTypeKeyMaker<>(version) { @Override public MessageTypeKey make(final Instruction entry) { diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/TypeToClassInitHelper.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/TypeToClassInitHelper.java index e96b1e196c..e6e9e315c9 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/TypeToClassInitHelper.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/TypeToClassInitHelper.java @@ -7,8 +7,11 @@ */ package org.opendaylight.openflowjava.protocol.impl.util; +import static java.util.Objects.requireNonNull; + import java.util.Map; import org.opendaylight.openflowjava.protocol.api.keys.TypeToClassKey; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Helper for initializing type to class mappings. @@ -16,8 +19,7 @@ import org.opendaylight.openflowjava.protocol.api.keys.TypeToClassKey; * @author michal.polkorab */ public class TypeToClassInitHelper { - - private final short version; + private final Uint8 version; private final Map> messageClassMap; /** @@ -26,9 +28,8 @@ public class TypeToClassInitHelper { * @param version protocol wire version * @param messageClassMap map which stores type to class mapping */ - public TypeToClassInitHelper(short version, Map> messageClassMap) { - this.version = version; + public TypeToClassInitHelper(final Uint8 version, final Map> messageClassMap) { + this.version = requireNonNull(version); this.messageClassMap = messageClassMap; } @@ -38,7 +39,7 @@ public class TypeToClassInitHelper { * @param type code value for message type / class * @param clazz class corresponding to the code */ - public void registerTypeToClass(short type, Class clazz) { + public void registerTypeToClass(final short type, final Class clazz) { messageClassMap.put(new TypeToClassKey(version, type), clazz); } } diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDatagramPacketDecoderTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDatagramPacketDecoderTest.java index b55c94de5e..7e243ee81e 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDatagramPacketDecoderTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDatagramPacketDecoderTest.java @@ -41,7 +41,7 @@ public class OFDatagramPacketDecoderTest { public void test() { OFDatagramPacketDecoder decoder = new OFDatagramPacketDecoder(); decoder.setDeserializationFactory(deserializationFactory); - msgWrapper = new VersionMessageUdpWrapper(EncodeConstants.OF13_VERSION_ID, messageBufferMock, + msgWrapper = new VersionMessageUdpWrapper(EncodeConstants.OF_VERSION_1_3, messageBufferMock, new InetSocketAddress("10.0.0.1", 6653)); decoder.channelRead0(ctx, msgWrapper); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDatagramPacketHandlerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDatagramPacketHandlerTest.java index aab7b54389..b1b104eefe 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDatagramPacketHandlerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDatagramPacketHandlerTest.java @@ -51,7 +51,6 @@ public class OFDatagramPacketHandlerTest { @Test public void test() { OFDatagramPacketHandler handler = new OFDatagramPacketHandler(switchConnHandler, CHANNEL_OUTBOUND_QUEUE_SIZE); - byte version = EncodeConstants.OF13_VERSION_ID; ByteBuf messageBuffer = ByteBufUtils.hexStringToByteBuf("04 02 00 08 01 02 03 04"); InetSocketAddress recipientISA = InetSocketAddress.createUnresolved("localhost", 9876); InetSocketAddress senderISA = InetSocketAddress.createUnresolved("192.168.15.24", 21021); @@ -62,7 +61,8 @@ public class OFDatagramPacketHandlerTest { handler.decode(ctxMock, datagramPacket, outList); VersionMessageUdpWrapper versionUdpWrapper = (VersionMessageUdpWrapper) outList.get(0); - Assert.assertEquals("Wrong - incorrect version has been decoded",version, versionUdpWrapper.getVersion()); + Assert.assertEquals("Wrong - incorrect version has been decoded", EncodeConstants.OF_VERSION_1_3, + versionUdpWrapper.getVersion()); Assert.assertEquals("Wrong - sender addresses are different", senderISA, versionUdpWrapper.getAddress()); messageBuffer.readerIndex(1); Assert.assertEquals("Wrong - undecoded part of input ByteBuff is differnt to output", 0, diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDecoderStatisticsTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDecoderStatisticsTest.java index 7afd5993c6..847846b6f1 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDecoderStatisticsTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDecoderStatisticsTest.java @@ -8,7 +8,6 @@ package org.opendaylight.openflowjava.protocol.impl.core; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyShort; import static org.mockito.Mockito.when; import io.netty.buffer.ByteBuf; @@ -26,6 +25,7 @@ import org.opendaylight.openflowjava.statistics.CounterEventTypes; import org.opendaylight.openflowjava.statistics.StatisticsCounters; import org.opendaylight.openflowjava.util.ByteBufUtils; import org.opendaylight.yangtools.yang.binding.DataObject; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Test to count decoder events (counters US_DECODE_SUCCESS, US_DECODE_FAIL and @@ -82,11 +82,11 @@ public class OFDecoderStatisticsTest { Assert.fail("Counter " + CounterEventTypes.US_RECEIVED_IN_OFJAVA + " is not enable"); } int count = 4; - when(mockDeserializationFactory.deserialize(any(ByteBuf.class),anyShort())).thenReturn(mockDataObject); + when(mockDeserializationFactory.deserialize(any(ByteBuf.class), any(Uint8.class))).thenReturn(mockDataObject); for (int i = 0; i < count; i++) { writeObj = ByteBufUtils.hexStringToByteBuf("16 03 01 00"); - inMsg = new VersionMessageWrapper((short) 8, writeObj); + inMsg = new VersionMessageWrapper(Uint8.valueOf(8), writeObj); ofDecoder.decode(mockChHndlrCtx, inMsg, outList); } @@ -114,12 +114,12 @@ public class OFDecoderStatisticsTest { Assert.fail("Counter " + CounterEventTypes.US_RECEIVED_IN_OFJAVA + " is not enable"); } int count = 2; - when(mockDeserializationFactory.deserialize(any(ByteBuf.class),anyShort())) + when(mockDeserializationFactory.deserialize(any(ByteBuf.class), any(Uint8.class))) .thenThrow(new IllegalArgumentException()); for (int i = 0; i < count; i++) { writeObj = ByteBufUtils.hexStringToByteBuf("16 03 01 00"); - inMsg = new VersionMessageWrapper((short) 8, writeObj); + inMsg = new VersionMessageWrapper(Uint8.valueOf(8), writeObj); ofDecoder.decode(mockChHndlrCtx, inMsg, outList); } diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDecoderTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDecoderTest.java index 090ab2dc5e..84d17d8b87 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDecoderTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDecoderTest.java @@ -10,7 +10,6 @@ package org.opendaylight.openflowjava.protocol.impl.core; import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyShort; import static org.mockito.Mockito.when; import io.netty.buffer.ByteBuf; @@ -24,6 +23,7 @@ import org.mockito.MockitoAnnotations; import org.opendaylight.openflowjava.protocol.impl.deserialization.DeserializationFactory; import org.opendaylight.openflowjava.util.ByteBufUtils; import org.opendaylight.yangtools.yang.binding.DataObject; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Unit tests for OFDecoder. @@ -50,13 +50,13 @@ public class OFDecoderTest { ofDecoder = new OFDecoder(); ofDecoder.setDeserializationFactory(mockDeserializationFactory); writeObj = ByteBufUtils.hexStringToByteBuf("16 03 01 00"); - inMsg = new VersionMessageWrapper((short) 8, writeObj); + inMsg = new VersionMessageWrapper(Uint8.valueOf(8), writeObj); outList = new ArrayList<>(); } @Test public void testDecode() { - when(mockDeserializationFactory.deserialize(any(ByteBuf.class), anyShort())).thenReturn(mockDataObject); + when(mockDeserializationFactory.deserialize(any(ByteBuf.class), any(Uint8.class))).thenReturn(mockDataObject); ofDecoder.decode(mockChHndlrCtx, inMsg, outList); @@ -67,7 +67,7 @@ public class OFDecoderTest { @Test public void testDecodeDeserializeException() { - when(mockDeserializationFactory.deserialize(any(ByteBuf.class), anyShort())) + when(mockDeserializationFactory.deserialize(any(ByteBuf.class), any(Uint8.class))) .thenThrow(new IllegalArgumentException()); ofDecoder.decode(mockChHndlrCtx, inMsg, outList); @@ -79,7 +79,7 @@ public class OFDecoderTest { @Test public void testDecodeDeserializeNull() { - when(mockDeserializationFactory.deserialize(any(ByteBuf.class), anyShort())).thenReturn(null); + when(mockDeserializationFactory.deserialize(any(ByteBuf.class), any(Uint8.class))).thenReturn(null); ofDecoder.decode(mockChHndlrCtx, inMsg, outList); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFEncoderStatisticsTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFEncoderStatisticsTest.java index dab75a726b..c71431841e 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFEncoderStatisticsTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFEncoderStatisticsTest.java @@ -8,7 +8,6 @@ package org.opendaylight.openflowjava.protocol.impl.core; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyShort; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.when; @@ -130,7 +129,7 @@ public class OFEncoderStatisticsTest { when(wrapper.getMsg()).thenReturn(mockMsg); when(wrapper.getListener()).thenReturn(listener); when(wrapper.getMsg().getVersion()).thenReturn(Uint8.valueOf(EncodeConstants.OF13_VERSION_ID)); - doThrow(new IllegalArgumentException()).when(mockSerializationFactory).messageToBuffer(anyShort(), + doThrow(new IllegalArgumentException()).when(mockSerializationFactory).messageToBuffer(any(Uint8.class), any(ByteBuf.class), any(DataObject.class)); int count = 2; diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFEncoderTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFEncoderTest.java index fbbc7464dd..9bbfb64c22 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFEncoderTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFEncoderTest.java @@ -9,7 +9,6 @@ package org.opendaylight.openflowjava.protocol.impl.core; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyShort; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -80,7 +79,7 @@ public class OFEncoderTest { when(wrapper.getMsg()).thenReturn(mockMsg); when(wrapper.getListener()).thenReturn(listener); when(wrapper.getMsg().getVersion()).thenReturn(Uint8.valueOf(EncodeConstants.OF13_VERSION_ID)); - doThrow(new IllegalArgumentException()).when(mockSerializationFactory).messageToBuffer(anyShort(), + doThrow(new IllegalArgumentException()).when(mockSerializationFactory).messageToBuffer(any(Uint8.class), any(ByteBuf.class), any(DataObject.class)); ofEncoder.encode(mockChHndlrCtx, wrapper, mockOut); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/VersionMessageUdpWrapperTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/VersionMessageUdpWrapperTest.java index a85b21b4dc..622d18ccc5 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/VersionMessageUdpWrapperTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/VersionMessageUdpWrapperTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.impl.core; import io.netty.buffer.ByteBuf; @@ -15,6 +14,7 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Unit tests for VersionMessageUdpWrapper. @@ -32,11 +32,11 @@ public class VersionMessageUdpWrapperTest { @Test public void test() { - short version = 35; + Uint8 version = Uint8.valueOf(35); int port = 9876; String host = "localhost"; InetSocketAddress inetSockAddr = InetSocketAddress.createUnresolved(host, port); - VersionMessageUdpWrapper wrapper = new VersionMessageUdpWrapper(version,byteBuff,inetSockAddr); + VersionMessageUdpWrapper wrapper = new VersionMessageUdpWrapper(version, byteBuff, inetSockAddr); Assert.assertEquals("Wrong getAddress", inetSockAddr, wrapper.getAddress()); Assert.assertEquals("Wrong getVersion", version, wrapper.getVersion()); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/SwitchConnectionProviderImpl02Test.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/SwitchConnectionProviderImpl02Test.java index c33289bd51..f18aafbcf1 100755 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/SwitchConnectionProviderImpl02Test.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/SwitchConnectionProviderImpl02Test.java @@ -135,10 +135,10 @@ public class SwitchConnectionProviderImpl02Test { public void testUnregisterWrongKeys() throws UnknownHostException { startUp(TransportProtocol.TCP); final ExperimenterInstructionSerializerKey testSerKey - = new ExperimenterInstructionSerializerKey(EncodeConstants.OF10_VERSION_ID,42L); + = new ExperimenterInstructionSerializerKey(EncodeConstants.OF_VERSION_1_0, 42L); Assert.assertFalse("Wrong -- unregisterSerializer",provider.unregisterSerializer(testSerKey)); final ExperimenterInstructionDeserializerKey tesDeserKey - = new ExperimenterInstructionDeserializerKey(EncodeConstants.OF10_VERSION_ID,24L); + = new ExperimenterInstructionDeserializerKey(EncodeConstants.OF_VERSION_1_0, 24L); Assert.assertFalse("Wrong -- unregisterDeserializer",provider.unregisterDeserializer(tesDeserKey)); } @@ -150,7 +150,7 @@ public class SwitchConnectionProviderImpl02Test { startUp(TransportProtocol.TCP); // -- registerActionSerializer final ExperimenterActionSerializerKey key1 - = new ExperimenterActionSerializerKey(EncodeConstants.OF10_VERSION_ID, Uint32.valueOf(42), + = new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(42), TestSubType.class); provider.registerActionSerializer(key1, serializer); Assert.assertTrue("Wrong -- unregister ActionSerializer", provider.unregisterSerializer(key1)); @@ -158,78 +158,78 @@ public class SwitchConnectionProviderImpl02Test { provider.unregisterSerializer(key1)); // -- registerActionDeserializer final ExperimenterActionDeserializerKey key2 - = new ExperimenterActionDeserializerKey(EncodeConstants.OF10_VERSION_ID, 42L); + = new ExperimenterActionDeserializerKey(EncodeConstants.OF_VERSION_1_0, 42L); provider.registerActionDeserializer(key2, deserializer); Assert.assertTrue("Wrong -- unregister ActionDeserializer", provider.unregisterDeserializer(key2)); Assert.assertFalse("Wrong -- unregister ActionDeserializer by not existing key", provider.unregisterDeserializer(key2)); // -- registerInstructionSerializer final ExperimenterInstructionSerializerKey key3 - = new ExperimenterInstructionSerializerKey(EncodeConstants.OF10_VERSION_ID,42L); + = new ExperimenterInstructionSerializerKey(EncodeConstants.OF_VERSION_1_0, 42L); provider.registerInstructionSerializer(key3, serializer); Assert.assertTrue("Wrong -- unregister InstructionSerializer", provider.unregisterSerializer(key3)); Assert.assertFalse("Wrong -- unregister InstructionSerializer by not existing key", provider.unregisterSerializer(key3)); // -- registerInstructionDeserializer final ExperimenterInstructionDeserializerKey key4 - = new ExperimenterInstructionDeserializerKey(EncodeConstants.OF10_VERSION_ID,42L); + = new ExperimenterInstructionDeserializerKey(EncodeConstants.OF_VERSION_1_0, 42L); provider.registerInstructionDeserializer(key4, deserializer); Assert.assertTrue("Wrong -- unregister InstructionDeserializer", provider.unregisterDeserializer(key4)); Assert.assertFalse("Wrong -- unregister InstructionDeserializer by not existing key", provider.unregisterDeserializer(key4)); // -- registerMatchEntryDeserializer final MatchEntryDeserializerKey key5 - = new MatchEntryDeserializerKey(EncodeConstants.OF10_VERSION_ID, 0x8000, 42); + = new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_0, 0x8000, 42); provider.registerMatchEntryDeserializer(key5, deserializer); Assert.assertTrue("Wrong -- unregister MatchEntryDeserializer", provider.unregisterDeserializer(key5)); Assert.assertFalse("Wrong -- unregister MatchEntryDeserializer by not existing key", provider.unregisterDeserializer(key5)); // -- registerErrorDeserializer - final ExperimenterIdDeserializerKey key6 - = new ExperimenterIdDeserializerKey(EncodeConstants.OF10_VERSION_ID, 42L, ErrorMessage.class); + final ExperimenterIdDeserializerKey key6 = new ExperimenterIdDeserializerKey(EncodeConstants.OF_VERSION_1_0, + Uint32.valueOf(42), ErrorMessage.class); provider.registerErrorDeserializer(key6, deserializerError); Assert.assertTrue("Wrong -- unregister ErrorDeserializer", provider.unregisterDeserializer(key6)); Assert.assertFalse("Wrong -- unregister ErrorDeserializer by not existing key", provider.unregisterDeserializer(key6)); // -- registerExperimenterMessageDeserializer - final ExperimenterIdDeserializerKey key7 - = new ExperimenterIdDeserializerKey(EncodeConstants.OF10_VERSION_ID, 42L, ExperimenterMessage.class); + final ExperimenterIdDeserializerKey key7 = new ExperimenterIdDeserializerKey(EncodeConstants.OF_VERSION_1_0, + Uint32.valueOf(42), ExperimenterMessage.class); provider.registerExperimenterMessageDeserializer(key7, deserializerExpMsg); Assert.assertTrue("Wrong -- unregister ExperimenterMessageDeserializer", provider.unregisterDeserializer(key7)); Assert.assertFalse("Wrong -- unregister ExperimenterMessageDeserializer by not existing key", provider.unregisterDeserializer(key7)); // -- registerMultipartReplyMessageDeserializer - final ExperimenterIdDeserializerKey key8 - = new ExperimenterIdDeserializerKey(EncodeConstants.OF10_VERSION_ID, 42L, MultipartReplyMessage.class); + final ExperimenterIdDeserializerKey key8 = new ExperimenterIdDeserializerKey(EncodeConstants.OF_VERSION_1_0, + Uint32.valueOf(42), MultipartReplyMessage.class); provider.registerMultipartReplyMessageDeserializer(key8, deserializerMultipartRplMsg); Assert.assertTrue("Wrong -- unregister MultipartReplyMessageDeserializer", provider.unregisterDeserializer(key8)); Assert.assertFalse("Wrong -- unregister MultipartReplyMessageDeserializer by not existing key", provider.unregisterDeserializer(key8)); // -- registerMultipartReplyTFDeserializer - final ExperimenterIdDeserializerKey key9 = - new ExperimenterIdDeserializerKey(EncodeConstants.OF10_VERSION_ID, 42L, MultipartReplyMessage.class); + final ExperimenterIdDeserializerKey key9 = new ExperimenterIdDeserializerKey(EncodeConstants.OF_VERSION_1_0, + Uint32.valueOf(42), MultipartReplyMessage.class); provider.registerMultipartReplyTFDeserializer(key9, deserializer); Assert.assertTrue("Wrong -- unregister MultipartReplyTFDeserializer", provider.unregisterDeserializer(key9)); Assert.assertFalse("Wrong -- unregister MultipartReplyTFDeserializer by non existing key", provider.unregisterDeserializer(key9)); // -- registerQueuePropertyDeserializer - final ExperimenterIdDeserializerKey key10 - = new ExperimenterIdDeserializerKey(EncodeConstants.OF10_VERSION_ID, 42L, QueueProperty.class); + final ExperimenterIdDeserializerKey key10 = new ExperimenterIdDeserializerKey(EncodeConstants.OF_VERSION_1_0, + Uint32.valueOf(42), QueueProperty.class); provider.registerQueuePropertyDeserializer(key10, deserializerQueueProperty); Assert.assertTrue("Wrong -- unregister QueuePropertyDeserializer", provider.unregisterDeserializer(key10)); Assert.assertFalse("Wrong -- unregister QueuePropertyDeserializer by not existing key", provider.unregisterDeserializer(key10)); // -- registerMeterBandDeserializer - final ExperimenterIdDeserializerKey key11 - = new ExperimenterIdDeserializerKey(EncodeConstants.OF10_VERSION_ID, 42L, MeterBandExperimenterCase.class); + final ExperimenterIdDeserializerKey key11 = new ExperimenterIdDeserializerKey(EncodeConstants.OF_VERSION_1_0, + Uint32.valueOf(42), MeterBandExperimenterCase.class); provider.registerMeterBandDeserializer(key11, deserializerMeterBandExpCase); Assert.assertTrue("Wrong -- unregister MeterBandDeserializer", provider.unregisterDeserializer(key11)); Assert.assertFalse("Wrong -- unregister MeterBandDeserializer by not existing key", provider.unregisterDeserializer(key11)); // -- registerExperimenterMessageSerializer ExperimenterIdSerializerKey key12 - = new ExperimenterIdSerializerKey<>(EncodeConstants.OF10_VERSION_ID, 42L, + = new ExperimenterIdSerializerKey<>(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(42), ExperimenterDataOfChoice.class); provider.registerExperimenterMessageSerializer(key12, serializerExperimenterInput); Assert.assertTrue("Wrong -- unregister ExperimenterMessageSerializer", provider.unregisterSerializer(key12)); @@ -237,7 +237,7 @@ public class SwitchConnectionProviderImpl02Test { provider.unregisterSerializer(key12)); //registerMultipartRequestSerializer ExperimenterIdSerializerKey key13 - = new ExperimenterIdSerializerKey<>(EncodeConstants.OF10_VERSION_ID, 42L, + = new ExperimenterIdSerializerKey<>(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(42), ExperimenterDataOfChoice.class); provider.registerMultipartRequestSerializer(key13, serializerMultipartRequestExpCase); Assert.assertTrue("Wrong -- unregister MultipartRequestSerializer", provider.unregisterSerializer(key13)); @@ -245,14 +245,15 @@ public class SwitchConnectionProviderImpl02Test { provider.unregisterSerializer(key13)); // -- registerMultipartRequestTFSerializer final ExperimenterIdSerializerKey key14 - = new ExperimenterIdSerializerKey<>(EncodeConstants.OF10_VERSION_ID,42L,TableFeatureProperties.class); + = new ExperimenterIdSerializerKey<>(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(42), + TableFeatureProperties.class); provider.registerMultipartRequestTFSerializer(key14, serializer); Assert.assertTrue("Wrong -- unregister MultipartRequestTFSerializer", provider.unregisterSerializer(key14)); Assert.assertFalse("Wrong -- unregister MultipartRequestTFSerializer by not existing key", provider.unregisterSerializer(key14)); // -- registerMeterBandSerializer final ExperimenterIdMeterSubTypeSerializerKey key15 - = new ExperimenterIdMeterSubTypeSerializerKey<>(EncodeConstants.OF10_VERSION_ID,42L, + = new ExperimenterIdMeterSubTypeSerializerKey<>(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(42), MeterBandExperimenterCase.class,null); provider.registerMeterBandSerializer(key15, serializerMeterBandExpCase); Assert.assertTrue("Wrong -- unregister MeterBandSerializer", provider.unregisterSerializer(key15)); @@ -260,16 +261,16 @@ public class SwitchConnectionProviderImpl02Test { provider.unregisterSerializer(key15)); // -- registerMatchEntrySerializer final MatchEntrySerializerKey key16 - = new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, OpenflowBasicClass.class, InPort.class); + = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, OpenflowBasicClass.class, InPort.class); provider.registerMatchEntrySerializer(key16, serializer); Assert.assertTrue("Wrong -- unregister MatchEntrySerializer", provider.unregisterSerializer(key16)); Assert.assertFalse("Wrong -- unregister MatchEntrySerializer by not existing key", provider.unregisterSerializer(key15)); // -- registerSerializer - final MessageTypeKey key17 = new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, TestSubType.class); + final MessageTypeKey key17 = new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, TestSubType.class); provider.registerSerializer(key17, serializer); // -- registerDeserializer - final MessageCodeKey key18 = new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 42, TestSubType.class); + final MessageCodeKey key18 = new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, 42, TestSubType.class); provider.registerDeserializer(key18, deserializer); } diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/DeserializationFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/DeserializationFactoryTest.java index 5423b95ece..85c66931c5 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/DeserializationFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/DeserializationFactoryTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.impl.deserialization; import static org.junit.Assert.assertEquals; @@ -14,6 +13,7 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.PooledByteBufAllocator; import org.junit.Test; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Unit tests for DeserializationFactory. @@ -34,7 +34,7 @@ public class DeserializationFactoryTest { buffer.writeByte(0); buffer.writeShort(EncodeConstants.OFHEADER_SIZE); buffer.writeInt(1234); - factory.deserialize(buffer, EncodeConstants.OF13_VERSION_ID); + factory.deserialize(buffer, EncodeConstants.OF_VERSION_1_3); assertEquals("Deserialization failed", 0, buffer.readableBytes()); } @@ -50,6 +50,6 @@ public class DeserializationFactoryTest { buffer.writeByte(0); buffer.writeShort(EncodeConstants.OFHEADER_SIZE); buffer.writeInt(1234); - factory.deserialize(buffer, (short) 0); + factory.deserialize(buffer, Uint8.ZERO); } } diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/DeserializerRegistryImplTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/DeserializerRegistryImplTest.java index 097b630d9f..871de58c1f 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/DeserializerRegistryImplTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/DeserializerRegistryImplTest.java @@ -7,13 +7,17 @@ */ package org.opendaylight.openflowjava.protocol.impl.deserialization; +import static org.opendaylight.openflowjava.protocol.api.util.EncodeConstants.EMPTY_VALUE; +import static org.opendaylight.openflowjava.protocol.api.util.EncodeConstants.OF_VERSION_1_0; +import static org.opendaylight.openflowjava.protocol.api.util.EncodeConstants.OF_VERSION_1_3; + import org.junit.Assert; import org.junit.Test; import org.opendaylight.openflowjava.protocol.api.keys.MessageCodeKey; -import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.openflowjava.protocol.impl.util.MatchDeserializer; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.Match; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.v10.grouping.MatchV10; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Unit tests for DeserializerRegistryImpl. @@ -21,11 +25,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc * @author madamjak */ public class DeserializerRegistryImplTest { - - private static final short OF13 = EncodeConstants.OF13_VERSION_ID; - private static final short OF10 = EncodeConstants.OF10_VERSION_ID; - private static final int EMPTY_VALUE = EncodeConstants.EMPTY_VALUE; - /** * Test - register deserializer without arguments. */ @@ -50,7 +49,7 @@ public class DeserializerRegistryImplTest { @Test(expected = IllegalArgumentException.class) public void testRegisterDeserializerNoDeserializer() { DeserializerRegistryImpl serReg = new DeserializerRegistryImpl(); - serReg.registerDeserializer(new MessageCodeKey(OF13, EMPTY_VALUE, Match.class), null); + serReg.registerDeserializer(new MessageCodeKey(OF_VERSION_1_3, EMPTY_VALUE, Match.class), null); } /** @@ -71,9 +70,9 @@ public class DeserializerRegistryImplTest { DeserializerRegistryImpl derserReg = new DeserializerRegistryImpl(); derserReg.init(); Assert.assertTrue("Wrong - unregister serializer",derserReg.unregisterDeserializer( - new MessageCodeKey(OF13,EMPTY_VALUE, Match.class))); + new MessageCodeKey(OF_VERSION_1_3, EMPTY_VALUE, Match.class))); Assert.assertFalse("Wrong - unregister serializer",derserReg.unregisterDeserializer( - new MessageCodeKey(OF10,EMPTY_VALUE, Match.class))); + new MessageCodeKey(OF_VERSION_1_0, EMPTY_VALUE, Match.class))); } /** @@ -83,7 +82,7 @@ public class DeserializerRegistryImplTest { public void testGetDeserializer() { DeserializerRegistryImpl registry = new DeserializerRegistryImpl(); registry.init(); - registry.getDeserializer(new MessageCodeKey((short) 5000, EncodeConstants.EMPTY_VALUE, MatchV10.class)); + registry.getDeserializer(new MessageCodeKey(Uint8.MAX_VALUE, EMPTY_VALUE, MatchV10.class)); Assert.fail(); } } diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/TypeToClassMapInitializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/TypeToClassMapInitializerTest.java index 66053b3e80..f52f3093c0 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/TypeToClassMapInitializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/TypeToClassMapInitializerTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.impl.deserialization; import static org.junit.Assert.assertEquals; @@ -45,6 +44,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.SetAsyncInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.SetConfigInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.TableModInput; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Test for {@link org.opendaylight.openflowjava.protocol.impl.deserialization.TypeToClassMapInitializer}. @@ -60,7 +60,7 @@ public class TypeToClassMapInitializerTest { messageClassMap = new HashMap<>(); TypeToClassMapInitializer.initializeTypeToClassMap(messageClassMap); - short version = EncodeConstants.OF10_VERSION_ID; + Uint8 version = EncodeConstants.OF_VERSION_1_0; assertEquals("Wrong class", HelloMessage.class, messageClassMap.get(new TypeToClassKey(version, 0))); assertEquals("Wrong class", ErrorMessage.class, messageClassMap.get(new TypeToClassKey(version, 1))); assertEquals("Wrong class", EchoRequestMessage.class, messageClassMap.get(new TypeToClassKey(version, 2))); @@ -75,7 +75,7 @@ public class TypeToClassMapInitializerTest { assertEquals("Wrong class", BarrierOutput.class, messageClassMap.get(new TypeToClassKey(version, 19))); assertEquals("Wrong class", GetQueueConfigOutput.class, messageClassMap.get(new TypeToClassKey(version, 21))); - version = EncodeConstants.OF13_VERSION_ID; + version = EncodeConstants.OF_VERSION_1_3; assertEquals("Wrong class", HelloMessage.class, messageClassMap.get(new TypeToClassKey(version, 0))); assertEquals("Wrong class", ErrorMessage.class, messageClassMap.get(new TypeToClassKey(version, 1))); assertEquals("Wrong class", EchoRequestMessage.class, messageClassMap.get(new TypeToClassKey(version, 2))); @@ -92,14 +92,14 @@ public class TypeToClassMapInitializerTest { assertEquals("Wrong class", RoleRequestOutput.class, messageClassMap.get(new TypeToClassKey(version, 25))); assertEquals("Wrong class", GetAsyncOutput.class, messageClassMap.get(new TypeToClassKey(version, 27))); - version = EncodeConstants.OF14_VERSION_ID; + version = EncodeConstants.OF_VERSION_1_4; assertEquals("Wrong class", HelloMessage.class, messageClassMap.get(new TypeToClassKey(version, 0))); assertEquals("Wrong class", EchoRequestMessage.class, messageClassMap.get(new TypeToClassKey(version, 2))); assertEquals("Wrong class", EchoOutput.class, messageClassMap.get(new TypeToClassKey(version, 3))); assertEquals("Wrong class", GetConfigOutput.class, messageClassMap.get(new TypeToClassKey(version, 8))); assertEquals("Wrong class", BarrierOutput.class, messageClassMap.get(new TypeToClassKey(version, 21))); - version = EncodeConstants.OF15_VERSION_ID; + version = EncodeConstants.OF_VERSION_1_5; assertEquals("Wrong class", HelloMessage.class, messageClassMap.get(new TypeToClassKey(version, 0))); assertEquals("Wrong class", EchoRequestMessage.class, messageClassMap.get(new TypeToClassKey(version, 2))); assertEquals("Wrong class", EchoOutput.class, messageClassMap.get(new TypeToClassKey(version, 3))); @@ -112,7 +112,7 @@ public class TypeToClassMapInitializerTest { messageClassMap = new HashMap<>(); TypeToClassMapInitializer.initializeAdditionalTypeToClassMap(messageClassMap); - short version = EncodeConstants.OF10_VERSION_ID; + Uint8 version = EncodeConstants.OF_VERSION_1_0; assertEquals("Wrong class", GetFeaturesInput.class, messageClassMap.get(new TypeToClassKey(version, 5))); assertEquals("Wrong class", GetConfigInput.class, messageClassMap.get(new TypeToClassKey(version, 7))); assertEquals("Wrong class", SetConfigInput.class, messageClassMap.get(new TypeToClassKey(version, 9))); @@ -123,7 +123,7 @@ public class TypeToClassMapInitializerTest { assertEquals("Wrong class", BarrierInput.class, messageClassMap.get(new TypeToClassKey(version, 18))); assertEquals("Wrong class", GetQueueConfigInput.class, messageClassMap.get(new TypeToClassKey(version, 20))); - version = EncodeConstants.OF13_VERSION_ID; + version = EncodeConstants.OF_VERSION_1_3; assertEquals("Wrong class", GetFeaturesInput.class, messageClassMap.get(new TypeToClassKey(version, 5))); assertEquals("Wrong class", GetConfigInput.class, messageClassMap.get(new TypeToClassKey(version, 7))); assertEquals("Wrong class", SetConfigInput.class, messageClassMap.get(new TypeToClassKey(version, 9))); @@ -140,15 +140,14 @@ public class TypeToClassMapInitializerTest { assertEquals("Wrong class", SetAsyncInput.class, messageClassMap.get(new TypeToClassKey(version, 28))); assertEquals("Wrong class", MeterModInput.class, messageClassMap.get(new TypeToClassKey(version, 29))); - version = EncodeConstants.OF14_VERSION_ID; + version = EncodeConstants.OF_VERSION_1_4; assertEquals("Wrong class", GetConfigInput.class, messageClassMap.get(new TypeToClassKey(version, 7))); assertEquals("Wrong class", SetConfigInput.class, messageClassMap.get(new TypeToClassKey(version, 9))); assertEquals("Wrong class", BarrierInput.class, messageClassMap.get(new TypeToClassKey(version, 20))); - version = EncodeConstants.OF15_VERSION_ID; + version = EncodeConstants.OF_VERSION_1_5; assertEquals("Wrong class", GetConfigInput.class, messageClassMap.get(new TypeToClassKey(version, 7))); assertEquals("Wrong class", SetConfigInput.class, messageClassMap.get(new TypeToClassKey(version, 9))); assertEquals("Wrong class", BarrierInput.class, messageClassMap.get(new TypeToClassKey(version, 20))); } - } diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/BarrierInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/BarrierInputMessageFactoryTest.java index 5e63639be1..47d8d6b1dd 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/BarrierInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/BarrierInputMessageFactoryTest.java @@ -10,7 +10,6 @@ package org.opendaylight.openflowjava.protocol.impl.deserialization.factories; import io.netty.buffer.ByteBuf; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.List; import org.junit.Test; import org.opendaylight.openflowjava.protocol.api.keys.MessageCodeKey; @@ -18,19 +17,18 @@ import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.openflowjava.protocol.impl.util.BufferHelper; import org.opendaylight.openflowjava.protocol.impl.util.DefaultDeserializerFactoryTest; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.BarrierInput; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Test for {@link org.opendaylight.openflowjava.protocol.impl.deserialization.factories.BarrierInputMessageFactory}. * @author giuseppex.petralia@intel.com */ public class BarrierInputMessageFactoryTest extends DefaultDeserializerFactoryTest { - - /** * Initializes deserializer registry and lookups OF13 deserializer. */ public BarrierInputMessageFactoryTest() { - super(new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 20, BarrierInput.class)); + super(new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, 20, BarrierInput.class)); } /** @@ -38,16 +36,16 @@ public class BarrierInputMessageFactoryTest extends DefaultDeserializerFactoryTe */ @Test public void testVersions() { - List versions = new ArrayList<>(Arrays.asList( - EncodeConstants.OF13_VERSION_ID, - EncodeConstants.OF14_VERSION_ID, - EncodeConstants.OF15_VERSION_ID + List versions = new ArrayList<>(Arrays.asList( + EncodeConstants.OF_VERSION_1_3, + EncodeConstants.OF_VERSION_1_4, + EncodeConstants.OF_VERSION_1_5 )); ByteBuf bb = BufferHelper.buildBuffer(); testHeaderVersions(versions, bb); // OFP v1.0 need to be tested separately cause of different message type value - messageCodeKey = new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, 18, BarrierInput.class); - testHeaderVersions(Collections.singletonList(EncodeConstants.OF10_VERSION_ID), bb); + messageCodeKey = new MessageCodeKey(EncodeConstants.OF_VERSION_1_0, 18, BarrierInput.class); + testHeaderVersions(List.of(EncodeConstants.OF_VERSION_1_0), bb); } } diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/BarrierReplyMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/BarrierReplyMessageFactoryTest.java index 99b50600a3..6eb7ef4ef2 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/BarrierReplyMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/BarrierReplyMessageFactoryTest.java @@ -5,13 +5,11 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.impl.deserialization.factories; import io.netty.buffer.ByteBuf; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.List; import org.junit.Test; import org.opendaylight.openflowjava.protocol.api.keys.MessageCodeKey; @@ -19,6 +17,7 @@ import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.openflowjava.protocol.impl.util.BufferHelper; import org.opendaylight.openflowjava.protocol.impl.util.DefaultDeserializerFactoryTest; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.BarrierOutput; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Test for {@link org.opendaylight.openflowjava.protocol.impl.deserialization.factories.BarrierReplyMessageFactory}. @@ -26,12 +25,11 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 * @author timotej.kubas */ public class BarrierReplyMessageFactoryTest extends DefaultDeserializerFactoryTest { - /** * Initializes deserializer registry and lookups OF13 deserializer. */ public BarrierReplyMessageFactoryTest() { - super(new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 21, BarrierOutput.class)); + super(new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, 21, BarrierOutput.class)); } /** @@ -39,16 +37,16 @@ public class BarrierReplyMessageFactoryTest extends DefaultDeserializerFactoryTe */ @Test public void testVersions() { - List versions = new ArrayList<>(Arrays.asList( - EncodeConstants.OF13_VERSION_ID, - EncodeConstants.OF14_VERSION_ID, - EncodeConstants.OF15_VERSION_ID + List versions = new ArrayList<>(Arrays.asList( + EncodeConstants.OF_VERSION_1_3, + EncodeConstants.OF_VERSION_1_4, + EncodeConstants.OF_VERSION_1_5 )); ByteBuf bb = BufferHelper.buildBuffer(); testHeaderVersions(versions, bb); // OFP v1.0 need to be tested separately cause of different message type value - messageCodeKey = new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, 19, BarrierOutput.class); - testHeaderVersions(Collections.singletonList(EncodeConstants.OF10_VERSION_ID), bb); + messageCodeKey = new MessageCodeKey(EncodeConstants.OF_VERSION_1_0, 19, BarrierOutput.class); + testHeaderVersions(List.of(EncodeConstants.OF_VERSION_1_0), bb); } } diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/EchoReplyMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/EchoReplyMessageFactoryTest.java index 8ec42cb14e..e39fb28cf8 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/EchoReplyMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/EchoReplyMessageFactoryTest.java @@ -19,6 +19,7 @@ import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.openflowjava.protocol.impl.util.BufferHelper; import org.opendaylight.openflowjava.protocol.impl.util.DefaultDeserializerFactoryTest; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.EchoOutput; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Test for {@link org.opendaylight.openflowjava.protocol.impl.deserialization.factories.EchoReplyMessageFactory}. @@ -31,7 +32,7 @@ public class EchoReplyMessageFactoryTest extends DefaultDeserializerFactoryTest< * Initializes deserializer registry and lookups OF13 deserializer. */ public EchoReplyMessageFactoryTest() { - super(new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 3, EchoOutput.class)); + super(new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, 3, EchoOutput.class)); } /** @@ -39,11 +40,11 @@ public class EchoReplyMessageFactoryTest extends DefaultDeserializerFactoryTest< */ @Test public void testVersions() { - List versions = new ArrayList<>(Arrays.asList( - EncodeConstants.OF10_VERSION_ID, - EncodeConstants.OF13_VERSION_ID, - EncodeConstants.OF14_VERSION_ID, - EncodeConstants.OF15_VERSION_ID + List versions = new ArrayList<>(Arrays.asList( + EncodeConstants.OF_VERSION_1_0, + EncodeConstants.OF_VERSION_1_3, + EncodeConstants.OF_VERSION_1_4, + EncodeConstants.OF_VERSION_1_5 )); ByteBuf bb = BufferHelper.buildBuffer(); testHeaderVersions(versions, bb); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/EchoRequestMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/EchoRequestMessageFactoryTest.java index fb8fc49038..bf4b1587b7 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/EchoRequestMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/EchoRequestMessageFactoryTest.java @@ -19,6 +19,7 @@ import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.openflowjava.protocol.impl.util.BufferHelper; import org.opendaylight.openflowjava.protocol.impl.util.DefaultDeserializerFactoryTest; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.EchoRequestMessage; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Test for {@link org.opendaylight.openflowjava.protocol.impl.deserialization.factories.EchoRequestMessageFactory}. @@ -31,7 +32,7 @@ public class EchoRequestMessageFactoryTest extends DefaultDeserializerFactoryTes * Initializes deserializer registry and lookups OF13 deserializer. */ public EchoRequestMessageFactoryTest() { - super(new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 2, EchoRequestMessage.class)); + super(new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, 2, EchoRequestMessage.class)); } /** @@ -39,11 +40,11 @@ public class EchoRequestMessageFactoryTest extends DefaultDeserializerFactoryTes */ @Test public void testVersions() { - List versions = new ArrayList<>(Arrays.asList( - EncodeConstants.OF10_VERSION_ID, - EncodeConstants.OF13_VERSION_ID, - EncodeConstants.OF14_VERSION_ID, - EncodeConstants.OF15_VERSION_ID + List versions = new ArrayList<>(Arrays.asList( + EncodeConstants.OF_VERSION_1_0, + EncodeConstants.OF_VERSION_1_3, + EncodeConstants.OF_VERSION_1_4, + EncodeConstants.OF_VERSION_1_5 )); ByteBuf bb = BufferHelper.buildBuffer(); testHeaderVersions(versions, bb); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/FeaturesReplyMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/FeaturesReplyMessageFactoryTest.java index 9f64c80560..6c9fbbe3f5 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/FeaturesReplyMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/FeaturesReplyMessageFactoryTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.impl.deserialization.factories; import io.netty.buffer.ByteBuf; @@ -39,7 +38,7 @@ public class FeaturesReplyMessageFactoryTest { DeserializerRegistry registry = new DeserializerRegistryImpl(); registry.init(); featuresFactory = registry.getDeserializer( - new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 6, GetFeaturesOutput.class)); + new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, 6, GetFeaturesOutput.class)); } /** diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/FlowModInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/FlowModInputMessageFactoryTest.java index 953f7f468f..f50d820a7a 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/FlowModInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/FlowModInputMessageFactoryTest.java @@ -69,7 +69,7 @@ public class FlowModInputMessageFactoryTest { DeserializerRegistry registry = new DeserializerRegistryImpl(); registry.init(); flowFactory = registry - .getDeserializer(new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 14, FlowModInput.class)); + .getDeserializer(new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, 14, FlowModInput.class)); } @Test diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/FlowRemovedMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/FlowRemovedMessageFactoryTest.java index 9a4e48e522..02ccbce48c 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/FlowRemovedMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/FlowRemovedMessageFactoryTest.java @@ -39,7 +39,7 @@ public class FlowRemovedMessageFactoryTest { DeserializerRegistry registry = new DeserializerRegistryImpl(); registry.init(); flowFactory = registry.getDeserializer( - new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 11, FlowRemovedMessage.class)); + new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, 11, FlowRemovedMessage.class)); } /** diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetAsyncReplyMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetAsyncReplyMessageFactoryTest.java index ea7e6d42c8..f61805431f 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetAsyncReplyMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetAsyncReplyMessageFactoryTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.impl.deserialization.factories; import io.netty.buffer.ByteBuf; @@ -48,7 +47,7 @@ public class GetAsyncReplyMessageFactoryTest { DeserializerRegistry registry = new DeserializerRegistryImpl(); registry.init(); asyncFactory = registry.getDeserializer( - new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 27, GetAsyncOutput.class)); + new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, 27, GetAsyncOutput.class)); } /** diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetAsyncRequestMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetAsyncRequestMessageFactoryTest.java index c4aaf2b9fc..7ece220097 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetAsyncRequestMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetAsyncRequestMessageFactoryTest.java @@ -31,7 +31,7 @@ public class GetAsyncRequestMessageFactoryTest { DeserializerRegistry desRegistry = new DeserializerRegistryImpl(); desRegistry.init(); factory = desRegistry - .getDeserializer(new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 26, GetAsyncInput.class)); + .getDeserializer(new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, 26, GetAsyncInput.class)); } diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetConfigInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetConfigInputMessageFactoryTest.java index 9f2eb6ab24..3387a355ef 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetConfigInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetConfigInputMessageFactoryTest.java @@ -17,6 +17,7 @@ import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.openflowjava.protocol.impl.util.BufferHelper; import org.opendaylight.openflowjava.protocol.impl.util.DefaultDeserializerFactoryTest; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetConfigInput; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Test for {@link org.opendaylight.openflowjava.protocol.impl.deserialization.factories.GetConfigInputMessageFactory}. @@ -28,7 +29,7 @@ public class GetConfigInputMessageFactoryTest extends DefaultDeserializerFactory * Initializes deserializer registry and lookups OF13 deserializer. */ public GetConfigInputMessageFactoryTest() { - super(new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 7, GetConfigInput.class)); + super(new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, 7, GetConfigInput.class)); } /** @@ -36,11 +37,11 @@ public class GetConfigInputMessageFactoryTest extends DefaultDeserializerFactory */ @Test public void testVersions() { - List versions = new ArrayList<>(Arrays.asList( - EncodeConstants.OF10_VERSION_ID, - EncodeConstants.OF13_VERSION_ID, - EncodeConstants.OF14_VERSION_ID, - EncodeConstants.OF15_VERSION_ID + List versions = new ArrayList<>(Arrays.asList( + EncodeConstants.OF_VERSION_1_0, + EncodeConstants.OF_VERSION_1_3, + EncodeConstants.OF_VERSION_1_4, + EncodeConstants.OF_VERSION_1_5 )); ByteBuf bb = BufferHelper.buildBuffer(); testHeaderVersions(versions, bb); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetConfigReplyMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetConfigReplyMessageFactoryTest.java index be3d4faaf9..bdc8e8e392 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetConfigReplyMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetConfigReplyMessageFactoryTest.java @@ -19,6 +19,7 @@ import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.openflowjava.protocol.impl.util.BufferHelper; import org.opendaylight.openflowjava.protocol.impl.util.DefaultDeserializerFactoryTest; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetConfigOutput; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Test for {@link org.opendaylight.openflowjava.protocol.impl.deserialization.factories.GetConfigReplyMessageFactory}. @@ -31,7 +32,7 @@ public class GetConfigReplyMessageFactoryTest extends DefaultDeserializerFactory * Initializes deserializer registry and lookups OF13 deserializer. */ public GetConfigReplyMessageFactoryTest() { - super(new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 8, GetConfigOutput.class)); + super(new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, 8, GetConfigOutput.class)); } /** @@ -39,11 +40,11 @@ public class GetConfigReplyMessageFactoryTest extends DefaultDeserializerFactory */ @Test public void testVersions() { - List versions = new ArrayList<>(Arrays.asList( - EncodeConstants.OF10_VERSION_ID, - EncodeConstants.OF13_VERSION_ID, - EncodeConstants.OF14_VERSION_ID, - EncodeConstants.OF15_VERSION_ID + List versions = new ArrayList<>(Arrays.asList( + EncodeConstants.OF_VERSION_1_0, + EncodeConstants.OF_VERSION_1_3, + EncodeConstants.OF_VERSION_1_4, + EncodeConstants.OF_VERSION_1_5 )); ByteBuf bb = BufferHelper.buildBuffer("00 01 00 03"); testHeaderVersions(versions, bb); @@ -59,5 +60,4 @@ public class GetConfigReplyMessageFactoryTest extends DefaultDeserializerFactory Assert.assertEquals("Wrong switchConfigFlag", 0x01, builtByFactory.getFlags().getIntValue()); Assert.assertEquals("Wrong missSendLen", 0x03, builtByFactory.getMissSendLen().intValue()); } - } diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetFeaturesInputFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetFeaturesInputFactoryTest.java index 7164d7cf67..bdc07795ba 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetFeaturesInputFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetFeaturesInputFactoryTest.java @@ -31,7 +31,7 @@ public class GetFeaturesInputFactoryTest { DeserializerRegistry registry = new DeserializerRegistryImpl(); registry.init(); factory = registry - .getDeserializer(new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 5, GetFeaturesInput.class)); + .getDeserializer(new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, 5, GetFeaturesInput.class)); } @Test diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetQueueConfigInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetQueueConfigInputMessageFactoryTest.java index 2f10e9f043..071e34ae49 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetQueueConfigInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetQueueConfigInputMessageFactoryTest.java @@ -22,7 +22,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 import org.opendaylight.yangtools.yang.common.Uint32; /** - * UNit tests for GetQueueConfigInputMessageFactory. + * Unit tests for GetQueueConfigInputMessageFactory. * * @author giuseppex.petralia@intel.com */ @@ -34,7 +34,7 @@ public class GetQueueConfigInputMessageFactoryTest { DeserializerRegistry desRegistry = new DeserializerRegistryImpl(); desRegistry.init(); factory = desRegistry - .getDeserializer(new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 22, GetQueueConfigInput.class)); + .getDeserializer(new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, 22, GetQueueConfigInput.class)); } @Test diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GroupModInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GroupModInputMessageFactoryTest.java index 6cc14a9e45..4704b35d03 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GroupModInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GroupModInputMessageFactoryTest.java @@ -38,7 +38,7 @@ public class GroupModInputMessageFactoryTest { DeserializerRegistry desRegistry = new DeserializerRegistryImpl(); desRegistry.init(); factory = desRegistry - .getDeserializer(new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 15, GroupModInput.class)); + .getDeserializer(new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, 15, GroupModInput.class)); } @Test diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/HelloMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/HelloMessageFactoryTest.java index 98fbbe3b18..f5530f0b45 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/HelloMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/HelloMessageFactoryTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.impl.deserialization.factories; import io.netty.buffer.ByteBuf; @@ -22,6 +21,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev13 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.HelloMessage; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.hello.Elements; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.hello.ElementsBuilder; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Test for {@link org.opendaylight.openflowjava.protocol.impl.deserialization.factories.HelloMessageFactory}. @@ -35,7 +35,7 @@ public class HelloMessageFactoryTest extends DefaultDeserializerFactoryTest versions = new ArrayList<>(Arrays.asList( - EncodeConstants.OF13_VERSION_ID, - EncodeConstants.OF14_VERSION_ID, - EncodeConstants.OF15_VERSION_ID + List versions = new ArrayList<>(Arrays.asList( + EncodeConstants.OF_VERSION_1_3, + EncodeConstants.OF_VERSION_1_4, + EncodeConstants.OF_VERSION_1_5 )); ByteBuf bb = BufferHelper.buildBuffer("00 01 " // type + "00 08 " // length diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MeterModInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MeterModInputMessageFactoryTest.java index a78b5c8c01..3b283e81e9 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MeterModInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MeterModInputMessageFactoryTest.java @@ -47,7 +47,7 @@ public class MeterModInputMessageFactoryTest { DeserializerRegistry desRegistry = new DeserializerRegistryImpl(); desRegistry.init(); factory = desRegistry - .getDeserializer(new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 29, MeterModInput.class)); + .getDeserializer(new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, 29, MeterModInput.class)); } diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactoryTest.java index 2a8758de92..53b253a472 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactoryTest.java @@ -85,7 +85,7 @@ public class MultipartReplyMessageFactoryTest { DeserializerRegistry registry = new DeserializerRegistryImpl(); registry.init(); multipartFactory = registry.getDeserializer( - new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 19, MultipartReplyMessage.class)); + new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, 19, MultipartReplyMessage.class)); } private static final Logger LOG = LoggerFactory.getLogger(MultipartReplyMessageFactoryTest.class); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestAggregateInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestAggregateInputMessageFactoryTest.java index d48f5bfba3..a9b8ab4d0c 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestAggregateInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestAggregateInputMessageFactoryTest.java @@ -41,7 +41,7 @@ public class MultipartRequestAggregateInputMessageFactoryTest { DeserializerRegistry desRegistry = new DeserializerRegistryImpl(); desRegistry.init(); factory = desRegistry - .getDeserializer(new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 18, MultipartRequestInput.class)); + .getDeserializer(new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, 18, MultipartRequestInput.class)); } diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestDescInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestDescInputMessageFactoryTest.java index 7dca156883..1b3dae9ac2 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestDescInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestDescInputMessageFactoryTest.java @@ -39,7 +39,7 @@ public class MultipartRequestDescInputMessageFactoryTest { DeserializerRegistry desRegistry = new DeserializerRegistryImpl(); desRegistry.init(); factory = desRegistry - .getDeserializer(new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 18, MultipartRequestInput.class)); + .getDeserializer(new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, 18, MultipartRequestInput.class)); } @Test diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestFlowInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestFlowInputMessageFactoryTest.java index e506225526..241d75f961 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestFlowInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestFlowInputMessageFactoryTest.java @@ -41,7 +41,7 @@ public class MultipartRequestFlowInputMessageFactoryTest { DeserializerRegistry desRegistry = new DeserializerRegistryImpl(); desRegistry.init(); factory = desRegistry - .getDeserializer(new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 18, MultipartRequestInput.class)); + .getDeserializer(new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, 18, MultipartRequestInput.class)); } diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestGroupInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestGroupInputMessageFactoryTest.java index 4133e6bfbe..a2a64f1484 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestGroupInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestGroupInputMessageFactoryTest.java @@ -40,7 +40,7 @@ public class MultipartRequestGroupInputMessageFactoryTest { DeserializerRegistry desRegistry = new DeserializerRegistryImpl(); desRegistry.init(); factory = desRegistry - .getDeserializer(new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 18, MultipartRequestInput.class)); + .getDeserializer(new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, 18, MultipartRequestInput.class)); } diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestMeterConfigInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestMeterConfigInputMessageFactoryTest.java index 0a5e2bc598..465a31b180 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestMeterConfigInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestMeterConfigInputMessageFactoryTest.java @@ -39,7 +39,7 @@ public class MultipartRequestMeterConfigInputMessageFactoryTest { DeserializerRegistry desRegistry = new DeserializerRegistryImpl(); desRegistry.init(); factory = desRegistry - .getDeserializer(new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 18, MultipartRequestInput.class)); + .getDeserializer(new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, 18, MultipartRequestInput.class)); } @Test diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestMeterInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestMeterInputMessageFactoryTest.java index ce84200119..eead9a1af7 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestMeterInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestMeterInputMessageFactoryTest.java @@ -39,7 +39,7 @@ public class MultipartRequestMeterInputMessageFactoryTest { DeserializerRegistry desRegistry = new DeserializerRegistryImpl(); desRegistry.init(); factory = desRegistry - .getDeserializer(new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 18, MultipartRequestInput.class)); + .getDeserializer(new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, 18, MultipartRequestInput.class)); } @Test diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestPortStatsInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestPortStatsInputMessageFactoryTest.java index a5d3ba2cda..8f93ea3cb3 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestPortStatsInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestPortStatsInputMessageFactoryTest.java @@ -38,7 +38,7 @@ public class MultipartRequestPortStatsInputMessageFactoryTest { DeserializerRegistry desRegistry = new DeserializerRegistryImpl(); desRegistry.init(); factory = desRegistry - .getDeserializer(new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 18, MultipartRequestInput.class)); + .getDeserializer(new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, 18, MultipartRequestInput.class)); } @Test diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestQueueInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestQueueInputMessageFactoryTest.java index 01c00534c7..944af3cb8f 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestQueueInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestQueueInputMessageFactoryTest.java @@ -38,7 +38,7 @@ public class MultipartRequestQueueInputMessageFactoryTest { DeserializerRegistry desRegistry = new DeserializerRegistryImpl(); desRegistry.init(); factory = desRegistry - .getDeserializer(new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 18, MultipartRequestInput.class)); + .getDeserializer(new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, 18, MultipartRequestInput.class)); } @Test diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestTableFeaturesInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestTableFeaturesInputMessageFactoryTest.java index d6e1d1641b..4e12acaba0 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestTableFeaturesInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestTableFeaturesInputMessageFactoryTest.java @@ -23,8 +23,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.InstructionRelatedTableFeaturePropertyBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.NextTableRelatedTableFeaturePropertyBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.OxmRelatedTableFeaturePropertyBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.table.features.properties.container.table.feature.properties.NextTableIds; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.table.features.properties.container.table.feature.properties.NextTableIdsBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.next.table.related.table.feature.property.NextTableIds; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.next.table.related.table.feature.property.NextTableIdsBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.OutputActionCaseBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder; @@ -66,7 +66,7 @@ public class MultipartRequestTableFeaturesInputMessageFactoryTest { DeserializerRegistry desRegistry = new DeserializerRegistryImpl(); desRegistry.init(); factory = desRegistry - .getDeserializer(new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 18, MultipartRequestInput.class)); + .getDeserializer(new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, 18, MultipartRequestInput.class)); } @Test diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestTableInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestTableInputMessageFactoryTest.java index 5308022ccf..bf349844a1 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestTableInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestTableInputMessageFactoryTest.java @@ -34,7 +34,7 @@ public class MultipartRequestTableInputMessageFactoryTest { DeserializerRegistry desRegistry = new DeserializerRegistryImpl(); desRegistry.init(); factory = desRegistry - .getDeserializer(new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 18, MultipartRequestInput.class)); + .getDeserializer(new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, 18, MultipartRequestInput.class)); } @Test diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10ErrorMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10ErrorMessageFactoryTest.java index ef0731f9b6..b3b638feae 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10ErrorMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10ErrorMessageFactoryTest.java @@ -36,7 +36,7 @@ public class OF10ErrorMessageFactoryTest { DeserializerRegistry registry = new DeserializerRegistryImpl(); registry.init(); errorFactory = registry.getDeserializer( - new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, 1, ErrorMessage.class)); + new MessageCodeKey(EncodeConstants.OF_VERSION_1_0, 1, ErrorMessage.class)); } /** diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FeaturesReplyMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FeaturesReplyMessageFactoryTest.java index dff63a275c..b8a12b7973 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FeaturesReplyMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FeaturesReplyMessageFactoryTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.impl.deserialization.factories; import io.netty.buffer.ByteBuf; @@ -44,7 +43,7 @@ public class OF10FeaturesReplyMessageFactoryTest { DeserializerRegistry registry = new DeserializerRegistryImpl(); registry.init(); featuresFactory = registry.getDeserializer( - new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, 6, GetFeaturesOutput.class)); + new MessageCodeKey(EncodeConstants.OF_VERSION_1_0, 6, GetFeaturesOutput.class)); } /** diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FeaturesRequestMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FeaturesRequestMessageFactoryTest.java index 4805508cdb..d59858641c 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FeaturesRequestMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FeaturesRequestMessageFactoryTest.java @@ -31,7 +31,7 @@ public class OF10FeaturesRequestMessageFactoryTest { DeserializerRegistry desRegistry = new DeserializerRegistryImpl(); desRegistry.init(); factory = desRegistry - .getDeserializer(new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, 5, GetFeaturesInput.class)); + .getDeserializer(new MessageCodeKey(EncodeConstants.OF_VERSION_1_0, 5, GetFeaturesInput.class)); } @Test diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FlowModInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FlowModInputMessageFactoryTest.java index a8ca14a244..8f43c67f6c 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FlowModInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FlowModInputMessageFactoryTest.java @@ -52,7 +52,7 @@ public class OF10FlowModInputMessageFactoryTest { DeserializerRegistry desRegistry = new DeserializerRegistryImpl(); desRegistry.init(); factory = desRegistry - .getDeserializer(new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, 14, FlowModInput.class)); + .getDeserializer(new MessageCodeKey(EncodeConstants.OF_VERSION_1_0, 14, FlowModInput.class)); } @Test diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FlowRemovedMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FlowRemovedMessageFactoryTest.java index d919fc0f18..d3ea31b502 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FlowRemovedMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FlowRemovedMessageFactoryTest.java @@ -36,7 +36,7 @@ public class OF10FlowRemovedMessageFactoryTest { DeserializerRegistry registry = new DeserializerRegistryImpl(); registry.init(); flowFactory = registry.getDeserializer( - new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, 11, FlowRemovedMessage.class)); + new MessageCodeKey(EncodeConstants.OF_VERSION_1_0, 11, FlowRemovedMessage.class)); } /** diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10GetQueueConfigInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10GetQueueConfigInputMessageFactoryTest.java index fdab663b2d..0f674e26da 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10GetQueueConfigInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10GetQueueConfigInputMessageFactoryTest.java @@ -34,7 +34,7 @@ public class OF10GetQueueConfigInputMessageFactoryTest { DeserializerRegistry desRegistry = new DeserializerRegistryImpl(); desRegistry.init(); factory = desRegistry - .getDeserializer(new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, 20, GetQueueConfigInput.class)); + .getDeserializer(new MessageCodeKey(EncodeConstants.OF_VERSION_1_0, 20, GetQueueConfigInput.class)); } @Test diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10HelloMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10HelloMessageFactoryTest.java index 9cf750fb3f..f4d305b168 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10HelloMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10HelloMessageFactoryTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.impl.deserialization.factories; import io.netty.buffer.ByteBuf; @@ -37,7 +36,7 @@ public class OF10HelloMessageFactoryTest { DeserializerRegistry registry = new DeserializerRegistryImpl(); registry.init(); helloFactory = registry.getDeserializer( - new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, 0, HelloMessage.class)); + new MessageCodeKey(EncodeConstants.OF_VERSION_1_0, 0, HelloMessage.class)); } /** diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PacketInMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PacketInMessageFactoryTest.java index 58bca802a4..74a756959d 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PacketInMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PacketInMessageFactoryTest.java @@ -38,7 +38,7 @@ public class OF10PacketInMessageFactoryTest { DeserializerRegistry registry = new DeserializerRegistryImpl(); registry.init(); packetInFactory = registry.getDeserializer( - new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, 10, PacketInMessage.class)); + new MessageCodeKey(EncodeConstants.OF_VERSION_1_0, 10, PacketInMessage.class)); } /** diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PacketOutInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PacketOutInputMessageFactoryTest.java index 0236d23f08..bdf6b490d8 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PacketOutInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PacketOutInputMessageFactoryTest.java @@ -43,7 +43,7 @@ public class OF10PacketOutInputMessageFactoryTest { DeserializerRegistry desRegistry = new DeserializerRegistryImpl(); desRegistry.init(); factory = desRegistry - .getDeserializer(new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, 13, PacketOutInput.class)); + .getDeserializer(new MessageCodeKey(EncodeConstants.OF_VERSION_1_0, 13, PacketOutInput.class)); } @Test diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PortModInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PortModInputMessageFactoryTest.java index ab1b2c513a..d8ec66e7a1 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PortModInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PortModInputMessageFactoryTest.java @@ -37,7 +37,7 @@ public class OF10PortModInputMessageFactoryTest { DeserializerRegistry desRegistry = new DeserializerRegistryImpl(); desRegistry.init(); factory = desRegistry - .getDeserializer(new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, 15, PortModInput.class)); + .getDeserializer(new MessageCodeKey(EncodeConstants.OF_VERSION_1_0, 15, PortModInput.class)); } @Test diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PortStatusMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PortStatusMessageFactoryTest.java index 7a20eeb6a7..18c1625ebc 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PortStatusMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PortStatusMessageFactoryTest.java @@ -42,7 +42,7 @@ public class OF10PortStatusMessageFactoryTest { DeserializerRegistry registry = new DeserializerRegistryImpl(); registry.init(); statusFactory = registry.getDeserializer( - new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, 12, PortStatusMessage.class)); + new MessageCodeKey(EncodeConstants.OF_VERSION_1_0, 12, PortStatusMessage.class)); } /** diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10QueueGetConfigReplyMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10QueueGetConfigReplyMessageFactoryTest.java index 415f58fdfb..af20664db5 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10QueueGetConfigReplyMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10QueueGetConfigReplyMessageFactoryTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.impl.deserialization.factories; import io.netty.buffer.ByteBuf; @@ -40,7 +39,7 @@ public class OF10QueueGetConfigReplyMessageFactoryTest { DeserializerRegistry registry = new DeserializerRegistryImpl(); registry.init(); queueFactory = registry.getDeserializer( - new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, 21, GetQueueConfigOutput.class)); + new MessageCodeKey(EncodeConstants.OF_VERSION_1_0, 21, GetQueueConfigOutput.class)); } /** diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsReplyMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsReplyMessageFactoryTest.java index 308cb2b2c0..6671b0bc41 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsReplyMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsReplyMessageFactoryTest.java @@ -55,7 +55,7 @@ public class OF10StatsReplyMessageFactoryTest { DeserializerRegistry registry = new DeserializerRegistryImpl(); registry.init(); statsFactory = registry.getDeserializer( - new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, 17, MultipartReplyMessage.class)); + new MessageCodeKey(EncodeConstants.OF_VERSION_1_0, 17, MultipartReplyMessage.class)); } /** diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsRequestInputAggregateFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsRequestInputAggregateFactoryTest.java index 72e1f2c8ad..63df369715 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsRequestInputAggregateFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsRequestInputAggregateFactoryTest.java @@ -43,7 +43,7 @@ public class OF10StatsRequestInputAggregateFactoryTest { DeserializerRegistry desRegistry = new DeserializerRegistryImpl(); desRegistry.init(); factory = desRegistry - .getDeserializer(new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, 16, MultipartRequestInput.class)); + .getDeserializer(new MessageCodeKey(EncodeConstants.OF_VERSION_1_0, 16, MultipartRequestInput.class)); } @Test diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsRequestInputDescFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsRequestInputDescFactoryTest.java index 6bacff0b08..a1d609b97d 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsRequestInputDescFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsRequestInputDescFactoryTest.java @@ -37,7 +37,7 @@ public class OF10StatsRequestInputDescFactoryTest { DeserializerRegistry desRegistry = new DeserializerRegistryImpl(); desRegistry.init(); factory = desRegistry - .getDeserializer(new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, 16, MultipartRequestInput.class)); + .getDeserializer(new MessageCodeKey(EncodeConstants.OF_VERSION_1_0, 16, MultipartRequestInput.class)); } @Test diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsRequestInputFlowFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsRequestInputFlowFactoryTest.java index 1e473cfe1a..00ce6f47d7 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsRequestInputFlowFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsRequestInputFlowFactoryTest.java @@ -43,7 +43,7 @@ public class OF10StatsRequestInputFlowFactoryTest { DeserializerRegistry desRegistry = new DeserializerRegistryImpl(); desRegistry.init(); factory = desRegistry - .getDeserializer(new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, 16, MultipartRequestInput.class)); + .getDeserializer(new MessageCodeKey(EncodeConstants.OF_VERSION_1_0, 16, MultipartRequestInput.class)); } @Test diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsRequestInputPortStatsFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsRequestInputPortStatsFactoryTest.java index cc897fff90..8802b1d21c 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsRequestInputPortStatsFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsRequestInputPortStatsFactoryTest.java @@ -37,7 +37,7 @@ public class OF10StatsRequestInputPortStatsFactoryTest { DeserializerRegistry desRegistry = new DeserializerRegistryImpl(); desRegistry.init(); factory = desRegistry - .getDeserializer(new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, 16, MultipartRequestInput.class)); + .getDeserializer(new MessageCodeKey(EncodeConstants.OF_VERSION_1_0, 16, MultipartRequestInput.class)); } @Test diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsRequestInputQueueFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsRequestInputQueueFactoryTest.java index d9121e6d92..200d08bc03 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsRequestInputQueueFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsRequestInputQueueFactoryTest.java @@ -37,7 +37,7 @@ public class OF10StatsRequestInputQueueFactoryTest { DeserializerRegistry desRegistry = new DeserializerRegistryImpl(); desRegistry.init(); factory = desRegistry - .getDeserializer(new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, 16, MultipartRequestInput.class)); + .getDeserializer(new MessageCodeKey(EncodeConstants.OF_VERSION_1_0, 16, MultipartRequestInput.class)); } @Test diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsRequestInputTableFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsRequestInputTableFactoryTest.java index 90af00075f..a65ea4b824 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsRequestInputTableFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsRequestInputTableFactoryTest.java @@ -37,7 +37,7 @@ public class OF10StatsRequestInputTableFactoryTest { DeserializerRegistry desRegistry = new DeserializerRegistryImpl(); desRegistry.init(); factory = desRegistry - .getDeserializer(new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, 16, MultipartRequestInput.class)); + .getDeserializer(new MessageCodeKey(EncodeConstants.OF_VERSION_1_0, 16, MultipartRequestInput.class)); } @Test diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PacketInMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PacketInMessageFactoryTest.java index 87ddd5a145..9977b38e27 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PacketInMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PacketInMessageFactoryTest.java @@ -40,7 +40,7 @@ public class PacketInMessageFactoryTest { DeserializerRegistry registry = new DeserializerRegistryImpl(); registry.init(); packetInFactory = registry.getDeserializer( - new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 10, PacketInMessage.class)); + new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, 10, PacketInMessage.class)); } /** diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PacketOutInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PacketOutInputMessageFactoryTest.java index db549547b0..e02c4e357f 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PacketOutInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PacketOutInputMessageFactoryTest.java @@ -44,7 +44,7 @@ public class PacketOutInputMessageFactoryTest { DeserializerRegistry registry = new DeserializerRegistryImpl(); registry.init(); factory = registry - .getDeserializer(new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 13, PacketOutInput.class)); + .getDeserializer(new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, 13, PacketOutInput.class)); } diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PortModInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PortModInputMessageFactoryTest.java index 9b83a17f52..4c74a78203 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PortModInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PortModInputMessageFactoryTest.java @@ -37,7 +37,7 @@ public class PortModInputMessageFactoryTest { DeserializerRegistry desRegistry = new DeserializerRegistryImpl(); desRegistry.init(); factory = desRegistry - .getDeserializer(new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 16, PortModInput.class)); + .getDeserializer(new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, 16, PortModInput.class)); } @Test diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PortStatusMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PortStatusMessageFactoryTest.java index 7c46b1fc0a..67a26dc76d 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PortStatusMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PortStatusMessageFactoryTest.java @@ -43,7 +43,7 @@ public class PortStatusMessageFactoryTest { DeserializerRegistry registry = new DeserializerRegistryImpl(); registry.init(); statusFactory = registry.getDeserializer( - new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 12, PortStatusMessage.class)); + new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, 12, PortStatusMessage.class)); } /** diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/QueueGetConfigReplyMessageFactoryMultiTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/QueueGetConfigReplyMessageFactoryMultiTest.java index deee9f9a0a..4cc3b32acc 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/QueueGetConfigReplyMessageFactoryMultiTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/QueueGetConfigReplyMessageFactoryMultiTest.java @@ -49,7 +49,7 @@ public class QueueGetConfigReplyMessageFactoryMultiTest { DeserializerRegistry registry = new DeserializerRegistryImpl(); registry.init(); queueFactory = registry.getDeserializer( - new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 23, GetQueueConfigOutput.class)); + new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, 23, GetQueueConfigOutput.class)); } /** diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/QueueGetConfigReplyMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/QueueGetConfigReplyMessageFactoryTest.java index abcd2c7fb1..5e95462137 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/QueueGetConfigReplyMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/QueueGetConfigReplyMessageFactoryTest.java @@ -38,7 +38,6 @@ import org.opendaylight.yangtools.yang.common.Uint32; * @author michal.polkorab */ public class QueueGetConfigReplyMessageFactoryTest { - private OFDeserializer queueFactory; /** @@ -49,7 +48,7 @@ public class QueueGetConfigReplyMessageFactoryTest { DeserializerRegistry registry = new DeserializerRegistryImpl(); registry.init(); queueFactory = registry.getDeserializer( - new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 23, GetQueueConfigOutput.class)); + new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, 23, GetQueueConfigOutput.class)); } /** diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/RoleReplyMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/RoleReplyMessageFactoryTest.java index 573a0cb033..cee941912b 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/RoleReplyMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/RoleReplyMessageFactoryTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.impl.deserialization.factories; import io.netty.buffer.ByteBuf; @@ -38,7 +37,7 @@ public class RoleReplyMessageFactoryTest { DeserializerRegistry registry = new DeserializerRegistryImpl(); registry.init(); roleFactory = registry.getDeserializer( - new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 25, RoleRequestOutput.class)); + new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, 25, RoleRequestOutput.class)); } /** diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/RoleRequestInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/RoleRequestInputMessageFactoryTest.java index ed3ab075d7..8751dffb33 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/RoleRequestInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/RoleRequestInputMessageFactoryTest.java @@ -35,7 +35,7 @@ public class RoleRequestInputMessageFactoryTest { DeserializerRegistry desRegistry = new DeserializerRegistryImpl(); desRegistry.init(); factory = desRegistry - .getDeserializer(new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 24, RoleRequestInput.class)); + .getDeserializer(new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, 24, RoleRequestInput.class)); } diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/SetAsyncInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/SetAsyncInputMessageFactoryTest.java index 672f0e9d4e..95e4b8b78b 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/SetAsyncInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/SetAsyncInputMessageFactoryTest.java @@ -43,7 +43,7 @@ public class SetAsyncInputMessageFactoryTest { DeserializerRegistry desRegistry = new DeserializerRegistryImpl(); desRegistry.init(); factory = desRegistry - .getDeserializer(new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 28, SetAsyncInput.class)); + .getDeserializer(new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, 28, SetAsyncInput.class)); } diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/SetConfigInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/SetConfigInputMessageFactoryTest.java index fe4b4bb80e..3897eb9d4d 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/SetConfigInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/SetConfigInputMessageFactoryTest.java @@ -19,6 +19,7 @@ import org.opendaylight.openflowjava.protocol.impl.util.BufferHelper; import org.opendaylight.openflowjava.protocol.impl.util.DefaultDeserializerFactoryTest; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.SwitchConfigFlag; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.SetConfigInput; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Test for {@link org.opendaylight.openflowjava.protocol.impl.deserialization.factories.SetConfigInputMessageFactory}. @@ -30,7 +31,7 @@ public class SetConfigInputMessageFactoryTest extends DefaultDeserializerFactory * Initializes deserializer registry and lookups OF13 deserializer. */ public SetConfigInputMessageFactoryTest() { - super(new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 9, SetConfigInput.class)); + super(new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, 9, SetConfigInput.class)); } /** @@ -38,11 +39,11 @@ public class SetConfigInputMessageFactoryTest extends DefaultDeserializerFactory */ @Test public void testVersions() { - List versions = new ArrayList<>(Arrays.asList( - EncodeConstants.OF10_VERSION_ID, - EncodeConstants.OF13_VERSION_ID, - EncodeConstants.OF14_VERSION_ID, - EncodeConstants.OF15_VERSION_ID + List versions = new ArrayList<>(Arrays.asList( + EncodeConstants.OF_VERSION_1_0, + EncodeConstants.OF_VERSION_1_3, + EncodeConstants.OF_VERSION_1_4, + EncodeConstants.OF_VERSION_1_5 )); ByteBuf bb = BufferHelper.buildBuffer("00 02 " + "00 0a"); testHeaderVersions(versions, bb); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/TableModInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/TableModInputMessageFactoryTest.java index 41e7b1a937..bc946f111d 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/TableModInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/TableModInputMessageFactoryTest.java @@ -36,7 +36,7 @@ public class TableModInputMessageFactoryTest { DeserializerRegistry desRegistry = new DeserializerRegistryImpl(); desRegistry.init(); factory = desRegistry - .getDeserializer(new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 17, TableModInput.class)); + .getDeserializer(new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, 17, TableModInput.class)); } diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/multipart/MultipartReplyFlowTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/multipart/MultipartReplyFlowTest.java index aaf8c10466..7fbeff4b1d 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/multipart/MultipartReplyFlowTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/multipart/MultipartReplyFlowTest.java @@ -43,7 +43,7 @@ public class MultipartReplyFlowTest { DeserializerRegistry registry = new DeserializerRegistryImpl(); registry.init(); factory = registry.getDeserializer( - new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 19, MultipartReplyMessage.class)); + new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, 19, MultipartReplyMessage.class)); } /** diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/multipart/MultipartReplyTableFeaturesTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/multipart/MultipartReplyTableFeaturesTest.java index 07b9c62eaf..8ab432b89b 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/multipart/MultipartReplyTableFeaturesTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/multipart/MultipartReplyTableFeaturesTest.java @@ -14,7 +14,7 @@ import org.junit.Test; import org.opendaylight.openflowjava.protocol.impl.deserialization.factories.MultipartReplyMessageFactory; import org.opendaylight.openflowjava.protocol.impl.util.BufferHelper; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.NextTableRelatedTableFeatureProperty; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.table.features.properties.container.table.feature.properties.NextTableIds; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.next.table.related.table.feature.property.NextTableIds; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.TableFeaturesPropType; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartReplyMessage; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyTableFeaturesCase; diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/SerializationFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/SerializationFactoryTest.java index 0ee1685330..64b966d4b9 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/SerializationFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/SerializationFactoryTest.java @@ -16,6 +16,7 @@ import org.opendaylight.openflowjava.protocol.api.extensibility.SerializerRegist import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.HelloInputBuilder; import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Unit tests for SerializationFactory. @@ -37,7 +38,7 @@ public class SerializationFactoryTest { helloBuilder.setVersion(EncodeConstants.OF_VERSION_1_0); helloBuilder.setXid(Uint32.valueOf(123456)); helloBuilder.setElements(null); - factory.messageToBuffer(EncodeConstants.OF10_VERSION_ID, buffer, helloBuilder.build()); + factory.messageToBuffer(EncodeConstants.OF_VERSION_1_0, buffer, helloBuilder.build()); assertEquals("Serialization failed", EncodeConstants.OFHEADER_SIZE, buffer.readableBytes()); } @@ -54,6 +55,6 @@ public class SerializationFactoryTest { helloBuilder.setVersion(EncodeConstants.OF_VERSION_1_0); helloBuilder.setXid(Uint32.valueOf(123456)); helloBuilder.setElements(null); - factory.messageToBuffer((short) 0, buffer, helloBuilder.build()); + factory.messageToBuffer(Uint8.ZERO, buffer, helloBuilder.build()); } } diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/SerializerRegistryImplTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/SerializerRegistryImplTest.java index 77f3173846..e1de29da63 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/SerializerRegistryImplTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/SerializerRegistryImplTest.java @@ -7,10 +7,12 @@ */ package org.opendaylight.openflowjava.protocol.impl.serialization; +import static org.opendaylight.openflowjava.protocol.api.util.EncodeConstants.OF_VERSION_1_0; +import static org.opendaylight.openflowjava.protocol.api.util.EncodeConstants.OF_VERSION_1_3; + import org.junit.Assert; import org.junit.Test; import org.opendaylight.openflowjava.protocol.api.keys.MessageTypeKey; -import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.openflowjava.protocol.impl.util.OF13MatchSerializer; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.Match; @@ -21,9 +23,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc */ public class SerializerRegistryImplTest { - private static final short OF13 = EncodeConstants.OF13_VERSION_ID; - private static final short OF10 = EncodeConstants.OF10_VERSION_ID; - /** * Test - register serializer without arguments. */ @@ -41,7 +40,7 @@ public class SerializerRegistryImplTest { public void testUnRegisterSerializerNoMessageTypeKey() { SerializerRegistryImpl serReg = new SerializerRegistryImpl(); serReg.init(); - serReg.registerSerializer(new MessageTypeKey<>(OF13, Match.class), new OF13MatchSerializer()); + serReg.registerSerializer(new MessageTypeKey<>(OF_VERSION_1_3, Match.class), new OF13MatchSerializer()); serReg.unregisterSerializer(null); } @@ -52,12 +51,12 @@ public class SerializerRegistryImplTest { public void testUnRegisterSerializer() { SerializerRegistryImpl serReg = new SerializerRegistryImpl(); serReg.init(); - serReg.registerSerializer(new MessageTypeKey<>(OF13, Match.class), new OF13MatchSerializer()); + serReg.registerSerializer(new MessageTypeKey<>(OF_VERSION_1_3, Match.class), new OF13MatchSerializer()); Assert.assertTrue("Wrong - unregister serializer", - serReg.unregisterSerializer(new MessageTypeKey<>(OF13, Match.class))); + serReg.unregisterSerializer(new MessageTypeKey<>(OF_VERSION_1_3, Match.class))); - serReg.registerSerializer(new MessageTypeKey<>(OF13, Match.class), new OF13MatchSerializer()); + serReg.registerSerializer(new MessageTypeKey<>(OF_VERSION_1_3, Match.class), new OF13MatchSerializer()); Assert.assertFalse("Wrong - unregister serializer", - serReg.unregisterSerializer(new MessageTypeKey<>(OF10, Match.class))); + serReg.unregisterSerializer(new MessageTypeKey<>(OF_VERSION_1_0, Match.class))); } } diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/action/OF13SetFieldActionSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/action/OF13SetFieldActionSerializerTest.java index bb50970f1f..c43b4f5092 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/action/OF13SetFieldActionSerializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/action/OF13SetFieldActionSerializerTest.java @@ -22,8 +22,8 @@ import org.opendaylight.openflowjava.protocol.api.keys.MatchEntrySerializerKey; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.openflowjava.protocol.impl.serialization.SerializerRegistryImpl; import org.opendaylight.openflowjava.protocol.impl.util.ActionConstants; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.experimenter.id._case.ExperimenterBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.experimenter.id._case.ExperimenterBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetFieldCaseBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.set.field._case.SetFieldActionBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder; @@ -81,7 +81,7 @@ public class OF13SetFieldActionSerializerTest { caseBuilder.setSetFieldAction(setFieldBuilder.build()); actionBuilder.setActionChoice(caseBuilder.build()); MatchEntrySerializerKey key = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, ExperimenterClass.class, OxmMatchFieldClass.class); + EncodeConstants.OF_VERSION_1_3, ExperimenterClass.class, OxmMatchFieldClass.class); key.setExperimenterId(experimenterId); registry.registerSerializer(key, serializerMock); ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer(); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/BarrierInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/BarrierInputMessageFactoryTest.java index 01edc6ed57..17913dc379 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/BarrierInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/BarrierInputMessageFactoryTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.impl.serialization.factories; import io.netty.buffer.ByteBuf; @@ -27,8 +26,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 * @author michal.polkorab */ public class BarrierInputMessageFactoryTest { - private static final byte BARRIER_REQUEST_MESSAGE_CODE_TYPE = 20; + private SerializerRegistry registry; private OFSerializer barrierFactory; @@ -40,7 +39,7 @@ public class BarrierInputMessageFactoryTest { registry = new SerializerRegistryImpl(); registry.init(); barrierFactory = registry.getSerializer( - new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, BarrierInput.class)); + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, BarrierInput.class)); } /** diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/BarrierReplyMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/BarrierReplyMessageFactoryTest.java index 0e3020796a..50a5185855 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/BarrierReplyMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/BarrierReplyMessageFactoryTest.java @@ -33,7 +33,7 @@ public class BarrierReplyMessageFactoryTest { public void startUp() { SerializerRegistry registry = new SerializerRegistryImpl(); registry.init(); - factory = registry.getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, BarrierOutput.class)); + factory = registry.getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, BarrierOutput.class)); } diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/EchoInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/EchoInputMessageFactoryTest.java index 303b2ed343..beb752669d 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/EchoInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/EchoInputMessageFactoryTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.impl.serialization.factories; import io.netty.buffer.ByteBuf; @@ -41,7 +40,7 @@ public class EchoInputMessageFactoryTest { registry = new SerializerRegistryImpl(); registry.init(); echoFactory = registry.getSerializer( - new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, EchoInput.class)); + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, EchoInput.class)); } /** diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/EchoOutputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/EchoOutputMessageFactoryTest.java index df8a82261b..eb5a77c4d5 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/EchoOutputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/EchoOutputMessageFactoryTest.java @@ -35,7 +35,7 @@ public class EchoOutputMessageFactoryTest { public void startUp() { SerializerRegistry registry = new SerializerRegistryImpl(); registry.init(); - factory = registry.getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, EchoOutput.class)); + factory = registry.getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, EchoOutput.class)); } @Test diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/EchoReplyInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/EchoReplyInputMessageFactoryTest.java index 38f72126c7..b16f90e5ee 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/EchoReplyInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/EchoReplyInputMessageFactoryTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.impl.serialization.factories; import io.netty.buffer.ByteBuf; @@ -28,8 +27,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 * @author michal.polkorab */ public class EchoReplyInputMessageFactoryTest { - private static final byte ECHO_REPLY_MESSAGE_CODE_TYPE = 3; + private SerializerRegistry registry; private OFSerializer echoFactory; @@ -41,7 +40,7 @@ public class EchoReplyInputMessageFactoryTest { registry = new SerializerRegistryImpl(); registry.init(); echoFactory = registry.getSerializer( - new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, EchoReplyInput.class)); + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, EchoReplyInput.class)); } /** diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/EchoRequestMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/EchoRequestMessageFactoryTest.java index 154579db14..8e35715f15 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/EchoRequestMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/EchoRequestMessageFactoryTest.java @@ -36,7 +36,7 @@ public class EchoRequestMessageFactoryTest { SerializerRegistry registry = new SerializerRegistryImpl(); registry.init(); factory = registry - .getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, EchoRequestMessage.class)); + .getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, EchoRequestMessage.class)); } @Test diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/ErrorMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/ErrorMessageFactoryTest.java index 9ff1536e42..4e00b81339 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/ErrorMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/ErrorMessageFactoryTest.java @@ -36,7 +36,7 @@ public class ErrorMessageFactoryTest { public void startUp() { SerializerRegistry registry = new SerializerRegistryImpl(); registry.init(); - factory = registry.getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, ErrorMessage.class)); + factory = registry.getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, ErrorMessage.class)); } @Test diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/FlowModInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/FlowModInputMessageFactoryTest.java index 08f638f835..88f4e730e3 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/FlowModInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/FlowModInputMessageFactoryTest.java @@ -74,7 +74,7 @@ public class FlowModInputMessageFactoryTest { registry = new SerializerRegistryImpl(); registry.init(); flowModFactory = registry.getSerializer(new MessageTypeKey<>( - EncodeConstants.OF13_VERSION_ID, FlowModInput.class)); + EncodeConstants.OF_VERSION_1_3, FlowModInput.class)); } /** @@ -236,5 +236,4 @@ public class FlowModInputMessageFactoryTest { return new FlowModFlags(_oFPFFCHECKOVERLAP, _oFPFFNOBYTCOUNTS, _oFPFFNOPKTCOUNTS, _oFPFFRESETCOUNTS, _oFPFFSENDFLOWREM); } - } diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/FlowRemovedMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/FlowRemovedMessageFactoryTest.java index c459ba38b7..ac8bac2ceb 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/FlowRemovedMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/FlowRemovedMessageFactoryTest.java @@ -55,7 +55,7 @@ public class FlowRemovedMessageFactoryTest { SerializerRegistry registry = new SerializerRegistryImpl(); registry.init(); factory = registry - .getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, FlowRemovedMessage.class)); + .getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, FlowRemovedMessage.class)); } @Test @@ -139,5 +139,4 @@ public class FlowRemovedMessageFactoryTest { Assert.assertEquals("Wrong oxm value", 4, serializedBuffer.readUnsignedByte()); serializedBuffer.skipBytes(7); } - } diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetAsyncReplyMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetAsyncReplyMessageFactoryTest.java index cf04d6a5c4..a0a6de17bb 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetAsyncReplyMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetAsyncReplyMessageFactoryTest.java @@ -45,7 +45,7 @@ public class GetAsyncReplyMessageFactoryTest { public void startUp() { SerializerRegistry registry = new SerializerRegistryImpl(); registry.init(); - factory = registry.getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, GetAsyncOutput.class)); + factory = registry.getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, GetAsyncOutput.class)); } @Test @@ -142,5 +142,4 @@ public class GetAsyncReplyMessageFactoryTest { BufferHelper.checkHeaderV13(serializedBuffer, MESSAGE_TYPE, 8); Assert.assertTrue("Unexpected data", serializedBuffer.readableBytes() == 0); } - } diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetConfigInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetConfigInputMessageFactoryTest.java index 49501e3b2a..3a0d9a030a 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetConfigInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetConfigInputMessageFactoryTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.impl.serialization.factories; import io.netty.buffer.ByteBuf; @@ -40,7 +39,7 @@ public class GetConfigInputMessageFactoryTest { registry = new SerializerRegistryImpl(); registry.init(); getConfigFactory = registry.getSerializer( - new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, GetConfigInput.class)); + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, GetConfigInput.class)); } /** @@ -72,5 +71,4 @@ public class GetConfigInputMessageFactoryTest { BufferHelper.checkHeaderV10(out, GET_CONFIG_REQUEST_MESSAGE_CODE_TYPE, 8); } - } diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetConfigReplyMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetConfigReplyMessageFactoryTest.java index b169cdbcfa..d397c0dcee 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetConfigReplyMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetConfigReplyMessageFactoryTest.java @@ -36,7 +36,7 @@ public class GetConfigReplyMessageFactoryTest { public void startUp() { SerializerRegistry registry = new SerializerRegistryImpl(); registry.init(); - factory = registry.getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, GetConfigOutput.class)); + factory = registry.getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, GetConfigOutput.class)); } @Test diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetFeaturesInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetFeaturesInputMessageFactoryTest.java index 8adb0dfea5..6028566ad5 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetFeaturesInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetFeaturesInputMessageFactoryTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.impl.serialization.factories; import io.netty.buffer.ByteBuf; @@ -27,8 +26,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 * @author michal.polkorab */ public class GetFeaturesInputMessageFactoryTest { - private static final byte FEATURES_REQUEST_MESSAGE_CODE_TYPE = 5; + private SerializerRegistry registry; private OFSerializer featuresFactory; @@ -40,7 +39,7 @@ public class GetFeaturesInputMessageFactoryTest { registry = new SerializerRegistryImpl(); registry.init(); featuresFactory = registry.getSerializer( - new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, GetFeaturesInput.class)); + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, GetFeaturesInput.class)); } /** diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetFeaturesOutputFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetFeaturesOutputFactoryTest.java index 65953bfb8a..8f9cdfc5f8 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetFeaturesOutputFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetFeaturesOutputFactoryTest.java @@ -35,7 +35,7 @@ public class GetFeaturesOutputFactoryTest { SerializerRegistry registry = new SerializerRegistryImpl(); registry.init(); factory = registry - .getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, GetFeaturesOutput.class)); + .getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, GetFeaturesOutput.class)); } @Test @@ -65,7 +65,7 @@ public class GetFeaturesOutputFactoryTest { Assert.assertEquals("Wrong reserved", message.getReserved().longValue(), serializedBuffer.readInt()); } - private static Capabilities createCapabilities(int input) { + private static Capabilities createCapabilities(final int input) { final Boolean one = (input & 1 << 0) > 0; final Boolean two = (input & 1 << 1) > 0; final Boolean three = (input & 1 << 2) > 0; diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetQueueConfigInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetQueueConfigInputMessageFactoryTest.java index 3e79f637f9..f4b7640f77 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetQueueConfigInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetQueueConfigInputMessageFactoryTest.java @@ -43,7 +43,7 @@ public class GetQueueConfigInputMessageFactoryTest { registry = new SerializerRegistryImpl(); registry.init(); getQueueFactory = registry.getSerializer( - new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, GetQueueConfigInput.class)); + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, GetQueueConfigInput.class)); } /** diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetaAsyncRequestMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetaAsyncRequestMessageFactoryTest.java index 2d11e0e895..b14306f2d8 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetaAsyncRequestMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetaAsyncRequestMessageFactoryTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.impl.serialization.factories; import io.netty.buffer.ByteBuf; @@ -41,7 +40,7 @@ public class GetaAsyncRequestMessageFactoryTest { registry = new SerializerRegistryImpl(); registry.init(); getAsyncFactory = registry.getSerializer( - new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, GetAsyncInput.class)); + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, GetAsyncInput.class)); } /** diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/HelloInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/HelloInputMessageFactoryTest.java index d9ff203947..1a5b2ed4aa 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/HelloInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/HelloInputMessageFactoryTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.impl.serialization.factories; import io.netty.buffer.ByteBuf; @@ -36,8 +35,8 @@ import org.slf4j.LoggerFactory; * @author michal.polkorab */ public class HelloInputMessageFactoryTest { - private static final Logger LOG = LoggerFactory.getLogger(HelloInputMessageFactoryTest.class); + private SerializerRegistry registry; private OFSerializer helloFactory; @@ -49,7 +48,7 @@ public class HelloInputMessageFactoryTest { registry = new SerializerRegistryImpl(); registry.init(); helloFactory = registry.getSerializer( - new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, HelloInput.class)); + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, HelloInput.class)); } /** @@ -119,7 +118,7 @@ public class HelloInputMessageFactoryTest { element.getVersionBitmap().toArray()); } - private static List createElement(int lengthOfBitmap) { + private static List createElement(final int lengthOfBitmap) { ElementsBuilder elementsBuilder = new ElementsBuilder(); final List elementsList = new ArrayList<>(); List booleanList = new ArrayList<>(); @@ -132,7 +131,7 @@ public class HelloInputMessageFactoryTest { return elementsList; } - private static List createComparationElement(int lengthOfBitmap) { + private static List createComparationElement(final int lengthOfBitmap) { final ElementsBuilder elementsBuilder = new ElementsBuilder(); final List elementsList = new ArrayList<>(); List booleanList = new ArrayList<>(); @@ -151,7 +150,7 @@ public class HelloInputMessageFactoryTest { return elementsList; } - private static List readElement(ByteBuf input) { + private static List readElement(final ByteBuf input) { List elementsList = new ArrayList<>(); while (input.readableBytes() > 0) { ElementsBuilder elementsBuilder = new ElementsBuilder(); @@ -174,7 +173,7 @@ public class HelloInputMessageFactoryTest { return elementsList; } - private static List readVersionBitmap(int[] input) { + private static List readVersionBitmap(final int[] input) { List versionBitmapList = new ArrayList<>(); for (int mask : input) { for (int j = 0; j < Integer.SIZE; j++) { diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/HelloMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/HelloMessageFactoryTest.java index 2b507baafd..e40768a47d 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/HelloMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/HelloMessageFactoryTest.java @@ -33,7 +33,7 @@ public class HelloMessageFactoryTest { public void startUp() { SerializerRegistry registry = new SerializerRegistryImpl(); registry.init(); - factory = registry.getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, HelloMessage.class)); + factory = registry.getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, HelloMessage.class)); } @Test @@ -46,5 +46,4 @@ public class HelloMessageFactoryTest { factory.serialize(message, serializedBuffer); BufferHelper.checkHeaderV13(serializedBuffer, MESSAGE_TYPE, 8); } - } diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MeterModInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MeterModInputMessageFactoryTest.java index 6b520c6f28..0bcf641a95 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MeterModInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MeterModInputMessageFactoryTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.impl.serialization.factories; import io.netty.buffer.ByteBuf; @@ -55,7 +54,7 @@ public class MeterModInputMessageFactoryTest { registry = new SerializerRegistryImpl(); registry.init(); meterModFactory = registry.getSerializer( - new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, MeterModInput.class)); + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, MeterModInput.class)); } /** @@ -82,7 +81,7 @@ public class MeterModInputMessageFactoryTest { } @SuppressWarnings("checkstyle:AbbreviationAsWordInName") - private static MeterFlags decodeMeterModFlags(short input) { + private static MeterFlags decodeMeterModFlags(final short input) { final Boolean _oFPMFKBPS = (input & 1 << 0) > 0; final Boolean _oFPMFPKTPS = (input & 1 << 1) > 0; final Boolean _oFPMFBURST = (input & 1 << 2) > 0; @@ -111,7 +110,7 @@ public class MeterModInputMessageFactoryTest { return bandsList; } - private static List decodeBandsList(ByteBuf input) { + private static List decodeBandsList(final ByteBuf input) { final List bandsList = new ArrayList<>(); final BandsBuilder bandsBuilder = new BandsBuilder(); final MeterBandDropCaseBuilder dropCaseBuilder = new MeterBandDropCaseBuilder(); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MultipartReplyMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MultipartReplyMessageFactoryTest.java index 577b757bab..18da871bd1 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MultipartReplyMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MultipartReplyMessageFactoryTest.java @@ -27,7 +27,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.InstructionRelatedTableFeaturePropertyBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.NextTableRelatedTableFeaturePropertyBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.OxmRelatedTableFeaturePropertyBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.table.features.properties.container.table.feature.properties.NextTableIdsBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.next.table.related.table.feature.property.NextTableIdsBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.OutputActionCaseBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.PopPbbCaseBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.PushVlanCaseBuilder; @@ -192,7 +192,7 @@ public class MultipartReplyMessageFactoryTest { SerializerRegistry registry = new SerializerRegistryImpl(); registry.init(); factory = registry - .getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, MultipartReplyMessage.class)); + .getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, MultipartReplyMessage.class)); } @Test @@ -925,7 +925,7 @@ public class MultipartReplyMessageFactoryTest { Assert.assertEquals("Wrong desc body", message.getMultipartReplyBody(), decodeDescBody(serializedBuffer)); } - private static void testFlowBody(MultipartReplyBody body, ByteBuf output) { + private static void testFlowBody(final MultipartReplyBody body, final ByteBuf output) { MultipartReplyFlowCase flowCase = (MultipartReplyFlowCase) body; MultipartReplyFlow flow = flowCase.getMultipartReplyFlow(); FlowStats flowStats = flow.getFlowStats().get(0); @@ -1024,7 +1024,7 @@ public class MultipartReplyMessageFactoryTest { return list; } - private static PortConfig createPortConfig(long input) { + private static PortConfig createPortConfig(final long input) { final Boolean _portDown = (input & 1 << 0) > 0; final Boolean _noRecv = (input & 1 << 2) > 0; final Boolean _noFwd = (input & 1 << 5) > 0; @@ -1032,7 +1032,7 @@ public class MultipartReplyMessageFactoryTest { return new PortConfig(_noFwd, _noPacketIn, _noRecv, _portDown); } - private static PortFeatures createPortFeatures(long input) { + private static PortFeatures createPortFeatures(final long input) { final Boolean _10mbHd = (input & 1 << 0) > 0; final Boolean _10mbFd = (input & 1 << 1) > 0; final Boolean _100mbHd = (input & 1 << 2) > 0; @@ -1053,14 +1053,14 @@ public class MultipartReplyMessageFactoryTest { _40gbFd, _autoneg, _copper, _fiber, _other, _pause, _pauseAsym); } - private static PortState createPortState(long input) { + private static PortState createPortState(final long input) { final Boolean one = (input & 1 << 0) > 0; final Boolean two = (input & 1 << 1) > 0; final Boolean three = (input & 1 << 2) > 0; return new PortState(two, one, three); } - private static List decodeBandsList(ByteBuf input) { + private static List decodeBandsList(final ByteBuf input) { final List bandsList = new ArrayList<>(); final BandsBuilder bandsBuilder = new BandsBuilder(); final MeterBandDropCaseBuilder dropCaseBuilder = new MeterBandDropCaseBuilder(); @@ -1093,7 +1093,7 @@ public class MultipartReplyMessageFactoryTest { return list; } - private static MeterBandTypeBitmap createMeterBandTypeBitmap(int input) { + private static MeterBandTypeBitmap createMeterBandTypeBitmap(final int input) { final Boolean one = (input & 1 << 0) > 0; final Boolean two = (input & 1 << 1) > 0; return new MeterBandTypeBitmap(one, two); @@ -1120,7 +1120,7 @@ public class MultipartReplyMessageFactoryTest { return bandsList; } - private static MeterFlags createMeterFlags(int input) { + private static MeterFlags createMeterFlags(final int input) { final Boolean one = (input & 1 << 0) > 0; final Boolean two = (input & 1 << 1) > 0; final Boolean three = (input & 1 << 2) > 0; @@ -1151,7 +1151,7 @@ public class MultipartReplyMessageFactoryTest { return list; } - private static ActionType createActionType(int input) { + private static ActionType createActionType(final int input) { final Boolean one = (input & 1 << 0) > 0; final Boolean two = (input & 1 << 1) > 0; final Boolean three = (input & 1 << 2) > 0; @@ -1191,7 +1191,7 @@ public class MultipartReplyMessageFactoryTest { } - private static GroupCapabilities createGroupCapabilities(int input) { + private static GroupCapabilities createGroupCapabilities(final int input) { final Boolean one = (input & 1 << 0) > 0; final Boolean two = (input & 1 << 1) > 0; final Boolean three = (input & 1 << 2) > 0; @@ -1199,7 +1199,7 @@ public class MultipartReplyMessageFactoryTest { return new GroupCapabilities(three, four, two, one); } - private static GroupTypes createGroupTypes(int input) { + private static GroupTypes createGroupTypes(final int input) { final Boolean one = (input & 1 << 0) > 0; final Boolean two = (input & 1 << 1) > 0; final Boolean three = (input & 1 << 2) > 0; @@ -1432,12 +1432,12 @@ public class MultipartReplyMessageFactoryTest { return list; } - private static MultipartRequestFlags createMultipartRequestFlags(int input) { + private static MultipartRequestFlags createMultipartRequestFlags(final int input) { final Boolean one = (input & 1 << 0) > 0; return new MultipartRequestFlags(one); } - private static MultipartReplyDescCase decodeDescBody(ByteBuf output) { + private static MultipartReplyDescCase decodeDescBody(final ByteBuf output) { final MultipartReplyDescCaseBuilder descCase = new MultipartReplyDescCaseBuilder(); MultipartReplyDescBuilder desc = new MultipartReplyDescBuilder(); byte[] mfrDesc = new byte[256]; diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MultipartRequestInputFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MultipartRequestInputFactoryTest.java index 0fc7bd6394..50a03cfd8f 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MultipartRequestInputFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MultipartRequestInputFactoryTest.java @@ -81,7 +81,7 @@ public class MultipartRequestInputFactoryTest { registry = new SerializerRegistryImpl(); registry.init(); multipartFactory = registry.getSerializer( - new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, MultipartRequestInput.class)); + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, MultipartRequestInput.class)); } /** @@ -119,7 +119,7 @@ public class MultipartRequestInputFactoryTest { return caseBuilder.build(); } - private static MultipartRequestFlowCase decodeRequestFlow(ByteBuf output) { + private static MultipartRequestFlowCase decodeRequestFlow(final ByteBuf output) { final MultipartRequestFlowCaseBuilder caseBuilder = new MultipartRequestFlowCaseBuilder(); MultipartRequestFlowBuilder builder = new MultipartRequestFlowBuilder(); builder.setTableId(Uint8.fromByteBits(output.readByte())); @@ -156,7 +156,7 @@ public class MultipartRequestInputFactoryTest { } @SuppressWarnings("checkstyle:AbbreviationAsWordInName") - private static MultipartRequestFlags decodeMultipartRequestFlags(short input) { + private static MultipartRequestFlags decodeMultipartRequestFlags(final short input) { final Boolean _oFPMPFREQMORE = (input & 1 << 0) > 0; return new MultipartRequestFlags(_oFPMPFREQMORE); } @@ -175,7 +175,7 @@ public class MultipartRequestInputFactoryTest { return caseBuilder.build(); } - private static MultipartRequestAggregateCase decodeRequestAggregate(ByteBuf output) { + private static MultipartRequestAggregateCase decodeRequestAggregate(final ByteBuf output) { final MultipartRequestAggregateCaseBuilder caseBuilder = new MultipartRequestAggregateCaseBuilder(); MultipartRequestAggregateBuilder builder = new MultipartRequestAggregateBuilder(); builder.setTableId(Uint8.fromByteBits(output.readByte())); @@ -240,7 +240,7 @@ public class MultipartRequestInputFactoryTest { return caseBuilder.build(); } - private static MultipartRequestPortStatsCase decodeRequestPortStats(ByteBuf output) { + private static MultipartRequestPortStatsCase decodeRequestPortStats(final ByteBuf output) { MultipartRequestPortStatsCaseBuilder caseBuilder = new MultipartRequestPortStatsCaseBuilder(); MultipartRequestPortStatsBuilder builder = new MultipartRequestPortStatsBuilder(); builder.setPortNo(Uint32.fromIntBits(output.readInt())); @@ -280,7 +280,7 @@ public class MultipartRequestInputFactoryTest { return caseBuilder.build(); } - private static MultipartRequestQueueCase decodeRequestQueue(ByteBuf output) { + private static MultipartRequestQueueCase decodeRequestQueue(final ByteBuf output) { MultipartRequestQueueCaseBuilder caseBuilder = new MultipartRequestQueueCaseBuilder(); MultipartRequestQueueBuilder builder = new MultipartRequestQueueBuilder(); builder.setPortNo(Uint32.fromIntBits(output.readInt())); @@ -319,7 +319,7 @@ public class MultipartRequestInputFactoryTest { return caseBuilder.build(); } - private static MultipartRequestGroupCase decodeRequestGroup(ByteBuf output) { + private static MultipartRequestGroupCase decodeRequestGroup(final ByteBuf output) { MultipartRequestGroupCaseBuilder caseBuilder = new MultipartRequestGroupCaseBuilder(); MultipartRequestGroupBuilder builder = new MultipartRequestGroupBuilder(); builder.setGroupId(new GroupId(Uint32.fromIntBits(output.readInt()))); @@ -358,7 +358,7 @@ public class MultipartRequestInputFactoryTest { return caseBuilder.build(); } - private static MultipartRequestMeterCase decodeRequestMeter(ByteBuf output) { + private static MultipartRequestMeterCase decodeRequestMeter(final ByteBuf output) { MultipartRequestMeterCaseBuilder caseBuilder = new MultipartRequestMeterCaseBuilder(); MultipartRequestMeterBuilder builder = new MultipartRequestMeterBuilder(); builder.setMeterId(new MeterId(Uint32.fromIntBits(output.readInt()))); @@ -397,7 +397,7 @@ public class MultipartRequestInputFactoryTest { return caseBuilder.build(); } - private static MultipartRequestMeterConfigCase decodeRequestMeterConfig(ByteBuf output) { + private static MultipartRequestMeterConfigCase decodeRequestMeterConfig(final ByteBuf output) { MultipartRequestMeterConfigCaseBuilder caseBuilder = new MultipartRequestMeterConfigCaseBuilder(); MultipartRequestMeterConfigBuilder builder = new MultipartRequestMeterConfigBuilder(); builder.setMeterId(new MeterId(Uint32.fromIntBits(output.readInt()))); @@ -432,5 +432,4 @@ public class MultipartRequestInputFactoryTest { caseBuilder.setMultipartRequestDesc(builder.build()); return caseBuilder.build(); } - } diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10BarrierInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10BarrierInputMessageFactoryTest.java index 95da585afa..8e69c94fb4 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10BarrierInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10BarrierInputMessageFactoryTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.impl.serialization.factories; import io.netty.buffer.ByteBuf; @@ -39,7 +38,7 @@ public class OF10BarrierInputMessageFactoryTest { registry = new SerializerRegistryImpl(); registry.init(); barrierFactory = registry.getSerializer( - new MessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, BarrierInput.class)); + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_0, BarrierInput.class)); } /** @@ -56,5 +55,4 @@ public class OF10BarrierInputMessageFactoryTest { BufferHelper.checkHeaderV10(out, (byte) 18, 8); } - } diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10BarrierReplyMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10BarrierReplyMessageFactoryTest.java index 3b3817d126..4dfa103659 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10BarrierReplyMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10BarrierReplyMessageFactoryTest.java @@ -33,7 +33,7 @@ public class OF10BarrierReplyMessageFactoryTest { public void startUp() { SerializerRegistry registry = new SerializerRegistryImpl(); registry.init(); - factory = registry.getSerializer(new MessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, BarrierOutput.class)); + factory = registry.getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_0, BarrierOutput.class)); } @Test diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10FeaturesReplyMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10FeaturesReplyMessageFactoryTest.java index 31c9e2df08..e0437435d1 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10FeaturesReplyMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10FeaturesReplyMessageFactoryTest.java @@ -49,7 +49,7 @@ public class OF10FeaturesReplyMessageFactoryTest { SerializerRegistry registry = new SerializerRegistryImpl(); registry.init(); factory = registry - .getSerializer(new MessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, GetFeaturesOutput.class)); + .getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_0, GetFeaturesOutput.class)); } @Test @@ -116,7 +116,7 @@ public class OF10FeaturesReplyMessageFactoryTest { return ports; } - private static PortConfigV10 createPortConfig(long input) { + private static PortConfigV10 createPortConfig(final long input) { final Boolean _portDown = (input & 1 << 0) > 0; final Boolean _noStp = (input & 1 << 1) > 0; final Boolean _noRecv = (input & 1 << 2) > 0; @@ -127,7 +127,7 @@ public class OF10FeaturesReplyMessageFactoryTest { return new PortConfigV10(_noFlood, _noFwd, _noPacketIn, _noRecv, _noRecvStp, _noStp, _portDown); } - private static PortFeaturesV10 createPortFeatures(long input) { + private static PortFeaturesV10 createPortFeatures(final long input) { final Boolean _10mbHd = (input & 1 << 0) > 0; final Boolean _10mbFd = (input & 1 << 1) > 0; final Boolean _100mbHd = (input & 1 << 2) > 0; @@ -144,7 +144,7 @@ public class OF10FeaturesReplyMessageFactoryTest { _fiber, _pause, _pauseAsym); } - private static PortStateV10 createPortState(long input) { + private static PortStateV10 createPortState(final long input) { final Boolean _linkDown = (input & 1 << 0) > 0; final Boolean _blocked = (input & 1 << 1) > 0; final Boolean _live = (input & 1 << 2) > 0; @@ -157,7 +157,7 @@ public class OF10FeaturesReplyMessageFactoryTest { } @SuppressWarnings("checkstyle:AbbreviationAsWordInName") - private static CapabilitiesV10 createCapabilities(long input) { + private static CapabilitiesV10 createCapabilities(final long input) { final Boolean _oFPCFLOWSTATS = (input & 1 << 0) > 0; final Boolean _oFPCTABLESTATS = (input & 1 << 1) > 0; final Boolean _oFPCPORTSTATS = (input & 1 << 2) > 0; @@ -171,7 +171,7 @@ public class OF10FeaturesReplyMessageFactoryTest { } @SuppressWarnings("checkstyle:AbbreviationAsWordInName") - private static ActionTypeV10 createActionsV10(long input) { + private static ActionTypeV10 createActionsV10(final long input) { final Boolean _oFPATOUTPUT = (input & 1 << 0) > 0; final Boolean _oFPATSETVLANVID = (input & 1 << 1) > 0; final Boolean _oFPATSETVLANPCP = (input & 1 << 2) > 0; @@ -188,6 +188,5 @@ public class OF10FeaturesReplyMessageFactoryTest { return new ActionTypeV10(_oFPATENQUEUE, _oFPATOUTPUT, _oFPATSETDLDST, _oFPATSETDLSRC, _oFPATSETNWDST, _oFPATSETNWSRC, _oFPATSETNWTOS, _oFPATSETTPDST, _oFPATSETTPSRC, _oFPATSETVLANPCP, _oFPATSETVLANVID, _oFPATSTRIPVLAN, _oFPATVENDOR); - } } diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10FlowModInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10FlowModInputMessageFactoryTest.java index 370e891d3d..b813bda42b 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10FlowModInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10FlowModInputMessageFactoryTest.java @@ -59,7 +59,7 @@ public class OF10FlowModInputMessageFactoryTest { registry = new SerializerRegistryImpl(); registry.init(); flowModFactory = registry.getSerializer( - new MessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, FlowModInput.class)); + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_0, FlowModInput.class)); } /** @@ -154,5 +154,4 @@ public class OF10FlowModInputMessageFactoryTest { Assert.assertEquals("Wrong flags", 42, out.readUnsignedShort()); out.skipBytes(2); } - } diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10FlowRemovedMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10FlowRemovedMessageFactoryTest.java index 1871c7ddd4..08ced33c01 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10FlowRemovedMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10FlowRemovedMessageFactoryTest.java @@ -45,7 +45,7 @@ public class OF10FlowRemovedMessageFactoryTest { SerializerRegistry registry = new SerializerRegistryImpl(); registry.init(); factory = registry - .getSerializer(new MessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, FlowRemovedMessage.class)); + .getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_0, FlowRemovedMessage.class)); } @Test diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10HelloInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10HelloInputMessageFactoryTest.java index c5ef3fef2a..481ad375fe 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10HelloInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10HelloInputMessageFactoryTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.impl.serialization.factories; import io.netty.buffer.ByteBuf; @@ -39,7 +38,7 @@ public class OF10HelloInputMessageFactoryTest { registry = new SerializerRegistryImpl(); registry.init(); helloFactory = registry.getSerializer( - new MessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, HelloInput.class)); + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_0, HelloInput.class)); } /** @@ -56,5 +55,4 @@ public class OF10HelloInputMessageFactoryTest { BufferHelper.checkHeaderV10(out, (byte) 0, 8); } - } diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10PacketInMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10PacketInMessageFactoryTest.java index f85c77a094..166a104dea 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10PacketInMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10PacketInMessageFactoryTest.java @@ -38,7 +38,7 @@ public class OF10PacketInMessageFactoryTest { public void startUp() { SerializerRegistry registry = new SerializerRegistryImpl(); registry.init(); - factory = registry.getSerializer(new MessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, PacketInMessage.class)); + factory = registry.getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_0, PacketInMessage.class)); } @Test diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10PacketOutInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10PacketOutInputMessageFactoryTest.java index e4fd66fd05..418945ff06 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10PacketOutInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10PacketOutInputMessageFactoryTest.java @@ -50,7 +50,7 @@ public class OF10PacketOutInputMessageFactoryTest { registry = new SerializerRegistryImpl(); registry.init(); packetOutFactory = registry.getSerializer( - new MessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, PacketOutInput.class)); + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_0, PacketOutInput.class)); } /** diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10PortModInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10PortModInputMessageFactoryTest.java index e233bde49a..71733cf712 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10PortModInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10PortModInputMessageFactoryTest.java @@ -45,7 +45,7 @@ public class OF10PortModInputMessageFactoryTest { registry = new SerializerRegistryImpl(); registry.init(); portModFactory = registry.getSerializer( - new MessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, PortModInput.class)); + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_0, PortModInput.class)); } /** diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10PortStatusMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10PortStatusMessageFactoryTest.java index b3add82153..ad2510373a 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10PortStatusMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10PortStatusMessageFactoryTest.java @@ -42,7 +42,7 @@ public class OF10PortStatusMessageFactoryTest { SerializerRegistry registry = new SerializerRegistryImpl(); registry.init(); factory = registry - .getSerializer(new MessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, PortStatusMessage.class)); + .getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_0, PortStatusMessage.class)); } @Test @@ -89,7 +89,7 @@ public class OF10PortStatusMessageFactoryTest { Assert.assertEquals("Wrong peer", message.getPeerFeaturesV10(), createPortFeatures(serializedBuffer.readInt())); } - private static PortConfigV10 createPortConfig(long input) { + private static PortConfigV10 createPortConfig(final long input) { final Boolean _portDown = (input & 1 << 0) > 0; final Boolean _noStp = (input & 1 << 1) > 0; final Boolean _noRecv = (input & 1 << 2) > 0; @@ -100,7 +100,7 @@ public class OF10PortStatusMessageFactoryTest { return new PortConfigV10(_noFlood, _noFwd, _noPacketIn, _noRecv, _noRecvStp, _noStp, _portDown); } - private static PortFeaturesV10 createPortFeatures(long input) { + private static PortFeaturesV10 createPortFeatures(final long input) { final Boolean _10mbHd = (input & 1 << 0) > 0; final Boolean _10mbFd = (input & 1 << 1) > 0; final Boolean _100mbHd = (input & 1 << 2) > 0; @@ -117,7 +117,7 @@ public class OF10PortStatusMessageFactoryTest { _fiber, _pause, _pauseAsym); } - private static PortStateV10 createPortState(long input) { + private static PortStateV10 createPortState(final long input) { final Boolean _linkDown = (input & 1 << 0) > 0; final Boolean _blocked = (input & 1 << 1) > 0; final Boolean _live = (input & 1 << 2) > 0; diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10QueueGetConfigInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10QueueGetConfigInputMessageFactoryTest.java index 5951c0068a..8fe38a7547 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10QueueGetConfigInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10QueueGetConfigInputMessageFactoryTest.java @@ -41,7 +41,7 @@ public class OF10QueueGetConfigInputMessageFactoryTest { registry = new SerializerRegistryImpl(); registry.init(); queueFactory = registry.getSerializer( - new MessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, GetQueueConfigInput.class)); + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_0, GetQueueConfigInput.class)); } /** @@ -61,5 +61,4 @@ public class OF10QueueGetConfigInputMessageFactoryTest { Assert.assertEquals("Wrong port", 6653L, out.readUnsignedShort()); out.skipBytes(2); } - } diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10QueueGetConfigReplyMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10QueueGetConfigReplyMessageFactoryTest.java index f849802b45..bd43a537db 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10QueueGetConfigReplyMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10QueueGetConfigReplyMessageFactoryTest.java @@ -48,7 +48,7 @@ public class OF10QueueGetConfigReplyMessageFactoryTest { SerializerRegistry registry = new SerializerRegistryImpl(); registry.init(); factory = registry - .getSerializer(new MessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, GetQueueConfigOutput.class)); + .getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_0, GetQueueConfigOutput.class)); } @Test diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10StatsReplyMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10StatsReplyMessageFactoryTest.java index 2aca9e95d4..a3bfc8d833 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10StatsReplyMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10StatsReplyMessageFactoryTest.java @@ -78,7 +78,7 @@ public class OF10StatsReplyMessageFactoryTest { SerializerRegistry registry = new SerializerRegistryImpl(); registry.init(); factory = registry - .getSerializer(new MessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, MultipartReplyMessage.class)); + .getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_0, MultipartReplyMessage.class)); } @Test @@ -388,12 +388,12 @@ public class OF10StatsReplyMessageFactoryTest { return list; } - private static MultipartRequestFlags createMultipartRequestFlags(int input) { + private static MultipartRequestFlags createMultipartRequestFlags(final int input) { final Boolean one = (input & 1 << 0) > 0; return new MultipartRequestFlags(one); } - private static MultipartReplyDescCase decodeDescBody(ByteBuf output) { + private static MultipartReplyDescCase decodeDescBody(final ByteBuf output) { final MultipartReplyDescCaseBuilder descCase = new MultipartReplyDescCaseBuilder(); MultipartReplyDescBuilder desc = new MultipartReplyDescBuilder(); byte[] mfrDesc = new byte[256]; diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10StatsRequestInputFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10StatsRequestInputFactoryTest.java index 3999fd8437..6b077460d5 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10StatsRequestInputFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10StatsRequestInputFactoryTest.java @@ -58,7 +58,7 @@ public class OF10StatsRequestInputFactoryTest { registry = new SerializerRegistryImpl(); registry.init(); multipartFactory = registry.getSerializer( - new MessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, MultipartRequestInput.class)); + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_0, MultipartRequestInput.class)); } /** diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/PacketInMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/PacketInMessageFactoryTest.java index 296c1f3e1b..f8138ada15 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/PacketInMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/PacketInMessageFactoryTest.java @@ -57,7 +57,7 @@ public class PacketInMessageFactoryTest { public void startUp() { SerializerRegistry registry = new SerializerRegistryImpl(); registry.init(); - factory = registry.getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, PacketInMessage.class)); + factory = registry.getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, PacketInMessage.class)); } @Test diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/PacketOutInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/PacketOutInputMessageFactoryTest.java index 604ba23159..32f31238cf 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/PacketOutInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/PacketOutInputMessageFactoryTest.java @@ -53,7 +53,7 @@ public class PacketOutInputMessageFactoryTest { registry = new SerializerRegistryImpl(); registry.init(); packetOutFactory = registry.getSerializer( - new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, PacketOutInput.class)); + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, PacketOutInput.class)); } /** diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/PortModInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/PortModInputMessageFactoryTest.java index 3d42361c5d..1ffdc35416 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/PortModInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/PortModInputMessageFactoryTest.java @@ -50,7 +50,7 @@ public class PortModInputMessageFactoryTest { registry = new SerializerRegistryImpl(); registry.init(); portModFactory = registry.getSerializer( - new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, PortModInput.class)); + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, PortModInput.class)); } /** @@ -97,7 +97,7 @@ public class PortModInputMessageFactoryTest { out.skipBytes(PADDING_IN_PORT_MOD_MESSAGE_03); } - private static PortConfig createPortConfig(long input) { + private static PortConfig createPortConfig(final long input) { final Boolean _portDown = (input & 1 << 0) > 0; final Boolean _noRecv = (input & 1 << 2) > 0; final Boolean _noFwd = (input & 1 << 5) > 0; @@ -105,7 +105,7 @@ public class PortModInputMessageFactoryTest { return new PortConfig(_noFwd, _noPacketIn, _noRecv, _portDown); } - private static PortFeatures createPortFeatures(long input) { + private static PortFeatures createPortFeatures(final long input) { final Boolean _10mbHd = (input & 1 << 0) > 0; final Boolean _10mbFd = (input & 1 << 1) > 0; final Boolean _100mbHd = (input & 1 << 2) > 0; @@ -125,5 +125,4 @@ public class PortModInputMessageFactoryTest { return new PortFeatures(_100gbFd, _100mbFd, _100mbHd, _10gbFd, _10mbFd, _10mbHd, _1gbFd, _1gbHd, _1tbFd, _40gbFd, _autoneg, _copper, _fiber, _other, _pause, _pauseAsym); } - } diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/PortStatusMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/PortStatusMessageFactoryTest.java index 0366b25646..13305df7d0 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/PortStatusMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/PortStatusMessageFactoryTest.java @@ -45,7 +45,7 @@ public class PortStatusMessageFactoryTest { SerializerRegistry registry = new SerializerRegistryImpl(); registry.init(); factory = registry - .getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, PortStatusMessage.class)); + .getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, PortStatusMessage.class)); } @Test @@ -98,7 +98,7 @@ public class PortStatusMessageFactoryTest { Assert.assertEquals("Wrong Max speed", message.getMaxSpeed().longValue(), serializedBuffer.readInt()); } - private static PortConfig createPortConfig(long input) { + private static PortConfig createPortConfig(final long input) { final Boolean _portDown = (input & 1 << 0) > 0; final Boolean _noRecv = (input & 1 << 2) > 0; final Boolean _noFwd = (input & 1 << 5) > 0; @@ -106,7 +106,7 @@ public class PortStatusMessageFactoryTest { return new PortConfig(_noFwd, _noPacketIn, _noRecv, _portDown); } - private static PortFeatures createPortFeatures(long input) { + private static PortFeatures createPortFeatures(final long input) { final Boolean _10mbHd = (input & 1 << 0) > 0; final Boolean _10mbFd = (input & 1 << 1) > 0; final Boolean _100mbHd = (input & 1 << 2) > 0; @@ -127,7 +127,7 @@ public class PortStatusMessageFactoryTest { _40gbFd, _autoneg, _copper, _fiber, _other, _pause, _pauseAsym); } - private static PortState createPortState(long input) { + private static PortState createPortState(final long input) { final Boolean one = (input & 1 << 0) > 0; final Boolean two = (input & 1 << 1) > 0; final Boolean three = (input & 1 << 2) > 0; diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/QueueGetConfigReplyMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/QueueGetConfigReplyMessageFactoryTest.java index f8c61673d9..5f02e2c200 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/QueueGetConfigReplyMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/QueueGetConfigReplyMessageFactoryTest.java @@ -52,7 +52,7 @@ public class QueueGetConfigReplyMessageFactoryTest { SerializerRegistry registry = new SerializerRegistryImpl(); registry.init(); factory = registry - .getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, GetQueueConfigOutput.class)); + .getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, GetQueueConfigOutput.class)); } @Test diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/RoleReplyMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/RoleReplyMessageFactoryTest.java index b66f310ee0..d424cbc5e3 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/RoleReplyMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/RoleReplyMessageFactoryTest.java @@ -39,7 +39,7 @@ public class RoleReplyMessageFactoryTest { SerializerRegistry registry = new SerializerRegistryImpl(); registry.init(); factory = registry - .getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, RoleRequestOutput.class)); + .getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, RoleRequestOutput.class)); } @Test diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/RoleRequestInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/RoleRequestInputMessageFactoryTest.java index dc35fe1447..39586d7bbd 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/RoleRequestInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/RoleRequestInputMessageFactoryTest.java @@ -45,7 +45,7 @@ public class RoleRequestInputMessageFactoryTest { registry = new SerializerRegistryImpl(); registry.init(); roleFactory = registry.getSerializer( - new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, RoleRequestInput.class)); + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, RoleRequestInput.class)); } /** diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/SetAsyncInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/SetAsyncInputMessageFactoryTest.java index eb5f94d72c..6046460585 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/SetAsyncInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/SetAsyncInputMessageFactoryTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.impl.serialization.factories; import io.netty.buffer.ByteBuf; @@ -52,7 +51,7 @@ public class SetAsyncInputMessageFactoryTest { registry = new SerializerRegistryImpl(); registry.init(); setAsyncFactory = registry.getSerializer( - new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, SetAsyncInput.class)); + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, SetAsyncInput.class)); } /** diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/SetConfigMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/SetConfigMessageFactoryTest.java index 9baef394cd..aac8a95e87 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/SetConfigMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/SetConfigMessageFactoryTest.java @@ -43,7 +43,7 @@ public class SetConfigMessageFactoryTest { registry = new SerializerRegistryImpl(); registry.init(); setConfigFactory = registry.getSerializer( - new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, SetConfigInput.class)); + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, SetConfigInput.class)); } /** diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/TableModInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/TableModInputMessageFactoryTest.java index 1fa9fb19b7..7cf8df8b28 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/TableModInputMessageFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/TableModInputMessageFactoryTest.java @@ -44,7 +44,7 @@ public class TableModInputMessageFactoryTest { registry = new SerializerRegistryImpl(); registry.init(); tableModFactory = registry.getSerializer( - new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, TableModInput.class)); + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, TableModInput.class)); } /** diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestGroupDescTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestGroupDescTest.java index ee65bd3ec2..b43359c06c 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestGroupDescTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestGroupDescTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.impl.serialization.factories.multipart; import io.netty.buffer.ByteBuf; @@ -46,7 +45,7 @@ public class MultipartRequestGroupDescTest { registry = new SerializerRegistryImpl(); registry.init(); multipartFactory = registry.getSerializer( - new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, MultipartRequestInput.class)); + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, MultipartRequestInput.class)); } /** diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestGroupFeaturesTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestGroupFeaturesTest.java index fc21ff455e..f7ae42eb97 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestGroupFeaturesTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestGroupFeaturesTest.java @@ -45,7 +45,7 @@ public class MultipartRequestGroupFeaturesTest { registry = new SerializerRegistryImpl(); registry.init(); multipartFactory = registry.getSerializer( - new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, MultipartRequestInput.class)); + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, MultipartRequestInput.class)); } /** diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestMeterFeaturesTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestMeterFeaturesTest.java index e71f7aff9a..0088798884 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestMeterFeaturesTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestMeterFeaturesTest.java @@ -45,7 +45,7 @@ public class MultipartRequestMeterFeaturesTest { registry = new SerializerRegistryImpl(); registry.init(); multipartFactory = registry.getSerializer( - new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, MultipartRequestInput.class)); + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, MultipartRequestInput.class)); } /** diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestPortDescTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestPortDescTest.java index 86ffee7de8..bb1cf33f53 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestPortDescTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestPortDescTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.impl.serialization.factories.multipart; import io.netty.buffer.ByteBuf; @@ -46,7 +45,7 @@ public class MultipartRequestPortDescTest { registry = new SerializerRegistryImpl(); registry.init(); multipartFactory = registry.getSerializer( - new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, MultipartRequestInput.class)); + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, MultipartRequestInput.class)); } /** diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestTableFeaturesTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestTableFeaturesTest.java index f5948e38f1..50ff8b3ae8 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestTableFeaturesTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestTableFeaturesTest.java @@ -34,8 +34,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.InstructionRelatedTableFeaturePropertyBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.NextTableRelatedTableFeaturePropertyBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.OxmRelatedTableFeaturePropertyBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.table.features.properties.container.table.feature.properties.NextTableIds; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.table.features.properties.container.table.feature.properties.NextTableIdsBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.next.table.related.table.feature.property.NextTableIds; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.next.table.related.table.feature.property.NextTableIdsBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.OutputActionCaseBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder; @@ -96,7 +96,7 @@ public class MultipartRequestTableFeaturesTest { registry = new SerializerRegistryImpl(); registry.init(); multipartFactory = registry.getSerializer( - new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, MultipartRequestInput.class)); + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, MultipartRequestInput.class)); } /** diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestTableTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestTableTest.java index 5f153e7f87..34ee0991a1 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestTableTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestTableTest.java @@ -45,7 +45,7 @@ public class MultipartRequestTableTest { registry = new SerializerRegistryImpl(); registry.init(); multipartFactory = registry.getSerializer( - new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, MultipartRequestInput.class)); + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, MultipartRequestInput.class)); } /** diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/OF10StatsRequestAggregateTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/OF10StatsRequestAggregateTest.java index 6a4ad3c770..bf17d71e0c 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/OF10StatsRequestAggregateTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/OF10StatsRequestAggregateTest.java @@ -51,7 +51,7 @@ public class OF10StatsRequestAggregateTest { registry = new SerializerRegistryImpl(); registry.init(); statsFactory = registry.getSerializer( - new MessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, MultipartRequestInput.class)); + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_0, MultipartRequestInput.class)); } /** diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/ActionsDeserializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/ActionsDeserializerTest.java index 8c25f962a4..8efebfa4c9 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/ActionsDeserializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/ActionsDeserializerTest.java @@ -83,7 +83,7 @@ public class ActionsDeserializerTest { message.skipBytes(4); // skip XID LOG.info("bytes: {}", message.readableBytes()); - CodeKeyMaker keyMaker = CodeKeyMakerFactory.createActionsKeyMaker(EncodeConstants.OF13_VERSION_ID); + CodeKeyMaker keyMaker = CodeKeyMakerFactory.createActionsKeyMaker(EncodeConstants.OF_VERSION_1_3); List actions = ListDeserializer.deserializeList(EncodeConstants.OF13_VERSION_ID, message.readableBytes(), message, keyMaker, registry); Assert.assertTrue("Wrong action type", actions.get(0).getActionChoice() instanceof OutputActionCase); @@ -152,7 +152,7 @@ public class ActionsDeserializerTest { ByteBuf message = BufferHelper.buildBuffer("00 00 00 04 00 19 00 04"); message.skipBytes(4); // skip XID - CodeKeyMaker keyMaker = CodeKeyMakerFactory.createActionsKeyMaker(EncodeConstants.OF13_VERSION_ID); + CodeKeyMaker keyMaker = CodeKeyMakerFactory.createActionsKeyMaker(EncodeConstants.OF_VERSION_1_3); List actions = ListDeserializer.deserializeHeaders(EncodeConstants.OF13_VERSION_ID, message.readableBytes(), message, keyMaker, registry); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/BufferHelper.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/BufferHelper.java index 9358dfad62..a6858be4f2 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/BufferHelper.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/BufferHelper.java @@ -10,7 +10,6 @@ package org.opendaylight.openflowjava.protocol.impl.util; import io.netty.buffer.ByteBuf; import io.netty.buffer.UnpooledByteBufAllocator; import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; import org.junit.Assert; import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; @@ -134,10 +133,9 @@ public abstract class BufferHelper { */ public static void setupHeader(final Object builder, final int version) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException { - Method method = builder.getClass().getMethod("setVersion", Short.class); - method.invoke(builder, (short) version); - Method m2 = builder.getClass().getMethod("setXid", Uint32.class); - m2.invoke(builder, BufferHelper.DEFAULT_XID); + final Class builderClass = builder.getClass(); + builderClass.getMethod("setVersion", Uint8.class).invoke(builder, Uint8.valueOf(version)); + builderClass.getMethod("setXid", Uint32.class).invoke(builder, BufferHelper.DEFAULT_XID); } /** @@ -150,5 +148,4 @@ public abstract class BufferHelper { public static E deserialize(final OFDeserializer decoder, final ByteBuf bb) { return decoder.deserialize(bb); } - } diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/CodeKeyMakerFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/CodeKeyMakerFactoryTest.java index ad1eb9d8d8..841213ce63 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/CodeKeyMakerFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/CodeKeyMakerFactoryTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.impl.util; import io.netty.buffer.ByteBuf; @@ -30,7 +29,7 @@ public class CodeKeyMakerFactoryTest { */ @Test public void testMatchEntriesKeyMaker() { - CodeKeyMaker keyMaker = CodeKeyMakerFactory.createMatchEntriesKeyMaker(EncodeConstants.OF13_VERSION_ID); + CodeKeyMaker keyMaker = CodeKeyMakerFactory.createMatchEntriesKeyMaker(EncodeConstants.OF_VERSION_1_3); Assert.assertNotNull("Null key maker", keyMaker); ByteBuf buffer = BufferHelper.buildBuffer("80 00 00 04 00 00 00 01"); @@ -38,7 +37,7 @@ public class CodeKeyMakerFactoryTest { MessageCodeKey codeKey = keyMaker.make(buffer); Assert.assertNotNull("Null key", codeKey); - Assert.assertEquals("Wrong key", new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, + Assert.assertEquals("Wrong key", new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, 32768, 0), codeKey); Assert.assertEquals("Buffer index modified", 8, buffer.readableBytes()); } @@ -48,7 +47,7 @@ public class CodeKeyMakerFactoryTest { */ @Test public void testExperimenterMatchEntriesKeyMaker() { - CodeKeyMaker keyMaker = CodeKeyMakerFactory.createMatchEntriesKeyMaker(EncodeConstants.OF13_VERSION_ID); + CodeKeyMaker keyMaker = CodeKeyMakerFactory.createMatchEntriesKeyMaker(EncodeConstants.OF_VERSION_1_3); Assert.assertNotNull("Null key maker", keyMaker); ByteBuf buffer = BufferHelper.buildBuffer("FF FF 00 04 00 00 00 01"); @@ -57,7 +56,7 @@ public class CodeKeyMakerFactoryTest { Assert.assertNotNull("Null key", codeKey); MatchEntryDeserializerKey comparationKey = - new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, 65535, 0); + new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, 65535, 0); comparationKey.setExperimenterId(Uint32.ONE); Assert.assertEquals("Wrong key", comparationKey, codeKey); Assert.assertEquals("Buffer index modified", 8, buffer.readableBytes()); @@ -68,7 +67,7 @@ public class CodeKeyMakerFactoryTest { */ @Test public void testActionKeyMaker() { - CodeKeyMaker keyMaker = CodeKeyMakerFactory.createActionsKeyMaker(EncodeConstants.OF13_VERSION_ID); + CodeKeyMaker keyMaker = CodeKeyMakerFactory.createActionsKeyMaker(EncodeConstants.OF_VERSION_1_3); Assert.assertNotNull("Null key maker", keyMaker); ByteBuf buffer = BufferHelper.buildBuffer("00 00 00 10 00 00 00 01 00 02 00 00 00 00 00 00"); @@ -76,8 +75,7 @@ public class CodeKeyMakerFactoryTest { MessageCodeKey codeKey = keyMaker.make(buffer); Assert.assertNotNull("Null key", codeKey); - Assert.assertEquals("Wrong key", new ActionDeserializerKey(EncodeConstants.OF13_VERSION_ID, - 0, null), codeKey); + Assert.assertEquals("Wrong key", new ActionDeserializerKey(EncodeConstants.OF_VERSION_1_3, 0, null), codeKey); Assert.assertEquals("Buffer index modified", 16, buffer.readableBytes()); } @@ -86,7 +84,7 @@ public class CodeKeyMakerFactoryTest { */ @Test public void testExperimenterActionKeyMaker() { - CodeKeyMaker keyMaker = CodeKeyMakerFactory.createActionsKeyMaker(EncodeConstants.OF13_VERSION_ID); + CodeKeyMaker keyMaker = CodeKeyMakerFactory.createActionsKeyMaker(EncodeConstants.OF_VERSION_1_3); Assert.assertNotNull("Null key maker", keyMaker); ByteBuf buffer = BufferHelper.buildBuffer("FF FF 00 08 00 00 00 01"); @@ -94,7 +92,7 @@ public class CodeKeyMakerFactoryTest { MessageCodeKey codeKey = keyMaker.make(buffer); Assert.assertNotNull("Null key", codeKey); - Assert.assertEquals("Wrong key", new ActionDeserializerKey(EncodeConstants.OF13_VERSION_ID, + Assert.assertEquals("Wrong key", new ActionDeserializerKey(EncodeConstants.OF_VERSION_1_3, 65535, 1L), codeKey); Assert.assertEquals("Buffer index modified", 8, buffer.readableBytes()); } @@ -104,7 +102,7 @@ public class CodeKeyMakerFactoryTest { */ @Test public void testInstructionKeyMaker() { - CodeKeyMaker keyMaker = CodeKeyMakerFactory.createInstructionsKeyMaker(EncodeConstants.OF13_VERSION_ID); + CodeKeyMaker keyMaker = CodeKeyMakerFactory.createInstructionsKeyMaker(EncodeConstants.OF_VERSION_1_3); Assert.assertNotNull("Null key maker", keyMaker); ByteBuf buffer = BufferHelper.buildBuffer("00 00 00 08"); @@ -112,7 +110,7 @@ public class CodeKeyMakerFactoryTest { MessageCodeKey codeKey = keyMaker.make(buffer); Assert.assertNotNull("Null key", codeKey); - Assert.assertEquals("Wrong key", new InstructionDeserializerKey(EncodeConstants.OF13_VERSION_ID, + Assert.assertEquals("Wrong key", new InstructionDeserializerKey(EncodeConstants.OF_VERSION_1_3, 0, null), codeKey); Assert.assertEquals("Buffer index modified", 4, buffer.readableBytes()); } @@ -122,7 +120,7 @@ public class CodeKeyMakerFactoryTest { */ @Test public void testExperimenterInstructionKeyMaker() { - CodeKeyMaker keyMaker = CodeKeyMakerFactory.createInstructionsKeyMaker(EncodeConstants.OF13_VERSION_ID); + CodeKeyMaker keyMaker = CodeKeyMakerFactory.createInstructionsKeyMaker(EncodeConstants.OF_VERSION_1_3); Assert.assertNotNull("Null key maker", keyMaker); ByteBuf buffer = BufferHelper.buildBuffer("FF FF 00 08 00 00 00 01"); @@ -130,7 +128,7 @@ public class CodeKeyMakerFactoryTest { MessageCodeKey codeKey = keyMaker.make(buffer); Assert.assertNotNull("Null key", codeKey); - Assert.assertEquals("Wrong key", new InstructionDeserializerKey(EncodeConstants.OF13_VERSION_ID, + Assert.assertEquals("Wrong key", new InstructionDeserializerKey(EncodeConstants.OF_VERSION_1_3, 65535, 1L), codeKey); Assert.assertEquals("Buffer index modified", 8, buffer.readableBytes()); } diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/DefaultDeserializerFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/DefaultDeserializerFactoryTest.java index f3b814bad3..ce762a60fd 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/DefaultDeserializerFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/DefaultDeserializerFactoryTest.java @@ -38,13 +38,13 @@ public abstract class DefaultDeserializerFactoryTest { * @param versions supported OF versions * @param buffer byte buffer to deserialze */ - protected void testHeaderVersions(final List versions, final ByteBuf buffer) { - for (short version : versions) { + protected void testHeaderVersions(final List versions, final ByteBuf buffer) { + for (Uint8 version : versions) { ByteBuf bb = buffer.copy(); OFDeserializer serializer = registry.getDeserializer( new MessageCodeKey(version, messageCodeKey.getMsgType(), messageCodeKey.getClazz())); T builtByFactory = BufferHelper.deserialize(serializer, bb); - BufferHelper.checkHeader((OfHeader) builtByFactory, Uint8.valueOf(version)); + BufferHelper.checkHeader((OfHeader) builtByFactory, version); } } } diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/InstructionsDeserializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/InstructionsDeserializerTest.java index b4eb2576d2..d882f5b365 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/InstructionsDeserializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/InstructionsDeserializerTest.java @@ -60,7 +60,7 @@ public class InstructionsDeserializerTest { message.skipBytes(4); // skip XID - CodeKeyMaker keyMaker = CodeKeyMakerFactory.createInstructionsKeyMaker(EncodeConstants.OF13_VERSION_ID); + CodeKeyMaker keyMaker = CodeKeyMakerFactory.createInstructionsKeyMaker(EncodeConstants.OF_VERSION_1_3); List instructions = ListDeserializer.deserializeList(EncodeConstants.OF13_VERSION_ID, message.readableBytes(), message, keyMaker, registry); Instruction i1 = instructions.get(0); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/MatchDeserializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/MatchDeserializerTest.java index 9e3aa2c608..467beca319 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/MatchDeserializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/MatchDeserializerTest.java @@ -130,8 +130,7 @@ public class MatchDeserializerTest { registry = new DeserializerRegistryImpl(); registry.init(); matchDeserializer = registry.getDeserializer( - new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, - EncodeConstants.EMPTY_VALUE, Match.class)); + new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, EncodeConstants.EMPTY_VALUE, Match.class)); } /** @@ -141,8 +140,7 @@ public class MatchDeserializerTest { public void testIpv4Address() { ByteBuf buffer = ByteBufUtils.hexStringToByteBuf("80 00 18 04 00 01 02 03"); - MatchEntryDeserializerKey key = new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, - 0x8000, 12); + MatchEntryDeserializerKey key = new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, 0x8000, 12); key.setExperimenterId(null); OFDeserializer entryDeserializer = registry.getDeserializer(key); MatchEntry entry = entryDeserializer.deserialize(buffer); @@ -157,8 +155,7 @@ public class MatchDeserializerTest { public void testIpv6Address() { ByteBuf buffer = ByteBufUtils.hexStringToByteBuf("80 00 34 10 00 00 00 01 00 02 00 03 00 04 00 05 00 06 0F 07"); - MatchEntryDeserializerKey key = new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, - 0x8000, 26); + MatchEntryDeserializerKey key = new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, 0x8000, 26); key.setExperimenterId(null); OFDeserializer entryDeserializer = registry.getDeserializer(key); MatchEntry entry = entryDeserializer.deserialize(buffer); @@ -512,8 +509,7 @@ public class MatchDeserializerTest { public void testHeaders() { ByteBuf buffer = ByteBufUtils.hexStringToByteBuf("80 00 18 04 00 01 02 03"); - MatchEntryDeserializerKey key = new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, - 0x8000, 12); + MatchEntryDeserializerKey key = new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, 0x8000, 12); key.setExperimenterId(null); HeaderDeserializer entryDeserializer = registry.getDeserializer(key); MatchEntry entry = entryDeserializer.deserializeHeader(buffer); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF10ActionsDeserializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF10ActionsDeserializerTest.java index 7c42b1547b..2b5f980c90 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF10ActionsDeserializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF10ActionsDeserializerTest.java @@ -67,7 +67,7 @@ public class OF10ActionsDeserializerTest { + "00 0B 00 10 00 04 00 00 00 00 00 00 00 00 00 30"); message.skipBytes(4); // skip XID - CodeKeyMaker keyMaker = CodeKeyMakerFactory.createActionsKeyMaker(EncodeConstants.OF10_VERSION_ID); + CodeKeyMaker keyMaker = CodeKeyMakerFactory.createActionsKeyMaker(EncodeConstants.OF_VERSION_1_0); List actions = ListDeserializer.deserializeList(EncodeConstants.OF10_VERSION_ID, message.readableBytes(), message, keyMaker, registry); Assert.assertEquals("Wrong number of actions", 12, actions.size()); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF10ActionsSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF10ActionsSerializerTest.java index fe42ec53f9..175a744bc0 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF10ActionsSerializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF10ActionsSerializerTest.java @@ -159,7 +159,7 @@ public class OF10ActionsSerializerTest { ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer(); ListSerializer.serializeList(actions, TypeKeyMakerFactory - .createActionKeyMaker(EncodeConstants.OF10_VERSION_ID), registry, out); + .createActionKeyMaker(EncodeConstants.OF_VERSION_1_0), registry, out); Assert.assertEquals("Wrong action type", 0, out.readUnsignedShort()); Assert.assertEquals("Wrong action length", 8, out.readUnsignedShort()); @@ -219,5 +219,4 @@ public class OF10ActionsSerializerTest { Assert.assertEquals("Wrong queue-id", 400, out.readUnsignedInt()); Assert.assertTrue("Written more bytes than needed", out.readableBytes() == 0); } - } diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF10MatchDeserializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF10MatchDeserializerTest.java index cb10fa3701..7386274a42 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF10MatchDeserializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF10MatchDeserializerTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.impl.util; import io.netty.buffer.ByteBuf; @@ -39,7 +38,7 @@ public class OF10MatchDeserializerTest { DeserializerRegistry registry = new DeserializerRegistryImpl(); registry.init(); matchDeserializer = registry.getDeserializer( - new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, EncodeConstants.EMPTY_VALUE, MatchV10.class)); + new MessageCodeKey(EncodeConstants.OF_VERSION_1_0, EncodeConstants.EMPTY_VALUE, MatchV10.class)); } /** @@ -97,5 +96,4 @@ public class OF10MatchDeserializerTest { Assert.assertEquals("Wrong tp-src", 20560, match.getTpSrc().shortValue()); Assert.assertEquals("Wrong tp-dst", 8224, match.getTpDst().shortValue()); } - } diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF10MatchSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF10MatchSerializerTest.java index 9e3ae0e84a..9f08a9ddfe 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF10MatchSerializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF10MatchSerializerTest.java @@ -43,7 +43,7 @@ public class OF10MatchSerializerTest { registry = new SerializerRegistryImpl(); registry.init(); matchSerializer = registry.getSerializer( - new MessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, MatchV10.class)); + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_0, MatchV10.class)); } /** diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13ActionsSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13ActionsSerializerTest.java index d689eff3cf..259c8f75b5 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13ActionsSerializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13ActionsSerializerTest.java @@ -184,7 +184,7 @@ public class OF13ActionsSerializerTest { ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer(); ListSerializer.serializeList(actions, TypeKeyMakerFactory - .createActionKeyMaker(EncodeConstants.OF13_VERSION_ID), registry, out); + .createActionKeyMaker(EncodeConstants.OF_VERSION_1_3), registry, out); Assert.assertEquals("Wrong action type", 0, out.readUnsignedShort()); Assert.assertEquals("Wrong action length", 16, out.readUnsignedShort()); @@ -284,7 +284,7 @@ public class OF13ActionsSerializerTest { ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer(); ListSerializer.serializeHeaderList(actions, TypeKeyMakerFactory - .createActionKeyMaker(EncodeConstants.OF13_VERSION_ID), registry, out); + .createActionKeyMaker(EncodeConstants.OF_VERSION_1_3), registry, out); Assert.assertEquals("Wrong action type", 0, out.readUnsignedShort()); Assert.assertEquals("Wrong action length", 4, out.readUnsignedShort()); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13InstructionsSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13InstructionsSerializerTest.java index d387e61143..597c51fbd9 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13InstructionsSerializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13InstructionsSerializerTest.java @@ -145,7 +145,7 @@ public class OF13InstructionsSerializerTest { ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer(); ListSerializer.serializeList(instructions, TypeKeyMakerFactory - .createInstructionKeyMaker(EncodeConstants.OF13_VERSION_ID), registry, out); + .createInstructionKeyMaker(EncodeConstants.OF_VERSION_1_3), registry, out); Assert.assertEquals("Wrong instruction type", 1, out.readUnsignedShort()); Assert.assertEquals("Wrong instruction length", 8, out.readUnsignedShort()); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13MatchSerializer02Test.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13MatchSerializer02Test.java index 81199f8c9d..8da31d151f 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13MatchSerializer02Test.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13MatchSerializer02Test.java @@ -177,8 +177,7 @@ public class OF13MatchSerializer02Test { public void startUp() { registry = new SerializerRegistryImpl(); registry.init(); - matchSerializer = registry.getSerializer( - new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, Match.class)); + matchSerializer = registry.getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, Match.class)); } /** diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13MatchSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13MatchSerializerTest.java index 909049001a..96e7e48f92 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13MatchSerializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13MatchSerializerTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.protocol.impl.util; import io.netty.buffer.ByteBuf; @@ -24,8 +23,8 @@ import org.opendaylight.openflowjava.util.ByteBufUtils; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6FlowLabel; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.experimenter.id._case.ExperimenterBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.experimenter.id._case.ExperimenterBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ExperimenterId; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.StandardMatchType; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.ExperimenterClass; @@ -75,7 +74,7 @@ public class OF13MatchSerializerTest { registry = new SerializerRegistryImpl(); registry.init(); matchSerializer = registry.getSerializer( - new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, Match.class)); + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, Match.class)); } /** @@ -326,7 +325,7 @@ public class OF13MatchSerializerTest { } } - private static Match buildIpv6FLabelMatch(long labelValue, boolean hasMask, byte[] mask) { + private static Match buildIpv6FLabelMatch(final long labelValue, final boolean hasMask, final byte[] mask) { MatchBuilder builder = new MatchBuilder(); builder.setType(OxmMatchType.class); final List entries = new ArrayList<>(); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/TypeKeyMakerFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/TypeKeyMakerFactoryTest.java index 36f09b43a9..249c23cbe1 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/TypeKeyMakerFactoryTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/TypeKeyMakerFactoryTest.java @@ -14,8 +14,8 @@ import org.opendaylight.openflowjava.protocol.api.keys.InstructionSerializerKey; import org.opendaylight.openflowjava.protocol.api.keys.MatchEntrySerializerKey; import org.opendaylight.openflowjava.protocol.api.keys.MessageTypeKey; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.experimenter.id._case.ExperimenterBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.experimenter.id._case.ExperimenterBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.CopyTtlInCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.CopyTtlInCaseBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.OutputActionCase; @@ -49,7 +49,7 @@ public class TypeKeyMakerFactoryTest { */ @Test public void testActionKeyMaker() { - TypeKeyMaker keyMaker = TypeKeyMakerFactory.createActionKeyMaker(EncodeConstants.OF13_VERSION_ID); + TypeKeyMaker keyMaker = TypeKeyMakerFactory.createActionKeyMaker(EncodeConstants.OF_VERSION_1_3); Assert.assertNotNull("Null keyMaker", keyMaker); ActionBuilder builder = new ActionBuilder(); @@ -58,7 +58,7 @@ public class TypeKeyMakerFactoryTest { MessageTypeKey key = keyMaker.make(action); Assert.assertNotNull("Null key", key); - Assert.assertEquals("Wrong key", new ActionSerializerKey<>(EncodeConstants.OF13_VERSION_ID, + Assert.assertEquals("Wrong key", new ActionSerializerKey<>(EncodeConstants.OF_VERSION_1_3, OutputActionCase.class, null), key); } @@ -67,7 +67,7 @@ public class TypeKeyMakerFactoryTest { */ @Test public void testExperimenterActionKeyMaker() { - TypeKeyMaker keyMaker = TypeKeyMakerFactory.createActionKeyMaker(EncodeConstants.OF13_VERSION_ID); + TypeKeyMaker keyMaker = TypeKeyMakerFactory.createActionKeyMaker(EncodeConstants.OF_VERSION_1_3); Assert.assertNotNull("Null keyMaker", keyMaker); org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping @@ -78,7 +78,7 @@ public class TypeKeyMakerFactoryTest { MessageTypeKey key = keyMaker.make(action); Assert.assertNotNull("Null key", key); - Assert.assertEquals("Wrong key", new ActionSerializerKey<>(EncodeConstants.OF13_VERSION_ID, + Assert.assertEquals("Wrong key", new ActionSerializerKey<>(EncodeConstants.OF_VERSION_1_3, CopyTtlInCase.class, Uint32.valueOf(42)), key); } @@ -88,7 +88,7 @@ public class TypeKeyMakerFactoryTest { @Test public void testInstructionKeyMaker() { TypeKeyMaker keyMaker = - TypeKeyMakerFactory.createInstructionKeyMaker(EncodeConstants.OF13_VERSION_ID); + TypeKeyMakerFactory.createInstructionKeyMaker(EncodeConstants.OF_VERSION_1_3); Assert.assertNotNull("Null keyMaker", keyMaker); InstructionBuilder builder = new InstructionBuilder(); @@ -97,7 +97,7 @@ public class TypeKeyMakerFactoryTest { MessageTypeKey key = keyMaker.make(instruction); Assert.assertNotNull("Null key", key); - Assert.assertEquals("Wrong key", new InstructionSerializerKey<>(EncodeConstants.OF13_VERSION_ID, + Assert.assertEquals("Wrong key", new InstructionSerializerKey<>(EncodeConstants.OF_VERSION_1_3, GotoTableCase.class, null), key); } @@ -107,7 +107,7 @@ public class TypeKeyMakerFactoryTest { @Test public void testExperimenterInstructionKeyMaker() { TypeKeyMaker keyMaker = - TypeKeyMakerFactory.createInstructionKeyMaker(EncodeConstants.OF13_VERSION_ID); + TypeKeyMakerFactory.createInstructionKeyMaker(EncodeConstants.OF_VERSION_1_3); Assert.assertNotNull("Null keyMaker", keyMaker); InstructionBuilder builder = new InstructionBuilder(); @@ -117,7 +117,7 @@ public class TypeKeyMakerFactoryTest { MessageTypeKey key = keyMaker.make(instruction); Assert.assertNotNull("Null key", key); - Assert.assertEquals("Wrong key", new InstructionSerializerKey<>(EncodeConstants.OF13_VERSION_ID, + Assert.assertEquals("Wrong key", new InstructionSerializerKey<>(EncodeConstants.OF_VERSION_1_3, ClearActionsCase.class, 42L), key); } @@ -127,7 +127,7 @@ public class TypeKeyMakerFactoryTest { @Test public void testMatchEntriesKeyMaker() { TypeKeyMaker keyMaker = - TypeKeyMakerFactory.createMatchEntriesKeyMaker(EncodeConstants.OF13_VERSION_ID); + TypeKeyMakerFactory.createMatchEntriesKeyMaker(EncodeConstants.OF_VERSION_1_3); Assert.assertNotNull("Null keyMaker", keyMaker); MatchEntryBuilder builder = new MatchEntryBuilder(); @@ -138,7 +138,7 @@ public class TypeKeyMakerFactoryTest { MessageTypeKey key = keyMaker.make(entry); Assert.assertNotNull("Null key", key); - MatchEntrySerializerKey comparationKey = new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, + MatchEntrySerializerKey comparationKey = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, OpenflowBasicClass.class, InPort.class); Assert.assertEquals("Wrong key", comparationKey, key); } @@ -149,7 +149,7 @@ public class TypeKeyMakerFactoryTest { @Test public void testExperimenterMatchEntriesKeyMaker() { TypeKeyMaker keyMaker = - TypeKeyMakerFactory.createMatchEntriesKeyMaker(EncodeConstants.OF13_VERSION_ID); + TypeKeyMakerFactory.createMatchEntriesKeyMaker(EncodeConstants.OF_VERSION_1_3); Assert.assertNotNull("Null keyMaker", keyMaker); MatchEntryBuilder builder = new MatchEntryBuilder(); @@ -165,7 +165,7 @@ public class TypeKeyMakerFactoryTest { MessageTypeKey key = keyMaker.make(entry); Assert.assertNotNull("Null key", key); - MatchEntrySerializerKey comparationKey = new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, + MatchEntrySerializerKey comparationKey = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, ExperimenterClass.class, OxmMatchFieldClass.class); comparationKey.setExperimenterId(Uint32.valueOf(42L)); Assert.assertEquals("Wrong key", comparationKey, key); diff --git a/openflowjava/openflowjava-util/src/main/java/org/opendaylight/openflowjava/util/ExperimenterDeserializerKeyFactory.java b/openflowjava/openflowjava-util/src/main/java/org/opendaylight/openflowjava/util/ExperimenterDeserializerKeyFactory.java index a4c6bebd6e..dc1c9b13e4 100644 --- a/openflowjava/openflowjava-util/src/main/java/org/opendaylight/openflowjava/util/ExperimenterDeserializerKeyFactory.java +++ b/openflowjava/openflowjava-util/src/main/java/org/opendaylight/openflowjava/util/ExperimenterDeserializerKeyFactory.java @@ -15,6 +15,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.band.header.meter.band.MeterBandExperimenterCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.queue.property.header.QueueProperty; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.table.features.properties.grouping.TableFeatureProperties; +import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Factory for creating experimenter deserializer keys. @@ -35,7 +37,7 @@ public final class ExperimenterDeserializerKeyFactory { * @return key instance */ public static ExperimenterIdDeserializerKey createExperimenterErrorDeserializerKey( - short version, Long experimenterId) { + final Uint8 version, final Uint32 experimenterId) { return new ExperimenterIdDeserializerKey(version, experimenterId, ErrorMessage.class); } @@ -48,7 +50,7 @@ public final class ExperimenterDeserializerKeyFactory { * @return key instance */ public static ExperimenterIdTypeDeserializerKey createExperimenterMessageDeserializerKey( - short version, long experimenterId, long type) { + final Uint8 version, final Uint32 experimenterId, final long type) { return new ExperimenterIdTypeDeserializerKey(version, experimenterId, type, ExperimenterDataOfChoice.class); } @@ -60,7 +62,7 @@ public final class ExperimenterDeserializerKeyFactory { * @return key instance */ public static ExperimenterIdDeserializerKey createVendorMessageDeserializerKey( - short version, long experimenterId) { + final Uint8 version, final Uint32 experimenterId) { return new ExperimenterIdDeserializerKey(version, experimenterId, ExperimenterDataOfChoice.class); } @@ -73,7 +75,7 @@ public final class ExperimenterDeserializerKeyFactory { * @return key instance */ public static ExperimenterIdTypeDeserializerKey createMultipartReplyMessageDeserializerKey( - short version, long experimenterId, long type) { + final Uint8 version, final Uint32 experimenterId, final long type) { return new ExperimenterIdTypeDeserializerKey(version, experimenterId, type, ExperimenterDataOfChoice.class); } @@ -85,7 +87,7 @@ public final class ExperimenterDeserializerKeyFactory { * @return key instance */ public static ExperimenterIdDeserializerKey createMultipartReplyVendorMessageDeserializerKey( - short version, long experimenterId) { + final Uint8 version, final Uint32 experimenterId) { return new ExperimenterIdDeserializerKey(version, experimenterId, ExperimenterDataOfChoice.class); } @@ -97,7 +99,7 @@ public final class ExperimenterDeserializerKeyFactory { * @return key instance */ public static ExperimenterIdDeserializerKey createMultipartReplyTFDeserializerKey( - short version, Long experimenterId) { + final Uint8 version, final Uint32 experimenterId) { return new ExperimenterIdDeserializerKey(version, experimenterId, TableFeatureProperties.class); } @@ -109,7 +111,7 @@ public final class ExperimenterDeserializerKeyFactory { * @return key instance */ public static ExperimenterIdDeserializerKey createQueuePropertyDeserializerKey( - short version, Long experimenterId) { + final Uint8 version, final Uint32 experimenterId) { return new ExperimenterIdDeserializerKey(version, experimenterId, QueueProperty.class); } @@ -121,7 +123,7 @@ public final class ExperimenterDeserializerKeyFactory { * @return key instance */ public static ExperimenterIdDeserializerKey createMeterBandDeserializerKey( - short version, Long experimenterId) { + final Uint8 version, final Uint32 experimenterId) { return new ExperimenterIdDeserializerKey(version, experimenterId, MeterBandExperimenterCase.class); } } diff --git a/openflowjava/openflowjava-util/src/main/java/org/opendaylight/openflowjava/util/ExperimenterSerializerKeyFactory.java b/openflowjava/openflowjava-util/src/main/java/org/opendaylight/openflowjava/util/ExperimenterSerializerKeyFactory.java index a96e0cc224..b9042b33e5 100755 --- a/openflowjava/openflowjava-util/src/main/java/org/opendaylight/openflowjava/util/ExperimenterSerializerKeyFactory.java +++ b/openflowjava/openflowjava-util/src/main/java/org/opendaylight/openflowjava/util/ExperimenterSerializerKeyFactory.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.util; import org.opendaylight.openflowjava.protocol.api.keys.ExperimenterIdMeterSubTypeSerializerKey; @@ -15,6 +14,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev13 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.experimenter.core.ExperimenterDataOfChoice; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.band.header.meter.band.MeterBandExperimenterCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.table.features.properties.grouping.TableFeatureProperties; +import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Factory for creating experimenter serializer keys. @@ -32,7 +33,7 @@ public abstract class ExperimenterSerializerKeyFactory { * @return key instance */ public static ExperimenterIdSerializerKey createExperimenterMessageSerializerKey( - short msgVersion, long experimenterId, long type) { + final Uint8 msgVersion, final Uint32 experimenterId, final long type) { return new ExperimenterIdTypeSerializerKey<>(msgVersion, experimenterId, type, ExperimenterDataOfChoice.class); } @@ -45,7 +46,7 @@ public abstract class ExperimenterSerializerKeyFactory { * @return key instance */ public static ExperimenterIdSerializerKey createMultipartRequestSerializerKey( - short msgVersion, long experimenterId, long type) { + final Uint8 msgVersion, final Uint32 experimenterId, final long type) { return new ExperimenterIdTypeSerializerKey<>(msgVersion, experimenterId, type, ExperimenterDataOfChoice.class); } @@ -57,7 +58,7 @@ public abstract class ExperimenterSerializerKeyFactory { * @return key instance */ public static ExperimenterIdSerializerKey createMultipartRequestTFSerializerKey( - short msgVersion, long experimenterId) { + final Uint8 msgVersion, final Uint32 experimenterId) { return new ExperimenterIdSerializerKey<>(msgVersion, experimenterId, TableFeatureProperties.class); } @@ -69,13 +70,14 @@ public abstract class ExperimenterSerializerKeyFactory { * @return key instance */ public static ExperimenterIdSerializerKey createMeterBandSerializerKey( - short msgVersion, long experimenterId) { + final Uint8 msgVersion, final Uint32 experimenterId) { return new ExperimenterIdMeterSubTypeSerializerKey<>(msgVersion, experimenterId, MeterBandExperimenterCase.class, null); } public static ExperimenterIdSerializerKey createMeterBandSerializerKey( - short msgVersion, long experimenterId, Class meterSubType) { + final Uint8 msgVersion, final Uint32 experimenterId, + final Class meterSubType) { return new ExperimenterIdMeterSubTypeSerializerKey<>(msgVersion, experimenterId, MeterBandExperimenterCase.class, meterSubType); } diff --git a/openflowjava/openflowjava-util/src/test/java/org/opendaylight/openflowjava/util/ExperimenterDeserializerKeyFactoryTest.java b/openflowjava/openflowjava-util/src/test/java/org/opendaylight/openflowjava/util/ExperimenterDeserializerKeyFactoryTest.java index d67e66fd1b..60dd6e68c5 100644 --- a/openflowjava/openflowjava-util/src/test/java/org/opendaylight/openflowjava/util/ExperimenterDeserializerKeyFactoryTest.java +++ b/openflowjava/openflowjava-util/src/test/java/org/opendaylight/openflowjava/util/ExperimenterDeserializerKeyFactoryTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.util; import org.junit.Assert; @@ -18,6 +17,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.band.header.meter.band.MeterBandExperimenterCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.queue.property.header.QueueProperty; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.table.features.properties.grouping.TableFeatureProperties; +import org.opendaylight.yangtools.yang.common.Uint32; /** * Unit tests for ExperimenterDeserializerKeyFactory. @@ -31,9 +31,10 @@ public class ExperimenterDeserializerKeyFactoryTest { ExperimenterIdDeserializerKey createdKey; ExperimenterIdDeserializerKey comparationKey; - createdKey = ExperimenterDeserializerKeyFactory - .createExperimenterErrorDeserializerKey(EncodeConstants.OF10_VERSION_ID, 42L); - comparationKey = new ExperimenterIdDeserializerKey(EncodeConstants.OF10_VERSION_ID, 42L, ErrorMessage.class); + createdKey = ExperimenterDeserializerKeyFactory.createExperimenterErrorDeserializerKey( + EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(42)); + comparationKey = new ExperimenterIdDeserializerKey(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(42), + ErrorMessage.class); Assert.assertEquals("Wrong key created", comparationKey, createdKey); } @@ -43,9 +44,9 @@ public class ExperimenterDeserializerKeyFactoryTest { ExperimenterIdDeserializerKey comparationKey; createdKey = ExperimenterDeserializerKeyFactory.createExperimenterMessageDeserializerKey( - EncodeConstants.OF10_VERSION_ID, 43L, 1L); - comparationKey = new ExperimenterIdTypeDeserializerKey(EncodeConstants.OF10_VERSION_ID, - 43L, 1L, ExperimenterDataOfChoice.class); + EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(43), 1L); + comparationKey = new ExperimenterIdTypeDeserializerKey(EncodeConstants.OF_VERSION_1_0, + Uint32.valueOf(43), 1L, ExperimenterDataOfChoice.class); Assert.assertEquals("Wrong key created", comparationKey, createdKey); } @@ -55,9 +56,9 @@ public class ExperimenterDeserializerKeyFactoryTest { ExperimenterIdDeserializerKey comparationKey; createdKey = ExperimenterDeserializerKeyFactory.createMultipartReplyMessageDeserializerKey( - EncodeConstants.OF10_VERSION_ID, 45L, 1L); - comparationKey = new ExperimenterIdDeserializerKey(EncodeConstants.OF10_VERSION_ID, - 45L, ExperimenterDataOfChoice.class); + EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(45), 1L); + comparationKey = new ExperimenterIdDeserializerKey(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(45), + ExperimenterDataOfChoice.class); Assert.assertEquals("Wrong key created", comparationKey, createdKey); } @@ -67,9 +68,9 @@ public class ExperimenterDeserializerKeyFactoryTest { ExperimenterIdDeserializerKey comparationKey; createdKey = ExperimenterDeserializerKeyFactory.createMultipartReplyTFDeserializerKey( - EncodeConstants.OF10_VERSION_ID, 46L); - comparationKey = new ExperimenterIdDeserializerKey(EncodeConstants.OF10_VERSION_ID, - 46L, TableFeatureProperties.class); + EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(46)); + comparationKey = new ExperimenterIdDeserializerKey(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(46), + TableFeatureProperties.class); Assert.assertEquals("Wrong key created", comparationKey, createdKey); } @@ -79,9 +80,9 @@ public class ExperimenterDeserializerKeyFactoryTest { ExperimenterIdDeserializerKey comparationKey; createdKey = ExperimenterDeserializerKeyFactory.createQueuePropertyDeserializerKey( - EncodeConstants.OF10_VERSION_ID, 47L); - comparationKey = new ExperimenterIdDeserializerKey(EncodeConstants.OF10_VERSION_ID, - 47L, QueueProperty.class); + EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(47)); + comparationKey = new ExperimenterIdDeserializerKey(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(47), + QueueProperty.class); Assert.assertEquals("Wrong key created", comparationKey, createdKey); } @@ -91,9 +92,9 @@ public class ExperimenterDeserializerKeyFactoryTest { ExperimenterIdDeserializerKey comparationKey; createdKey = ExperimenterDeserializerKeyFactory.createMeterBandDeserializerKey( - EncodeConstants.OF10_VERSION_ID, 44L); - comparationKey = new ExperimenterIdDeserializerKey(EncodeConstants.OF10_VERSION_ID, - 44L, MeterBandExperimenterCase.class); + EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(44)); + comparationKey = new ExperimenterIdDeserializerKey(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(44), + MeterBandExperimenterCase.class); Assert.assertEquals("Wrong key created", comparationKey, createdKey); } @@ -103,9 +104,9 @@ public class ExperimenterDeserializerKeyFactoryTest { ExperimenterIdDeserializerKey comparationKey; createdKey = ExperimenterDeserializerKeyFactory.createVendorMessageDeserializerKey( - EncodeConstants.OF10_VERSION_ID, 43L); - comparationKey = new ExperimenterIdDeserializerKey(EncodeConstants.OF10_VERSION_ID, - 43L, ExperimenterDataOfChoice.class); + EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(43)); + comparationKey = new ExperimenterIdDeserializerKey(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(43), + ExperimenterDataOfChoice.class); Assert.assertEquals("Wrong key created", comparationKey, createdKey); } @@ -115,9 +116,9 @@ public class ExperimenterDeserializerKeyFactoryTest { ExperimenterIdDeserializerKey comparationKey; createdKey = ExperimenterDeserializerKeyFactory.createMultipartReplyVendorMessageDeserializerKey( - EncodeConstants.OF10_VERSION_ID, 43L); - comparationKey = new ExperimenterIdDeserializerKey(EncodeConstants.OF10_VERSION_ID, - 43L, ExperimenterDataOfChoice.class); + EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(43)); + comparationKey = new ExperimenterIdDeserializerKey(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(43), + ExperimenterDataOfChoice.class); Assert.assertEquals("Wrong key created", comparationKey, createdKey); } } diff --git a/openflowjava/openflowjava-util/src/test/java/org/opendaylight/openflowjava/util/ExperimenterSerializerKeyFactoryTest.java b/openflowjava/openflowjava-util/src/test/java/org/opendaylight/openflowjava/util/ExperimenterSerializerKeyFactoryTest.java index cd0f0b833d..cae8dd705c 100755 --- a/openflowjava/openflowjava-util/src/test/java/org/opendaylight/openflowjava/util/ExperimenterSerializerKeyFactoryTest.java +++ b/openflowjava/openflowjava-util/src/test/java/org/opendaylight/openflowjava/util/ExperimenterSerializerKeyFactoryTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowjava.util; import org.junit.Assert; @@ -18,6 +17,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev13 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.experimenter.core.ExperimenterDataOfChoice; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.band.header.meter.band.MeterBandExperimenterCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.table.features.properties.grouping.TableFeatureProperties; +import org.opendaylight.yangtools.yang.common.Uint32; /** * Test ExperimenterSerializerKeyFactory key creation. @@ -32,9 +32,9 @@ public class ExperimenterSerializerKeyFactoryTest { ExperimenterIdSerializerKey comparationKey; createdKey = ExperimenterSerializerKeyFactory - .createExperimenterMessageSerializerKey(EncodeConstants.OF10_VERSION_ID, 42L, 1L); - comparationKey = new ExperimenterIdTypeSerializerKey<>(EncodeConstants.OF10_VERSION_ID, - 42L, 1L, ExperimenterDataOfChoice.class); + .createExperimenterMessageSerializerKey(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(42), 1L); + comparationKey = new ExperimenterIdTypeSerializerKey<>(EncodeConstants.OF_VERSION_1_0, + Uint32.valueOf(42), 1L, ExperimenterDataOfChoice.class); Assert.assertEquals("Wrong key created", comparationKey, createdKey); } @@ -44,9 +44,9 @@ public class ExperimenterSerializerKeyFactoryTest { ExperimenterIdSerializerKey comparationKey; createdKey = ExperimenterSerializerKeyFactory.createMultipartRequestSerializerKey( - EncodeConstants.OF10_VERSION_ID, 44L, 1L); - comparationKey = new ExperimenterIdSerializerKey<>(EncodeConstants.OF10_VERSION_ID, - 44L, ExperimenterDataOfChoice.class); + EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(44), 1L); + comparationKey = new ExperimenterIdSerializerKey<>(EncodeConstants.OF_VERSION_1_0, + Uint32.valueOf(44), ExperimenterDataOfChoice.class); Assert.assertEquals("Wrong key created", comparationKey, createdKey); } @@ -56,9 +56,9 @@ public class ExperimenterSerializerKeyFactoryTest { ExperimenterIdSerializerKey comparationKey; createdKey = ExperimenterSerializerKeyFactory.createMultipartRequestTFSerializerKey( - EncodeConstants.OF10_VERSION_ID, 45L); - comparationKey = new ExperimenterIdSerializerKey<>(EncodeConstants.OF10_VERSION_ID, - 45L, TableFeatureProperties.class); + EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(45)); + comparationKey = new ExperimenterIdSerializerKey<>(EncodeConstants.OF_VERSION_1_0, + Uint32.valueOf(45), TableFeatureProperties.class); Assert.assertEquals("Wrong key created", comparationKey, createdKey); } @@ -67,10 +67,10 @@ public class ExperimenterSerializerKeyFactoryTest { ExperimenterIdSerializerKey createdKey; ExperimenterIdSerializerKey comparationKey; - createdKey = ExperimenterSerializerKeyFactory.createMeterBandSerializerKey( - EncodeConstants.OF10_VERSION_ID, 43L); - comparationKey = new ExperimenterIdSerializerKey<>(EncodeConstants.OF10_VERSION_ID, - 43L, MeterBandExperimenterCase.class); + createdKey = ExperimenterSerializerKeyFactory.createMeterBandSerializerKey(EncodeConstants.OF_VERSION_1_0, + Uint32.valueOf(43)); + comparationKey = new ExperimenterIdSerializerKey<>(EncodeConstants.OF_VERSION_1_0, + Uint32.valueOf(43), MeterBandExperimenterCase.class); Assert.assertEquals("Wrong key created", comparationKey, createdKey); } @@ -83,18 +83,18 @@ public class ExperimenterSerializerKeyFactoryTest { final ExperimenterIdSerializerKey comparationKey4; final ExperimenterIdSerializerKey comparationKey5; - createdKey = ExperimenterSerializerKeyFactory.createMeterBandSerializerKey( - EncodeConstants.OF10_VERSION_ID, 43L, ExperimenterMeterBandSubType.class); - comparationKey1 = new ExperimenterIdMeterSubTypeSerializerKey<>(EncodeConstants.OF13_VERSION_ID, - 43L, MeterBandExperimenterCase.class, ExperimenterMeterBandSubType.class); - comparationKey2 = new ExperimenterIdMeterSubTypeSerializerKey<>(EncodeConstants.OF10_VERSION_ID, - 42L, MeterBandExperimenterCase.class, ExperimenterMeterBandSubType.class); - comparationKey3 = new ExperimenterIdMeterSubTypeSerializerKey<>(EncodeConstants.OF10_VERSION_ID, - 43L, null, ExperimenterMeterBandSubType.class); - comparationKey4 = new ExperimenterIdMeterSubTypeSerializerKey<>(EncodeConstants.OF10_VERSION_ID, - 43L, MeterBandExperimenterCase.class, null); - comparationKey5 = new ExperimenterIdMeterSubTypeSerializerKey<>(EncodeConstants.OF10_VERSION_ID, - 43L, MeterBandExperimenterCase.class, ExperimenterMeterBandSubType.class); + createdKey = ExperimenterSerializerKeyFactory.createMeterBandSerializerKey(EncodeConstants.OF_VERSION_1_0, + Uint32.valueOf(43), ExperimenterMeterBandSubType.class); + comparationKey1 = new ExperimenterIdMeterSubTypeSerializerKey<>(EncodeConstants.OF_VERSION_1_3, + Uint32.valueOf(43), MeterBandExperimenterCase.class, ExperimenterMeterBandSubType.class); + comparationKey2 = new ExperimenterIdMeterSubTypeSerializerKey<>(EncodeConstants.OF_VERSION_1_0, + Uint32.valueOf(42), MeterBandExperimenterCase.class, ExperimenterMeterBandSubType.class); + comparationKey3 = new ExperimenterIdMeterSubTypeSerializerKey<>(EncodeConstants.OF_VERSION_1_0, + Uint32.valueOf(43), null, ExperimenterMeterBandSubType.class); + comparationKey4 = new ExperimenterIdMeterSubTypeSerializerKey<>(EncodeConstants.OF_VERSION_1_0, + Uint32.valueOf(43), MeterBandExperimenterCase.class, null); + comparationKey5 = new ExperimenterIdMeterSubTypeSerializerKey<>(EncodeConstants.OF_VERSION_1_0, + Uint32.valueOf(43), MeterBandExperimenterCase.class, ExperimenterMeterBandSubType.class); Assert.assertNotEquals("Wrong key created", comparationKey1, createdKey); Assert.assertNotEquals("Wrong key created", comparationKey2, createdKey); Assert.assertNotEquals("Wrong key created", comparationKey3, createdKey); diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/OFConstants.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/OFConstants.java index c1ff095a45..78cb45be49 100644 --- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/OFConstants.java +++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/OFConstants.java @@ -7,7 +7,6 @@ */ package org.opendaylight.openflowplugin.api; -import com.google.common.collect.ImmutableList; import java.util.List; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.FlowCookie; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.Match; @@ -34,9 +33,9 @@ public final class OFConstants { public static final short OFPP_LOCAL = (short)0xfffe; /** openflow protocol 1.0 - version identifier. */ - public static final short OFP_VERSION_1_0 = 0x01; + public static final Uint8 OFP_VERSION_1_0 = Uint8.ONE; /** openflow protocol 1.3 - version identifier. */ - public static final short OFP_VERSION_1_3 = 0x04; + public static final Uint8 OFP_VERSION_1_3 = Uint8.valueOf(0x04); public static final String OF_URI_PREFIX = "openflow:"; @@ -82,8 +81,5 @@ public final class OFConstants { public static final String CONFIG_FILE_ID = "org.opendaylight.openflowplugin"; /** supported version ordered by height (highest version is at the beginning). */ - public static final List VERSION_ORDER = ImmutableList - .builder() - .add((short) 0x04, (short) 0x01) - .build(); + public static final List VERSION_ORDER = List.of(OFP_VERSION_1_3, OFP_VERSION_1_0); } diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/DeviceInfo.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/DeviceInfo.java index b28329f8b2..f9a59868a1 100644 --- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/DeviceInfo.java +++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/DeviceInfo.java @@ -7,12 +7,14 @@ */ package org.opendaylight.openflowplugin.api.openflow.device; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey; import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; import org.opendaylight.yangtools.yang.common.Uint64; +import org.opendaylight.yangtools.yang.common.Uint8; /** * API defining basic device information. @@ -35,7 +37,7 @@ public interface DeviceInfo extends XidSequencer { * Getter. * @return version */ - short getVersion(); + @NonNull Uint8 getVersion(); /** * Getter. @@ -57,5 +59,4 @@ public interface DeviceInfo extends XidSequencer { default String getLOGValue() { return getNodeId().getValue(); } - } diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/XidSequencer.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/XidSequencer.java index dd4e175c4f..05c7e7c5f2 100644 --- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/XidSequencer.java +++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/XidSequencer.java @@ -5,19 +5,19 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.api.openflow.device; +import org.opendaylight.yangtools.yang.common.Uint32; + /** * Reserves unique XID for Device Messages. */ public interface XidSequencer { - /** * Method reserve unique XID for Device Message. - * Attention: OFJava expect the message, - * otherwise OutboundQueue could stop working. + * Attention: OFJava expect the message, otherwise OutboundQueue could stop working. + * * @return Reserved XID */ - Long reserveXidForDeviceMessage(); + Uint32 reserveXidForDeviceMessage(); } diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/core/HandshakeListener.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/core/HandshakeListener.java index 42fa37e9e6..77f29eb094 100644 --- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/core/HandshakeListener.java +++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/core/HandshakeListener.java @@ -9,15 +9,15 @@ package org.opendaylight.openflowplugin.api.openflow.md.core; import org.opendaylight.openflowplugin.api.openflow.connection.HandshakeContext; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetFeaturesOutput; +import org.opendaylight.yangtools.yang.common.Uint8; public interface HandshakeListener { - /** * Handshake successfull. * @param featureOutput obtained * @param version negotiated */ - void onHandshakeSuccessful(GetFeaturesOutput featureOutput, Short version); + void onHandshakeSuccessful(GetFeaturesOutput featureOutput, Uint8 version); /** * This method is called when handshake fails for some reason. It allows diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/core/HandshakeManager.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/core/HandshakeManager.java index f9d9a382f5..082162138e 100644 --- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/core/HandshakeManager.java +++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/core/HandshakeManager.java @@ -8,15 +8,15 @@ package org.opendaylight.openflowplugin.api.openflow.md.core; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.HelloMessage; +import org.opendaylight.yangtools.yang.common.Uint8; public interface HandshakeManager { - /** * Return negotiated version. * * @return negotiated version. */ - Short getVersion(); + Uint8 getVersion(); /** * Process current handshake step. diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/core/TranslatorKey.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/core/TranslatorKey.java index 7a1663043b..42ce8d0b9c 100644 --- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/core/TranslatorKey.java +++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/core/TranslatorKey.java @@ -7,9 +7,13 @@ */ package org.opendaylight.openflowplugin.api.openflow.md.core; -public class TranslatorKey { +import static java.util.Objects.requireNonNull; + +import java.util.Objects; +import org.opendaylight.yangtools.yang.common.Uint8; - private final int version; +public class TranslatorKey { + private final Uint8 version; private final String messageClass; /** @@ -17,8 +21,8 @@ public class TranslatorKey { * @param version version * @param messageClass message class */ - public TranslatorKey(int version, String messageClass) { - this.version = version; + public TranslatorKey(final Uint8 version, final String messageClass) { + this.version = requireNonNull(version); this.messageClass = messageClass; } @@ -27,31 +31,20 @@ public class TranslatorKey { final int prime = 31; int result = 1; result = prime * result - + ((messageClass == null) ? 0 : messageClass.hashCode()); - result = prime * result + version; + + (messageClass == null ? 0 : messageClass.hashCode()); + result = prime * result + version.hashCode(); return result; } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { + if (obj == null || getClass() != obj.getClass()) { return false; } TranslatorKey other = (TranslatorKey) obj; - if (messageClass == null) { - if (other.messageClass != null) { - return false; - } - } else if (!messageClass.equals(other.messageClass)) { - return false; - } - return version == other.version; + return Objects.equals(messageClass, other.messageClass) && version.equals(other.version); } - } diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/core/sal/BuildSwitchFeatures.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/core/sal/BuildSwitchFeatures.java index c6c7db85b4..177017fdb3 100644 --- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/core/sal/BuildSwitchFeatures.java +++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/core/sal/BuildSwitchFeatures.java @@ -18,7 +18,7 @@ public interface BuildSwitchFeatures { /** * Getter. * @param features - * {@link org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetFeaturesOutput} + * {@link org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetFeaturesOutput} * @return {@link org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.flow.node.SwitchFeatures} */ SwitchFeatures build(GetFeaturesOutput features); diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/util/OpenflowVersion.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/util/OpenflowVersion.java index b259e20dd6..fa27f93255 100644 --- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/util/OpenflowVersion.java +++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/util/OpenflowVersion.java @@ -7,6 +7,8 @@ */ package org.opendaylight.openflowplugin.api.openflow.md.util; +import static java.util.Objects.requireNonNull; + import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import java.util.Arrays; @@ -21,17 +23,17 @@ import org.opendaylight.yangtools.yang.common.Uint8; */ // FIXME: enum in api is not something what we would like to see in case it is evolving. public enum OpenflowVersion { - OF10((short)0x01), - OF13((short)0x04), - UNSUPPORTED((short)0x00); + OF10(Uint8.ONE), + OF13(Uint8.valueOf(4)), + UNSUPPORTED(Uint8.ZERO); private static final ImmutableMap VERSIONS = Maps.uniqueIndex(Arrays.asList(values()), - ver -> Uint8.valueOf(ver.version)); + OpenflowVersion::getVersion); - private short version; + private Uint8 version; - OpenflowVersion(final short version) { - this.version = version; + OpenflowVersion(final Uint8 version) { + this.version = requireNonNull(version); } public static OpenflowVersion get(final Uint8 version) { @@ -39,21 +41,12 @@ public enum OpenflowVersion { return ver != null ? ver : UNSUPPORTED; } - public static OpenflowVersion get(final Short version) { - for (final OpenflowVersion ofv : OpenflowVersion.values()) { - if (ofv.version == version) { - return ofv; - } - } - return UNSUPPORTED; - } - /** * Getter. * * @return the version */ - public short getVersion() { + public Uint8 getVersion() { return version; } } diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/protocol/deserialization/MessageCodeExperimenterKey.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/protocol/deserialization/MessageCodeExperimenterKey.java index 302a64ff5b..7daeaa6c4a 100644 --- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/protocol/deserialization/MessageCodeExperimenterKey.java +++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/protocol/deserialization/MessageCodeExperimenterKey.java @@ -7,11 +7,12 @@ */ package org.opendaylight.openflowplugin.api.openflow.protocol.deserialization; +import java.util.Objects; import org.opendaylight.openflowjava.protocol.api.keys.ExperimenterDeserializerKey; import org.opendaylight.openflowjava.protocol.api.keys.MessageCodeKey; +import org.opendaylight.yangtools.yang.common.Uint8; public class MessageCodeExperimenterKey extends MessageCodeKey implements ExperimenterDeserializerKey { - private final Long experimenterId; /** @@ -21,7 +22,8 @@ public class MessageCodeExperimenterKey extends MessageCodeKey implements Experi * @param clazz class of object that is going to be deserialized * @param experimenterId experimenter id */ - public MessageCodeExperimenterKey(short version, int value, Class clazz, Long experimenterId) { + public MessageCodeExperimenterKey(final Uint8 version, final int value, final Class clazz, + final Long experimenterId) { super(version, value, clazz); this.experimenterId = experimenterId; } @@ -37,27 +39,15 @@ public class MessageCodeExperimenterKey extends MessageCodeKey implements Experi } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } - if (obj == null) { - return false; - } if (!(obj instanceof MessageCodeExperimenterKey)) { return false; } MessageCodeExperimenterKey other = (MessageCodeExperimenterKey) obj; - - if (experimenterId == null) { - if (other.experimenterId != null) { - return false; - } - } else if (!experimenterId.equals(other.experimenterId)) { - return false; - } - - return super.equals(obj); + return Objects.equals(experimenterId, other.experimenterId) && super.equals(obj); } @Override diff --git a/openflowplugin-impl/pom.xml b/openflowplugin-impl/pom.xml index 4d8e7ee746..b65b82d446 100644 --- a/openflowplugin-impl/pom.xml +++ b/openflowplugin-impl/pom.xml @@ -46,7 +46,7 @@ model-flow-statistics - org.opendaylight.controller.model + org.opendaylight.openflowplugin.model model-inventory diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/common/MultipartReplyTranslatorUtil.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/common/MultipartReplyTranslatorUtil.java index 3e61d4f2ce..1724b6a5a4 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/common/MultipartReplyTranslatorUtil.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/common/MultipartReplyTranslatorUtil.java @@ -113,6 +113,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Table import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.multipart.reply.multipart.reply.body.MultipartReplyTableFeaturesBuilder; import org.opendaylight.yangtools.yang.binding.util.BindingMap; import org.opendaylight.yangtools.yang.common.Uint64; +import org.opendaylight.yangtools.yang.common.Uint8; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -201,7 +202,7 @@ public final class MultipartReplyTranslatorUtil { private static Optional translateTableFeatures(final MultipartReply msg, - final short version, final ConvertorExecutor convertorExecutor) { + final Uint8 version, final ConvertorExecutor convertorExecutor) { if (convertorExecutor == null) { return Optional.empty(); } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/common/MultipartRequestInputFactory.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/common/MultipartRequestInputFactory.java index 87334d00db..4cb4657007 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/common/MultipartRequestInputFactory.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/common/MultipartRequestInputFactory.java @@ -28,7 +28,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev13 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MultipartType; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmMatchType; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.MatchBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.v10.grouping.MatchV10Builder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartRequestInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartRequestInputBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader; @@ -57,6 +56,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.table.features._case.MultipartRequestTableFeaturesBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.experimenter.types.rev151020.multipart.request.multipart.request.body.MultipartRequestExperimenterBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.multipart.request.multipart.request.body.MultipartRequestQueueStatsBuilder; +import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint8; /** * openflowplugin-impl @@ -83,8 +84,8 @@ public final class MultipartRequestInputFactory { * @param canUseSingleLayer can use single layer serialization * @return multipart request */ - public static OfHeader makeMultipartRequest(final long xid, - final short version, + public static OfHeader makeMultipartRequest(final Uint32 xid, + final Uint8 version, @NonNull final MultipartType type, final boolean canUseSingleLayer) { return canUseSingleLayer @@ -130,8 +131,8 @@ public final class MultipartRequestInputFactory { } } - private static MultipartRequestBody makeDefaultMultiLayerBody(@NonNull final MultipartType type, - final short version) { + private static MultipartRequestBody makeDefaultMultiLayerBody(final @NonNull MultipartType type, + final Uint8 version) { switch (type) { case OFPMPDESC: return new MultipartRequestDescCaseBuilder().build(); @@ -145,16 +146,12 @@ public final class MultipartRequestInputFactory { multipartRequestFlowBuilder.setCookie(OFConstants.DEFAULT_COOKIE); multipartRequestFlowBuilder.setCookieMask(OFConstants.DEFAULT_COOKIE_MASK); - switch (version) { - case OFConstants.OFP_VERSION_1_0: - MatchV10Builder matchV10Builder = MatchUtil.createEmptyV10Match(); - multipartRequestFlowBuilder.setMatchV10(matchV10Builder.build()); - break; - case OFConstants.OFP_VERSION_1_3: - multipartRequestFlowBuilder.setMatch(new MatchBuilder().setType(OxmMatchType.class).build()); - break; - default: - throw new IllegalArgumentException("Unknown version " + version); + if (OFConstants.OFP_VERSION_1_0.equals(version)) { + multipartRequestFlowBuilder.setMatchV10(MatchUtil.createEmptyV10Match().build()); + } else if (OFConstants.OFP_VERSION_1_3.equals(version)) { + multipartRequestFlowBuilder.setMatch(new MatchBuilder().setType(OxmMatchType.class).build()); + } else { + throw new IllegalArgumentException("Unknown version " + version); } multipartRequestFlowCaseBuilder.setMultipartRequestFlow(multipartRequestFlowBuilder.build()); diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/connection/ConnectionContextImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/connection/ConnectionContextImpl.java index 95f20df881..5a44e12058 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/connection/ConnectionContextImpl.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/connection/ConnectionContextImpl.java @@ -7,6 +7,8 @@ */ package org.opendaylight.openflowplugin.impl.connection; +import static java.util.Objects.requireNonNull; + import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import java.util.ArrayList; @@ -30,6 +32,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.N import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.FeaturesReply; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PortStatusMessage; import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; +import org.opendaylight.yangtools.yang.common.Uint32; import org.opendaylight.yangtools.yang.common.Uint64; import org.opendaylight.yangtools.yang.common.Uint8; import org.slf4j.Logger; @@ -309,7 +312,7 @@ public class ConnectionContextImpl implements ConnectionContext { final OutboundQueue outboundQueueProvider) { this.nodeId = nodeId; this.nodeII = nodeII; - this.version = version; + this.version = requireNonNull(version); this.datapathId = datapathId; this.outboundQueueProvider = outboundQueueProvider; this.serviceGroupIdentifier = ServiceGroupIdentifier.create(this.nodeId.getValue()); @@ -326,8 +329,8 @@ public class ConnectionContextImpl implements ConnectionContext { } @Override - public short getVersion() { - return version.toJava(); + public Uint8 getVersion() { + return version; } @Override @@ -378,7 +381,7 @@ public class ConnectionContextImpl implements ConnectionContext { } @Override - public Long reserveXidForDeviceMessage() { + public Uint32 reserveXidForDeviceMessage() { return outboundQueueProvider.reserveEntry(); } } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/connection/HandshakeManagerImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/connection/HandshakeManagerImpl.java index 758782da5a..286db02bc1 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/connection/HandshakeManagerImpl.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/connection/HandshakeManagerImpl.java @@ -34,6 +34,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.hello.Elements; import org.opendaylight.yangtools.yang.common.RpcError; import org.opendaylight.yangtools.yang.common.RpcResult; +import org.opendaylight.yangtools.yang.common.Uint32; import org.opendaylight.yangtools.yang.common.Uint64; import org.opendaylight.yangtools.yang.common.Uint8; import org.slf4j.Logger; @@ -41,19 +42,20 @@ import org.slf4j.LoggerFactory; public class HandshakeManagerImpl implements HandshakeManager { private static final Logger LOG = LoggerFactory.getLogger(HandshakeManagerImpl.class); - private static final long ACTIVE_XID = 20L; + private static final Uint32 ACTIVE_XID = Uint32.valueOf(20); + private static final long MAX_XID = Uint32.MAX_VALUE.toJava(); - private Short lastProposedVersion; - private Short lastReceivedVersion; - private final List versionOrder; + private Uint8 lastProposedVersion; + private Uint8 lastReceivedVersion; + private final List versionOrder; private final ConnectionAdapter connectionAdapter; - private Short version; + private Uint8 version; private final ErrorHandler errorHandler; - private final Short highestVersion; + private final Uint8 highestVersion; - private Long activeXid; + private Uint32 activeXid; private final HandshakeListener handshakeListener; @@ -77,8 +79,8 @@ public class HandshakeManagerImpl implements HandshakeManager { * @param deviceConnectionHoldTime deivce connection hold time in seconds * @param deviceConnectionStatusProvider utility for maintaining device connection states */ - public HandshakeManagerImpl(final ConnectionAdapter connectionAdapter, final Short highestVersion, - final List versionOrder, final ErrorHandler errorHandler, + public HandshakeManagerImpl(final ConnectionAdapter connectionAdapter, final Uint8 highestVersion, + final List versionOrder, final ErrorHandler errorHandler, final HandshakeListener handshakeListener, final boolean useVersionBitmap, final DeviceConnectionRateLimiter deviceConnectionRateLimiter, final int deviceConnectionHoldTime, @@ -121,7 +123,7 @@ public class HandshakeManagerImpl implements HandshakeManager { // process the 2. and later hellos Uint8 remoteVersion = receivedHello.getVersion(); List elements = receivedHello.getElements(); - setActiveXid(receivedHello.getXid().toJava()); + setActiveXid(receivedHello.getXid()); List remoteVersionBitmap = MessageFactory.digVersions(elements); LOG.debug("Hello message: version={}, xid={}, bitmap={}", remoteVersion, receivedHello.getXid(), remoteVersionBitmap); @@ -131,7 +133,7 @@ public class HandshakeManagerImpl implements HandshakeManager { handleVersionBitmapNegotiation(elements); } else { // versionBitmap missing at least on one side -> STEP-BY-STEP NEGOTIATION applying - handleStepByStepVersionNegotiation(remoteVersion.toJava()); + handleStepByStepVersionNegotiation(remoteVersion); } } catch (Exception ex) { errorHandler.handleException(ex); @@ -146,7 +148,7 @@ public class HandshakeManagerImpl implements HandshakeManager { * @param remoteVersion remote version */ @SuppressWarnings("checkstyle:IllegalCatch") - private void handleStepByStepVersionNegotiation(final Short remoteVersion) { + private void handleStepByStepVersionNegotiation(final Uint8 remoteVersion) { LOG.debug("remoteVersion:{} lastProposedVersion:{}, highestVersion:{}", remoteVersion, lastProposedVersion, highestVersion); @@ -154,7 +156,7 @@ public class HandshakeManagerImpl implements HandshakeManager { // first hello has not been sent yet, send it and either wait for next remote // version or proceed lastProposedVersion = proposeNextVersion(remoteVersion); - final Long nextHelloXid = getNextXid(); + final Uint32 nextHelloXid = getNextXid(); ListenableFuture helloResult = sendHelloMessage(lastProposedVersion, nextHelloXid); Futures.addCallback(helloResult, new FutureCallback() { @Override @@ -178,14 +180,14 @@ public class HandshakeManagerImpl implements HandshakeManager { } } - private void stepByStepVersionSubStep(final Short remoteVersion) { - if (remoteVersion >= lastProposedVersion) { + private void stepByStepVersionSubStep(final Uint8 remoteVersion) { + if (remoteVersion.compareTo(lastProposedVersion) >= 0) { postHandshake(lastProposedVersion, getNextXid()); LOG.trace("ret - OK - switch answered with lastProposedVersion"); } else { checkNegotiationStalling(remoteVersion); - if (remoteVersion > (lastProposedVersion == null ? highestVersion : lastProposedVersion)) { + if (remoteVersion.compareTo(lastProposedVersion == null ? highestVersion : lastProposedVersion) > 0) { // wait for next version LOG.trace("ret - wait"); } else { @@ -201,10 +203,9 @@ public class HandshakeManagerImpl implements HandshakeManager { * @param remoteVersion remote version * @throws Exception exception */ - private void handleLowerVersionProposal(final Short remoteVersion) { - Short proposedVersion; + private void handleLowerVersionProposal(final Uint8 remoteVersion) { // find the version from header version field - proposedVersion = proposeNextVersion(remoteVersion); + final Uint8 proposedVersion = proposeNextVersion(remoteVersion); lastProposedVersion = proposedVersion; sendHelloMessage(proposedVersion, getNextXid()); @@ -223,10 +224,10 @@ public class HandshakeManagerImpl implements HandshakeManager { * @throws Exception exception */ private void handleVersionBitmapNegotiation(final List elements) { - final Short proposedVersion = proposeCommonBitmapVersion(elements); + final Uint8 proposedVersion = proposeCommonBitmapVersion(elements); if (lastProposedVersion == null) { // first hello has not been sent yet - Long nexHelloXid = getNextXid(); + Uint32 nexHelloXid = getNextXid(); ListenableFuture helloDone = sendHelloMessage(proposedVersion, nexHelloXid); Futures.addCallback(helloDone, new FutureCallback() { @Override @@ -247,12 +248,13 @@ public class HandshakeManagerImpl implements HandshakeManager { } } - private Long getNextXid() { - activeXid += 1; + private Uint32 getNextXid() { + final long next = activeXid.toJava() + 1; + activeXid = next == MAX_XID ? Uint32.ZERO : Uint32.valueOf(next); return activeXid; } - private void setActiveXid(final Long xid) { + private void setActiveXid(final Uint32 xid) { this.activeXid = xid; } @@ -261,7 +263,7 @@ public class HandshakeManagerImpl implements HandshakeManager { * * @param remoteVersion remove version */ - private void checkNegotiationStalling(final Short remoteVersion) { + private void checkNegotiationStalling(final Uint8 remoteVersion) { if (lastReceivedVersion != null && lastReceivedVersion.equals(remoteVersion)) { throw new IllegalStateException("version negotiation stalled: version = " + remoteVersion); } @@ -269,7 +271,7 @@ public class HandshakeManagerImpl implements HandshakeManager { } @Override - public Short getVersion() { + public Uint8 getVersion() { return version; } @@ -279,25 +281,27 @@ public class HandshakeManagerImpl implements HandshakeManager { * @param list bitmap list * @return proposed bitmap value */ - protected Short proposeCommonBitmapVersion(final List list) { - Short supportedHighestVersion = null; - if (null != list && 0 != list.size()) { - for (Elements element : list) { - List bitmap = element.getVersionBitmap(); - // check for version bitmap - for (short bitPos : OFConstants.VERSION_ORDER) { - // with all the version it should work. - if (bitmap.get(bitPos % Integer.SIZE)) { - supportedHighestVersion = bitPos; - break; - } + protected Uint8 proposeCommonBitmapVersion(final List list) { + if (list == null || list.isEmpty()) { + return null; + } + + Uint8 supportedHighestVersion = null; + for (Elements element : list) { + List bitmap = element.getVersionBitmap(); + // check for version bitmap + for (Uint8 bitPos : OFConstants.VERSION_ORDER) { + // with all the version it should work. + if (bitmap.get(bitPos.toJava() % Integer.SIZE)) { + supportedHighestVersion = bitPos; + break; } } + } - if (null == supportedHighestVersion) { - LOG.trace("versionBitmap: no common version found"); - throw new IllegalArgumentException("no common version found in versionBitmap"); - } + if (null == supportedHighestVersion) { + LOG.trace("versionBitmap: no common version found"); + throw new IllegalArgumentException("no common version found in versionBitmap"); } return supportedHighestVersion; @@ -309,10 +313,10 @@ public class HandshakeManagerImpl implements HandshakeManager { * @param remoteVersion openflow version supported by remote entity * @return openflow version */ - protected short proposeNextVersion(final short remoteVersion) { - Short proposal = null; - for (short offer : versionOrder) { - if (offer <= remoteVersion) { + protected Uint8 proposeNextVersion(final Uint8 remoteVersion) { + Uint8 proposal = null; + for (Uint8 offer : versionOrder) { + if (offer.compareTo(remoteVersion) <= 0) { proposal = offer; break; } @@ -330,9 +334,7 @@ public class HandshakeManagerImpl implements HandshakeManager { * @param helloVersion initial hello version for openflow connection negotiation * @param helloXid transaction id */ - private ListenableFuture sendHelloMessage(final Short helloVersion, final Long helloXid) { - - + private ListenableFuture sendHelloMessage(final Uint8 helloVersion, final Uint32 helloXid) { HelloInput helloInput = MessageFactory.createHelloInput(helloVersion, helloXid, versionOrder); final SettableFuture resultFtr = SettableFuture.create(); @@ -380,7 +382,7 @@ public class HandshakeManagerImpl implements HandshakeManager { * @param proposedVersion proposed openflow version * @param xid transaction id */ - protected void postHandshake(final Short proposedVersion, final Long xid) { + protected void postHandshake(final Uint8 proposedVersion, final Uint32 xid) { // set version version = proposedVersion; diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/connection/OutboundQueueProviderImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/connection/OutboundQueueProviderImpl.java index 37a94d220b..8fed6d8690 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/connection/OutboundQueueProviderImpl.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/connection/OutboundQueueProviderImpl.java @@ -8,34 +8,35 @@ package org.opendaylight.openflowplugin.impl.connection; +import static java.util.Objects.requireNonNull; + import com.google.common.util.concurrent.FutureCallback; import java.util.function.Function; -import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.openflowjava.protocol.api.connection.OutboundQueue; import org.opendaylight.openflowplugin.api.openflow.connection.OutboundQueueProvider; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.BarrierInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.BarrierInputBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader; +import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint8; import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class OutboundQueueProviderImpl implements OutboundQueueProvider { private static final Logger LOG = LoggerFactory.getLogger(OutboundQueueProviderImpl.class); - private final short ofVersion; + private final Uint8 ofVersion; private volatile OutboundQueue outboundQueue; - public OutboundQueueProviderImpl(final short ofVersion) { - this.ofVersion = ofVersion; + public OutboundQueueProviderImpl(final Uint8 ofVersion) { + this.ofVersion = requireNonNull(ofVersion); } - @NonNull @Override - public BarrierInput createBarrierRequest(@NonNull final Long xid) { - final BarrierInputBuilder biBuilder = new BarrierInputBuilder(); - biBuilder.setVersion(ofVersion); - biBuilder.setXid(xid); - return biBuilder.build(); - + public BarrierInput createBarrierRequest(final Uint32 xid) { + return new BarrierInputBuilder() + .setVersion(ofVersion) + .setXid(xid) + .build(); } @Override @@ -48,7 +49,7 @@ public class OutboundQueueProviderImpl implements OutboundQueueProvider { } @Override - public Long reserveEntry() { + public Uint32 reserveEntry() { for (;;) { OutboundQueue queue = outboundQueue; if (queue == null) { @@ -56,7 +57,7 @@ public class OutboundQueueProviderImpl implements OutboundQueueProvider { return null; } - final Long ret = queue.reserveEntry(); + final Uint32 ret = queue.reserveEntry(); if (ret != null) { return ret; } @@ -77,12 +78,12 @@ public class OutboundQueueProviderImpl implements OutboundQueueProvider { } @Override - public void commitEntry(final Long xid, final OfHeader message, final FutureCallback callback) { + public void commitEntry(final Uint32 xid, final OfHeader message, final FutureCallback callback) { outboundQueue.commitEntry(xid, message, callback); } @Override - public void commitEntry(final Long xid, final OfHeader message, final FutureCallback callback, + public void commitEntry(final Uint32 xid, final OfHeader message, final FutureCallback callback, final Function isComplete) { outboundQueue.commitEntry(xid, message, callback, isComplete); } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/connection/listener/HandshakeListenerImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/connection/listener/HandshakeListenerImpl.java index eba0c74391..f087f27440 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/connection/listener/HandshakeListenerImpl.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/connection/listener/HandshakeListenerImpl.java @@ -24,6 +24,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetFeaturesOutput; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint8; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,7 +50,7 @@ public class HandshakeListenerImpl implements HandshakeListener { } @Override - public void onHandshakeSuccessful(final GetFeaturesOutput featureOutput, final Short version) { + public void onHandshakeSuccessful(final GetFeaturesOutput featureOutput, final Uint8 version) { if (LOG.isDebugEnabled()) { LOG.debug("handshake succeeded: {}", connectionContext.getConnectionAdapter().getRemoteAddress()); } @@ -98,7 +99,7 @@ public class HandshakeListenerImpl implements HandshakeListener { }; } - private ListenableFuture> fireBarrier(final Short version, final Uint32 xid) { + private ListenableFuture> fireBarrier(final Uint8 version, final Uint32 xid) { final BarrierInput barrierInput = new BarrierInputBuilder() .setXid(xid) .setVersion(version) diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/connection/listener/SystemNotificationsListenerImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/connection/listener/SystemNotificationsListenerImpl.java index 91766ac26c..5bbfc273b4 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/connection/listener/SystemNotificationsListenerImpl.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/connection/listener/SystemNotificationsListenerImpl.java @@ -34,6 +34,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.system.rev130927.S import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.system.rev130927.SystemNotificationsListener; import org.opendaylight.yangtools.yang.common.RpcError; import org.opendaylight.yangtools.yang.common.RpcResult; +import org.opendaylight.yangtools.yang.common.Uint16; import org.opendaylight.yangtools.yang.common.Uint32; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -152,14 +153,12 @@ public class SystemNotificationsListenerImpl implements SystemNotificationsListe if (notification.getSwitchCertificate() != null) { switchCertificateBuilder = new SwitchCertificateBuilder(notification.getSwitchCertificate()); } - notificationPublishService - .offerNotification( - new SslErrorBuilder().setType(SslErrorType.SslConFailed) - .setCode(SslErrorType.SslConFailed.getIntValue()) - .setNodeIpAddress(ip) - .setData(notification.getInfo()) - .setSwitchCertificate(notification.getSwitchCertificate() != null - ? switchCertificateBuilder.build() : null) - .build()); + notificationPublishService.offerNotification(new SslErrorBuilder() + .setType(SslErrorType.SslConFailed) + .setCode(Uint16.valueOf(SslErrorType.SslConFailed.getIntValue())) + .setNodeIpAddress(ip) + .setData(notification.getInfo()) + .setSwitchCertificate(notification.getSwitchCertificate() != null ? switchCertificateBuilder.build() : null) + .build()); } } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/datastore/multipart/FlowStatsMultipartWriter.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/datastore/multipart/FlowStatsMultipartWriter.java index fe3b14eadd..3021348d89 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/datastore/multipart/FlowStatsMultipartWriter.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/datastore/multipart/FlowStatsMultipartWriter.java @@ -7,6 +7,8 @@ */ package org.opendaylight.openflowplugin.impl.datastore.multipart; +import static java.util.Objects.requireNonNull; + import org.opendaylight.openflowplugin.api.openflow.device.DeviceRegistry; import org.opendaylight.openflowplugin.api.openflow.device.TxFacade; import org.opendaylight.openflowplugin.api.openflow.registry.flow.FlowDescriptor; @@ -23,18 +25,19 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.F import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.flow.statistics.FlowStatisticsBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.opendaylight.yangtools.yang.common.Uint8; public class FlowStatsMultipartWriter extends AbstractMultipartWriter { private final DeviceRegistry registry; - private final short version; + private final Uint8 version; public FlowStatsMultipartWriter(final TxFacade txFacade, final InstanceIdentifier instanceIdentifier, final DeviceRegistry registry, - final short version) { + final Uint8 version) { super(txFacade, instanceIdentifier); this.registry = registry; - this.version = version; + this.version = requireNonNull(version); } @Override diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/datastore/multipart/MeterFeaturesMultipartWriter.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/datastore/multipart/MeterFeaturesMultipartWriter.java index ffaedc8b95..04c91e74fd 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/datastore/multipart/MeterFeaturesMultipartWriter.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/datastore/multipart/MeterFeaturesMultipartWriter.java @@ -5,18 +5,16 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.datastore.multipart; import org.opendaylight.openflowplugin.api.openflow.device.TxFacade; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.NodeMeterFeatures; import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.NodeMeterFeaturesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.nodes.node.MeterFeatures; +import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.node.meter.features.MeterFeatures; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; public class MeterFeaturesMultipartWriter extends AbstractMultipartWriter { - public MeterFeaturesMultipartWriter(final TxFacade txFacade, final InstanceIdentifier instanceIdentifier) { super(txFacade, instanceIdentifier); } @@ -28,12 +26,10 @@ public class MeterFeaturesMultipartWriter extends AbstractMultipartWriter { - public MeterStatsMultipartWriter(final TxFacade txFacade, final InstanceIdentifier instanceIdentifier) { super(txFacade, instanceIdentifier); } @@ -42,5 +41,4 @@ public class MeterStatsMultipartWriter extends AbstractMultipartWriter= OFConstants.OFP_VERSION_1_3; + return useSingleLayerSerialization && OFConstants.OFP_VERSION_1_3.compareTo(getDeviceInfo().getVersion()) <= 0; } @Override @@ -725,7 +726,7 @@ public class DeviceContextImpl implements DeviceContext, ExtensionConverterProvi @Override public RequestContext createRequestContext() { - final Long xid = deviceInfo.reserveXidForDeviceMessage(); + final Uint32 xid = deviceInfo.reserveXidForDeviceMessage(); final AbstractRequestContext abstractRequestContext = new AbstractRequestContext<>(xid) { @Override diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/SwitchFeaturesUtil.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/SwitchFeaturesUtil.java index 272b68f3d4..e71780330b 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/SwitchFeaturesUtil.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/SwitchFeaturesUtil.java @@ -15,6 +15,7 @@ import java.util.Map; import org.opendaylight.openflowplugin.api.openflow.md.core.sal.BuildSwitchFeatures; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.flow.node.SwitchFeatures; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetFeaturesOutput; +import org.opendaylight.yangtools.yang.common.Uint8; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -23,7 +24,7 @@ public final class SwitchFeaturesUtil { private static final Logger LOG = LoggerFactory.getLogger(SwitchFeaturesUtil.class); private static SwitchFeaturesUtil instance = new SwitchFeaturesUtil(); - private final Map swFeaturesBuilders; + private final Map swFeaturesBuilders; private SwitchFeaturesUtil() { swFeaturesBuilders = new HashMap<>(); @@ -44,14 +45,14 @@ public final class SwitchFeaturesUtil { * Returns the features of the switch. * * @param features - * {@link org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetFeaturesOutput} + * {@link org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetFeaturesOutput} * @return switch features */ public SwitchFeatures buildSwitchFeatures(final GetFeaturesOutput features) { - if (swFeaturesBuilders.containsKey(features.getVersion().toJava())) { + if (swFeaturesBuilders.containsKey(features.getVersion())) { LOG.debug("map contains version {}", features.getVersion()); try { - return swFeaturesBuilders.get(features.getVersion().toJava()).build(features); + return swFeaturesBuilders.get(features.getVersion()).build(features); } catch (NullPointerException e) { LOG.warn("error while building switch features: {}", e.getMessage()); LOG.debug("error while building switch features.. ", e); diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/initialization/DeviceInitializerProvider.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/initialization/DeviceInitializerProvider.java index 61382c5f84..6012fdecd3 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/initialization/DeviceInitializerProvider.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/initialization/DeviceInitializerProvider.java @@ -5,16 +5,15 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.device.initialization; import java.util.HashMap; import java.util.Map; import java.util.Optional; +import org.opendaylight.yangtools.yang.common.Uint8; public class DeviceInitializerProvider { - - private final Map initializers = new HashMap<>(); + private final Map initializers = new HashMap<>(); /** * Register device initializer. @@ -22,7 +21,7 @@ public class DeviceInitializerProvider { * @param version the initializer version * @param initializer the initializer instance */ - void register(final Short version, final AbstractDeviceInitializer initializer) { + void register(final Uint8 version, final AbstractDeviceInitializer initializer) { initializers.put(version, initializer); } @@ -32,7 +31,7 @@ public class DeviceInitializerProvider { * @param version the initializer version * @return the initializer instance */ - public Optional lookup(final Short version) { + public Optional lookup(final Uint8 version) { return Optional.ofNullable(initializers.get(version)); } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/ActionDeserializerInjector.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/ActionDeserializerInjector.java index a774be7b99..7262ec954c 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/ActionDeserializerInjector.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/ActionDeserializerInjector.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.protocol.deserialization; import java.util.function.Consumer; @@ -32,6 +31,7 @@ import org.opendaylight.openflowplugin.impl.protocol.deserialization.action.SetM import org.opendaylight.openflowplugin.impl.protocol.deserialization.action.SetNwTtlActionDeserializer; import org.opendaylight.openflowplugin.impl.protocol.deserialization.action.SetQueueActionDeserializer; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action; +import org.opendaylight.yangtools.yang.common.Uint8; public final class ActionDeserializerInjector { @@ -47,7 +47,7 @@ public final class ActionDeserializerInjector { static void injectDeserializers(final DeserializerExtensionProvider provider) { // Inject new message deserializers here using injector created by createInjector method final Function>> injector = - createInjector(provider, EncodeConstants.OF13_VERSION_ID); + createInjector(provider, EncodeConstants.OF_VERSION_1_3); injector.apply(ActionConstants.COPY_TTL_IN_CODE).accept(new CopyTtlInActionDeserializer()); injector.apply(ActionConstants.COPY_TTL_OUT_CODE).accept(new CopyTtlOutActionDeserializer()); @@ -76,11 +76,9 @@ public final class ActionDeserializerInjector { * @return injector */ private static Function>> createInjector( - final DeserializerExtensionProvider provider, - final short version) { + final DeserializerExtensionProvider provider, final Uint8 version) { return code -> deserializer -> provider.registerDeserializer( new MessageCodeExperimenterKey(version, code, Action.class, null), deserializer); } - } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/InstructionDeserializerInjector.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/InstructionDeserializerInjector.java index 89584a6eb4..1164321117 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/InstructionDeserializerInjector.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/InstructionDeserializerInjector.java @@ -23,6 +23,7 @@ import org.opendaylight.openflowplugin.impl.protocol.deserialization.instruction import org.opendaylight.openflowplugin.impl.protocol.deserialization.instruction.WriteMetadataInstructionDeserializer; import org.opendaylight.openflowplugin.impl.protocol.deserialization.key.MessageCodeActionExperimenterKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.Instruction; +import org.opendaylight.yangtools.yang.common.Uint8; public final class InstructionDeserializerInjector { @@ -38,7 +39,7 @@ public final class InstructionDeserializerInjector { static void injectDeserializers(final DeserializerExtensionProvider provider) { // Inject new instruction deserializers here using injector created by createInjector method final Function>>> injector = - createInjector(provider, EncodeConstants.OF13_VERSION_ID); + createInjector(provider, EncodeConstants.OF_VERSION_1_3); injector.apply(InstructionConstants.GOTO_TABLE_TYPE).apply(null).accept(new GoToTableInstructionDeserializer()); injector.apply(InstructionConstants.WRITE_METADATA_TYPE) @@ -64,8 +65,7 @@ public final class InstructionDeserializerInjector { * @return injector */ private static Function>>> createInjector( - final DeserializerExtensionProvider provider, - final short version) { + final DeserializerExtensionProvider provider, final Uint8 version) { return code -> actionPath -> deserializer -> provider.registerDeserializer(actionPath != null ? new MessageCodeActionExperimenterKey(version, code, diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/MatchDeserializerInjector.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/MatchDeserializerInjector.java index c14374373e..feb06088d6 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/MatchDeserializerInjector.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/MatchDeserializerInjector.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.protocol.deserialization; import com.google.common.annotations.VisibleForTesting; @@ -64,6 +63,7 @@ import org.opendaylight.openflowplugin.impl.protocol.deserialization.match.VlanP import org.opendaylight.openflowplugin.impl.protocol.deserialization.match.VlanVidEntryDeserializer; import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match; import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Util class for injecting new match entry deserializers into OpenflowJava. @@ -84,7 +84,7 @@ public final class MatchDeserializerInjector { final MatchDeserializer deserializer = new MatchDeserializer(path); provider.registerDeserializer( new MessageCodeMatchKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, EncodeConstants.EMPTY_LENGTH, Match.class, path), @@ -92,7 +92,7 @@ public final class MatchDeserializerInjector { // Inject new match entry serializers here using injector created by createInjector method final Function>>> injector = - createInjector(deserializer, EncodeConstants.OF13_VERSION_ID); + createInjector(deserializer, EncodeConstants.OF_VERSION_1_3); // Wrapped injector that uses OPENFLOW_BASIC_CLASS final Function> basicInjector = @@ -159,8 +159,7 @@ public final class MatchDeserializerInjector { */ @VisibleForTesting static Function>>> createInjector( - final MatchEntryDeserializerRegistry registry, - final short version) { + final MatchEntryDeserializerRegistry registry, final Uint8 version) { return oxmClass -> expId -> oxmField -> deserializer -> { final MatchEntryDeserializerKey key = new MatchEntryDeserializerKey(version, oxmClass, oxmField); key.setExperimenterId(expId); diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/MessageDeserializerInjector.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/MessageDeserializerInjector.java index ccd62b41b7..d78e0fa9ba 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/MessageDeserializerInjector.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/MessageDeserializerInjector.java @@ -37,6 +37,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PacketInMessage; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PortModInput; +import org.opendaylight.yangtools.yang.common.Uint8; final class MessageDeserializerInjector { @@ -52,7 +53,7 @@ final class MessageDeserializerInjector { static void injectDeserializers(final DeserializerExtensionProvider provider) { // Inject new message deserializers here using injector created by createInjector method final Function, Consumer>>> - injector = createInjector(provider, EncodeConstants.OF13_VERSION_ID); + injector = createInjector(provider, EncodeConstants.OF_VERSION_1_3); injector.apply(10).apply(org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709 .PacketInMessage.class).accept(new PacketInMessageDeserializer()); @@ -67,14 +68,14 @@ final class MessageDeserializerInjector { * @param provider OpenflowJava deserializer extension provider */ static void revertDeserializers(final DeserializerExtensionProvider provider) { - provider.unregisterDeserializerMapping(new TypeToClassKey(EncodeConstants.OF13_VERSION_ID, 10)); - provider.registerDeserializerMapping(new TypeToClassKey(EncodeConstants.OF13_VERSION_ID, 10), + provider.unregisterDeserializerMapping(new TypeToClassKey(EncodeConstants.OF_VERSION_1_3, 10)); + provider.registerDeserializerMapping(new TypeToClassKey(EncodeConstants.OF_VERSION_1_3, 10), PacketInMessage.class); - provider.unregisterDeserializerMapping(new TypeToClassKey(EncodeConstants.OF13_VERSION_ID, 19)); - provider.registerDeserializerMapping(new TypeToClassKey(EncodeConstants.OF13_VERSION_ID, 19), + provider.unregisterDeserializerMapping(new TypeToClassKey(EncodeConstants.OF_VERSION_1_3, 19)); + provider.registerDeserializerMapping(new TypeToClassKey(EncodeConstants.OF_VERSION_1_3, 19), MultipartReplyMessage.class); - provider.unregisterDeserializerMapping(new TypeToClassKey(EncodeConstants.OF13_VERSION_ID, 27)); - provider.registerDeserializerMapping(new TypeToClassKey(EncodeConstants.OF13_VERSION_ID, 27), + provider.unregisterDeserializerMapping(new TypeToClassKey(EncodeConstants.OF_VERSION_1_3, 27)); + provider.registerDeserializerMapping(new TypeToClassKey(EncodeConstants.OF_VERSION_1_3, 27), GetAsyncOutput.class); } @@ -88,9 +89,7 @@ final class MessageDeserializerInjector { */ @VisibleForTesting static Function, Consumer>>> - createInjector( - final DeserializerExtensionProvider provider, - final short version) { + createInjector(final DeserializerExtensionProvider provider, final Uint8 version) { return code -> retType -> deserializer -> { provider.unregisterDeserializerMapping(new TypeToClassKey(version, code)); provider.registerDeserializerMapping(new TypeToClassKey(version, code), retType); @@ -103,7 +102,7 @@ final class MessageDeserializerInjector { @VisibleForTesting static void injectLegacyDeserializers(final DeserializerExtensionProvider provider) { final Function, Consumer>>> - injector = createInjector(provider, EncodeConstants.OF13_VERSION_ID); + injector = createInjector(provider, EncodeConstants.OF_VERSION_1_3); injector.apply(14).apply(FlowMessage.class).accept(new FlowMessageDeserializer()); injector.apply(15).apply(GroupMessage.class).accept(new GroupMessageDeserializer()); @@ -113,19 +112,18 @@ final class MessageDeserializerInjector { @VisibleForTesting static void revertLegacyDeserializers(final DeserializerExtensionProvider provider) { - provider.unregisterDeserializerMapping(new TypeToClassKey(EncodeConstants.OF13_VERSION_ID, 14)); - provider.registerDeserializerMapping(new TypeToClassKey(EncodeConstants.OF13_VERSION_ID, 14), + provider.unregisterDeserializerMapping(new TypeToClassKey(EncodeConstants.OF_VERSION_1_3, 14)); + provider.registerDeserializerMapping(new TypeToClassKey(EncodeConstants.OF_VERSION_1_3, 14), FlowModInput.class); - provider.unregisterDeserializerMapping(new TypeToClassKey(EncodeConstants.OF13_VERSION_ID, 15)); - provider.registerDeserializerMapping(new TypeToClassKey(EncodeConstants.OF13_VERSION_ID, 15), + provider.unregisterDeserializerMapping(new TypeToClassKey(EncodeConstants.OF_VERSION_1_3, 15)); + provider.registerDeserializerMapping(new TypeToClassKey(EncodeConstants.OF_VERSION_1_3, 15), GroupModInput.class); - provider.unregisterDeserializerMapping(new TypeToClassKey(EncodeConstants.OF13_VERSION_ID, 29)); - provider.registerDeserializerMapping(new TypeToClassKey(EncodeConstants.OF13_VERSION_ID, 29), + provider.unregisterDeserializerMapping(new TypeToClassKey(EncodeConstants.OF_VERSION_1_3, 29)); + provider.registerDeserializerMapping(new TypeToClassKey(EncodeConstants.OF_VERSION_1_3, 29), MeterModInput.class); - provider.unregisterDeserializerMapping(new TypeToClassKey(EncodeConstants.OF13_VERSION_ID, 16)); - provider.registerDeserializerMapping(new TypeToClassKey(EncodeConstants.OF13_VERSION_ID, 16), + provider.unregisterDeserializerMapping(new TypeToClassKey(EncodeConstants.OF_VERSION_1_3, 16)); + provider.registerDeserializerMapping(new TypeToClassKey(EncodeConstants.OF_VERSION_1_3, 16), PortModInput.class); - provider.unregisterDeserializerMapping(new TypeToClassKey(EncodeConstants.OF13_VERSION_ID, 19)); + provider.unregisterDeserializerMapping(new TypeToClassKey(EncodeConstants.OF_VERSION_1_3, 19)); } - } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/MultipartDeserializerInjector.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/MultipartDeserializerInjector.java index 3200fc8366..ff7805999b 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/MultipartDeserializerInjector.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/MultipartDeserializerInjector.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.protocol.deserialization; import java.util.function.Consumer; @@ -31,6 +30,7 @@ import org.opendaylight.openflowplugin.impl.protocol.deserialization.multipart.M import org.opendaylight.openflowplugin.impl.protocol.deserialization.multipart.MultipartReplyTableFeaturesDeserializer; import org.opendaylight.yang.gen.v1.urn.opendaylight.multipart.types.rev170112.multipart.reply.MultipartReplyBody; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MultipartType; +import org.opendaylight.yangtools.yang.common.Uint8; final class MultipartDeserializerInjector { @@ -44,7 +44,7 @@ final class MultipartDeserializerInjector { * @param provider OpenflowJava deserializer extension provider */ static void injectDeserializers(final DeserializerExtensionProvider provider) { - final short version = EncodeConstants.OF13_VERSION_ID; + final Uint8 version = EncodeConstants.OF_VERSION_1_3; // Inject new multipart body deserializers here using injector created by createInjector method final Function>> injector = @@ -81,11 +81,8 @@ final class MultipartDeserializerInjector { * @return injector */ private static Function>> createInjector( - final DeserializerExtensionProvider provider, - final short version) { + final DeserializerExtensionProvider provider, final Uint8 version) { return code -> deserializer -> provider.registerDeserializer( - new MessageCodeKey(version, code, MultipartReplyBody.class), - deserializer); + new MessageCodeKey(version, code, MultipartReplyBody.class), deserializer); } - } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/OutputActionDeserializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/OutputActionDeserializer.java index 2510c2461b..e23858c0dd 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/OutputActionDeserializer.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/OutputActionDeserializer.java @@ -26,7 +26,7 @@ public class OutputActionDeserializer extends AbstractActionDeserializer { processHeader(message); final Uri portUri = OpenflowPortsUtil - .getProtocolAgnosticPortUri(EncodeConstants.OF13_VERSION_ID, message.readUnsignedInt()); + .getProtocolAgnosticPortUri(EncodeConstants.OF_VERSION_1_3, message.readUnsignedInt()); final Uint16 maxLength = readUint16(message); message.skipBytes(ActionConstants.OUTPUT_PADDING); diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/SetFieldActionDeserializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/SetFieldActionDeserializer.java index 884ceb2ffd..8484d19db4 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/SetFieldActionDeserializer.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/SetFieldActionDeserializer.java @@ -27,7 +27,7 @@ public class SetFieldActionDeserializer extends AbstractActionDeserializer implements DeserializerRegistryInjector { private static final MessageCodeKey MATCH_KEY = new MessageCodeMatchKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, EncodeConstants.EMPTY_LENGTH, Match.class, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH); @@ -35,7 +35,7 @@ public class SetFieldActionDeserializer extends AbstractActionDeserializer private DeserializerRegistry registry; @Override - public Action deserialize(ByteBuf message) { + public Action deserialize(final ByteBuf message) { final MatchEntryDeserializer deserializer = Preconditions.checkNotNull(registry).getDeserializer(MATCH_KEY); final MatchBuilder builder = new MatchBuilder(); @@ -54,13 +54,13 @@ public class SetFieldActionDeserializer extends AbstractActionDeserializer } @Override - public Action deserializeHeader(ByteBuf message) { + public Action deserializeHeader(final ByteBuf message) { processHeader(message); return new SetFieldCaseBuilder().build(); } @Override - public void injectDeserializerRegistry(DeserializerRegistry deserializerRegistry) { + public void injectDeserializerRegistry(final DeserializerRegistry deserializerRegistry) { registry = deserializerRegistry; } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/AbstractActionInstructionDeserializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/AbstractActionInstructionDeserializer.java index be2c99adba..00eb3c7efd 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/AbstractActionInstructionDeserializer.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/AbstractActionInstructionDeserializer.java @@ -66,7 +66,7 @@ public abstract class AbstractActionInstructionDeserializer extends AbstractInst while (message.readerIndex() - startIndex < instrLength) { actions.add(new ActionBuilder() .setOrder(offset++) - .setAction(ActionUtil.readAction(EncodeConstants.OF13_VERSION_ID, message, registry, actionPath)) + .setAction(ActionUtil.readAction(EncodeConstants.OF_VERSION_1_3, message, registry, actionPath)) .build()); } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/key/MessageCodeActionExperimenterKey.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/key/MessageCodeActionExperimenterKey.java index 839989000f..6a3e6296b4 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/key/MessageCodeActionExperimenterKey.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/key/MessageCodeActionExperimenterKey.java @@ -7,8 +7,10 @@ */ package org.opendaylight.openflowplugin.impl.protocol.deserialization.key; +import java.util.Objects; import org.opendaylight.openflowplugin.api.openflow.protocol.deserialization.MessageCodeExperimenterKey; import org.opendaylight.openflowplugin.extension.api.path.ActionPath; +import org.opendaylight.yangtools.yang.common.Uint8; public class MessageCodeActionExperimenterKey extends MessageCodeExperimenterKey { @@ -22,8 +24,8 @@ public class MessageCodeActionExperimenterKey extends MessageCodeExperimenterKey * @param clazz class of object that is going to be deserialized * @param experimenterId experimenter id */ - public MessageCodeActionExperimenterKey(short version, int value, Class clazz, ActionPath actionPath, Long - experimenterId) { + public MessageCodeActionExperimenterKey(final Uint8 version, final int value, final Class clazz, + final ActionPath actionPath, final Long experimenterId) { super(version, value, clazz, experimenterId); this.actionPath = actionPath; } @@ -39,27 +41,15 @@ public class MessageCodeActionExperimenterKey extends MessageCodeExperimenterKey } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } - if (obj == null) { - return false; - } if (!(obj instanceof MessageCodeActionExperimenterKey)) { return false; } MessageCodeActionExperimenterKey other = (MessageCodeActionExperimenterKey) obj; - - if (actionPath == null) { - if (other.actionPath != null) { - return false; - } - } else if (!actionPath.equals(other.actionPath)) { - return false; - } - - return super.equals(obj); + return Objects.equals(actionPath, other.actionPath) && super.equals(obj); } @Override diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/key/MessageCodeMatchKey.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/key/MessageCodeMatchKey.java index 75977a3546..2dbfa6f117 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/key/MessageCodeMatchKey.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/key/MessageCodeMatchKey.java @@ -7,11 +7,12 @@ */ package org.opendaylight.openflowplugin.impl.protocol.deserialization.key; +import java.util.Objects; import org.opendaylight.openflowjava.protocol.api.keys.MessageCodeKey; import org.opendaylight.openflowplugin.extension.api.path.MatchPath; +import org.opendaylight.yangtools.yang.common.Uint8; public class MessageCodeMatchKey extends MessageCodeKey { - private final MatchPath matchPath; /** @@ -22,7 +23,7 @@ public class MessageCodeMatchKey extends MessageCodeKey { * @param clazz class of object that is going to be deserialized * @param matchPath match extension path */ - public MessageCodeMatchKey(short version, int value, Class clazz, MatchPath matchPath) { + public MessageCodeMatchKey(final Uint8 version, final int value, final Class clazz, final MatchPath matchPath) { super(version, value, clazz); this.matchPath = matchPath; } @@ -38,22 +39,15 @@ public class MessageCodeMatchKey extends MessageCodeKey { } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } - if (obj == null) { - return false; - } if (!(obj instanceof MessageCodeMatchKey)) { return false; } MessageCodeMatchKey other = (MessageCodeMatchKey) obj; - if (matchPath == null) { - if (other.matchPath != null) { - return false; - } - } else if (!matchPath.equals(other.matchPath)) { + if (!Objects.equals(matchPath, other.matchPath)) { return false; } return super.equals(obj); diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/InPhyPortEntryDeserializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/InPhyPortEntryDeserializer.java index 3c7abcae83..8f06792756 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/InPhyPortEntryDeserializer.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/InPhyPortEntryDeserializer.java @@ -16,13 +16,13 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeCon public class InPhyPortEntryDeserializer extends AbstractMatchEntryDeserializer { @Override - public void deserializeEntry(ByteBuf message, MatchBuilder builder) { + public void deserializeEntry(final ByteBuf message, final MatchBuilder builder) { processHeader(message); final long port = message.readUnsignedInt(); if (builder.getInPhyPort() == null) { builder.setInPhyPort(new NodeConnectorId(OpenflowPortsUtil - .getProtocolAgnosticPortUri(EncodeConstants.OF13_VERSION_ID, port))); + .getProtocolAgnosticPortUri(EncodeConstants.OF_VERSION_1_3, port))); } else { throwErrorOnMalformed(builder, "inPhyPort"); } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/InPortEntryDeserializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/InPortEntryDeserializer.java index 680c34db6e..44fca03d13 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/InPortEntryDeserializer.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/InPortEntryDeserializer.java @@ -16,13 +16,13 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeCon public class InPortEntryDeserializer extends AbstractMatchEntryDeserializer { @Override - public void deserializeEntry(ByteBuf message, MatchBuilder builder) { + public void deserializeEntry(final ByteBuf message, final MatchBuilder builder) { processHeader(message); final long port = message.readUnsignedInt(); if (builder.getInPort() == null) { builder.setInPort(new NodeConnectorId(OpenflowPortsUtil.getProtocolAgnosticPortUri(EncodeConstants - .OF13_VERSION_ID, port))); + .OF_VERSION_1_3, port))); } else { throwErrorOnMalformed(builder, "inPort"); } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/Ipv6ExtHeaderEntryDeserializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/Ipv6ExtHeaderEntryDeserializer.java index e34d97d3d8..e88a46ad28 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/Ipv6ExtHeaderEntryDeserializer.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/Ipv6ExtHeaderEntryDeserializer.java @@ -10,8 +10,6 @@ package org.opendaylight.openflowplugin.impl.protocol.deserialization.match; import static org.opendaylight.yangtools.yang.common.netty.ByteBufUtils.readUint16; import io.netty.buffer.ByteBuf; -import org.opendaylight.openflowjava.protocol.impl.deserialization.match.OxmDeserializerHelper; -import org.opendaylight.openflowplugin.openflow.md.util.ByteUtil; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.MatchBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.ipv6.match.fields.Ipv6ExtHeaderBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._3.match.Ipv6Match; @@ -25,8 +23,7 @@ public class Ipv6ExtHeaderEntryDeserializer extends AbstractMatchEntryDeserializ .setIpv6Exthdr(readUint16(message)); if (hasMask) { - final byte[] mask = OxmDeserializerHelper.convertMask(message, Short.BYTES); - extHeaderBuilder.setIpv6ExthdrMask(ByteUtil.bytesToUnsignedShort(mask)); + extHeaderBuilder.setIpv6ExthdrMask(readUint16(message)); } if (builder.getLayer3Match() == null) { diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/MatchDeserializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/MatchDeserializer.java index 5fc45f6117..47ee1a6c77 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/MatchDeserializer.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/MatchDeserializer.java @@ -83,7 +83,7 @@ public class MatchDeserializer implements OFDeserializer, HeaderDeseriali int oxmField = inBuffer.getUnsignedByte(inBuffer.readerIndex() + Short.BYTES) >>> 1; final MatchEntryDeserializerKey key = new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, oxmClass, oxmField); + EncodeConstants.OF_VERSION_1_3, oxmClass, oxmField); if (oxmClass == EncodeConstants.EXPERIMENTER_VALUE) { long expId = inBuffer.getUnsignedInt(inBuffer.readerIndex() + Short.BYTES + 2 * Byte.BYTES); @@ -96,7 +96,7 @@ public class MatchDeserializer implements OFDeserializer, HeaderDeseriali entryDeserializer.deserializeEntry(inBuffer, builder); } else { final OFDeserializer deserializer = registry.getDeserializer(key); - MatchExtensionHelper.injectExtension(EncodeConstants.OF13_VERSION_ID, + MatchExtensionHelper.injectExtension(EncodeConstants.OF_VERSION_1_3, deserializer.deserialize(inBuffer), builder, matchPath); } } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/PbbEntryDeserializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/PbbEntryDeserializer.java index 7744a639ff..de23066fc3 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/PbbEntryDeserializer.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/PbbEntryDeserializer.java @@ -11,18 +11,19 @@ import io.netty.buffer.ByteBuf; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.MatchBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.ProtocolMatchFieldsBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.protocol.match.fields.PbbBuilder; +import org.opendaylight.yangtools.yang.common.Uint32; public class PbbEntryDeserializer extends AbstractMatchEntryDeserializer { @Override - public void deserializeEntry(ByteBuf message, MatchBuilder builder) { + public void deserializeEntry(final ByteBuf message, final MatchBuilder builder) { final boolean hasMask = processHeader(message); final long pbb = message.readUnsignedMedium(); final PbbBuilder pbbBuilder = new PbbBuilder() - .setPbbIsid(pbb); + .setPbbIsid(Uint32.valueOf(pbb)); if (hasMask) { - pbbBuilder.setPbbMask((long) message.readUnsignedMedium()); + pbbBuilder.setPbbMask(Uint32.valueOf(message.readUnsignedMedium())); } if (builder.getProtocolMatchFields() == null) { @@ -37,5 +38,4 @@ public class PbbEntryDeserializer extends AbstractMatchEntryDeserializer { throwErrorOnMalformed(builder, "protocolMatchFields", "pbb"); } } - } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/FlowMessageDeserializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/FlowMessageDeserializer.java index 3e259c50a4..bce42a8f69 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/FlowMessageDeserializer.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/FlowMessageDeserializer.java @@ -42,7 +42,7 @@ public class FlowMessageDeserializer implements OFDeserializer, Des private static final byte PADDING = 2; - private static final MessageCodeKey MATCH_KEY = new MessageCodeMatchKey(EncodeConstants.OF13_VERSION_ID, + private static final MessageCodeKey MATCH_KEY = new MessageCodeMatchKey(EncodeConstants.OF_VERSION_1_3, EncodeConstants.EMPTY_VALUE, Match.class, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH); @@ -86,13 +86,13 @@ public class FlowMessageDeserializer implements OFDeserializer, Des if (InstructionConstants.APPLY_ACTIONS_TYPE == type) { deserializer = Preconditions.checkNotNull(registry).getDeserializer( new MessageCodeActionExperimenterKey( - EncodeConstants.OF13_VERSION_ID, type, Instruction.class, + EncodeConstants.OF_VERSION_1_3, type, Instruction.class, ActionPath.INVENTORY_FLOWNODE_TABLE_APPLY_ACTIONS, null)); } else if (InstructionConstants.WRITE_ACTIONS_TYPE == type) { deserializer = Preconditions.checkNotNull(registry).getDeserializer( new MessageCodeActionExperimenterKey( - EncodeConstants.OF13_VERSION_ID, type, Instruction.class, + EncodeConstants.OF_VERSION_1_3, type, Instruction.class, ActionPath.INVENTORY_FLOWNODE_TABLE_WRITE_ACTIONS, null)); } else { @@ -104,7 +104,7 @@ public class FlowMessageDeserializer implements OFDeserializer, Des deserializer = Preconditions.checkNotNull(registry).getDeserializer( new MessageCodeExperimenterKey( - EncodeConstants.OF13_VERSION_ID, type, Instruction.class, expId)); + EncodeConstants.OF_VERSION_1_3, type, Instruction.class, expId)); } instructions.add(new InstructionBuilder() diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/GroupMessageDeserializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/GroupMessageDeserializer.java index 30f8f1fc96..1aa01fa653 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/GroupMessageDeserializer.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/GroupMessageDeserializer.java @@ -85,7 +85,7 @@ public class GroupMessageDeserializer implements OFDeserializer, D actions.add(new ActionBuilder() .withKey(new ActionKey(offset)) .setOrder(offset) - .setAction(ActionUtil.readAction(EncodeConstants.OF13_VERSION_ID, message, registry, + .setAction(ActionUtil.readAction(EncodeConstants.OF_VERSION_1_3, message, registry, ActionPath.GROUP_DESC_STATS_UPDATED_BUCKET_ACTION)) .build()); diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/MeterMessageDeserializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/MeterMessageDeserializer.java index b065a6f106..508217fa8e 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/MeterMessageDeserializer.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/MeterMessageDeserializer.java @@ -34,6 +34,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MeterModCommand; import org.opendaylight.yangtools.yang.binding.util.BindingMap; import org.opendaylight.yangtools.yang.binding.util.BindingMap.Builder; +import org.opendaylight.yangtools.yang.common.Uint32; public class MeterMessageDeserializer implements OFDeserializer, DeserializerRegistryInjector { private static final int OFPMBTDROP = 1; @@ -89,11 +90,11 @@ public class MeterMessageDeserializer implements OFDeserializer, D } case OFPMBTEXPERIMENTER: { // TODO: Finish meter band experimenter deserialization - long expId = message.getUnsignedInt(message.readerIndex() + 2 * Integer.BYTES); + final Uint32 expId = Uint32.fromIntBits(message.getInt(message.readerIndex() + 2 * Integer.BYTES)); message.readerIndex(bandStartIndex); OFDeserializer deserializer = registry.getDeserializer( - new ExperimenterIdDeserializerKey(EncodeConstants.OF13_VERSION_ID, expId, + new ExperimenterIdDeserializerKey(EncodeConstants.OF_VERSION_1_3, expId, Experimenter.class)); bandBuilder @@ -107,7 +108,7 @@ public class MeterMessageDeserializer implements OFDeserializer, D // no operation } - bands.add(bandBuilder.setBandId(new BandId(key++)).build()); + bands.add(bandBuilder.setBandId(new BandId(Uint32.valueOf(key++))).build()); } return builder diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/PacketInMessageDeserializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/PacketInMessageDeserializer.java index 6bbcd58b1d..2bfbb88417 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/PacketInMessageDeserializer.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/PacketInMessageDeserializer.java @@ -31,7 +31,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Table public class PacketInMessageDeserializer implements OFDeserializer, DeserializerRegistryInjector { private static final byte PADDING_IN_PACKET_IN_HEADER = 2; - private static final MessageCodeKey MATCH_KEY = new MessageCodeMatchKey(EncodeConstants.OF13_VERSION_ID, + private static final MessageCodeKey MATCH_KEY = new MessageCodeMatchKey(EncodeConstants.OF_VERSION_1_3, EncodeConstants.EMPTY_VALUE, Match.class, MatchPath.PACKET_IN_MESSAGE_MATCH); diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyExperimenterDeserializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyExperimenterDeserializer.java index 1aa5f5ccc3..514fae0b79 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyExperimenterDeserializer.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyExperimenterDeserializer.java @@ -5,9 +5,10 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.protocol.deserialization.multipart; +import static org.opendaylight.yangtools.yang.common.netty.ByteBufUtils.readUint32; + import io.netty.buffer.ByteBuf; import org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerRegistry; import org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerRegistryInjector; @@ -23,6 +24,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.multipart.types.rev170112.m import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.experimenter.core.ExperimenterDataOfChoice; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.experimenter.types.rev151020.experimenter.core.message.ExperimenterMessageOfChoice; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.experimenter.types.rev151020.multipart.reply.multipart.reply.body.MultipartReplyExperimenterBuilder; +import org.opendaylight.yangtools.yang.common.Uint32; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,25 +35,25 @@ public class MultipartReplyExperimenterDeserializer implements OFDeserializer deserializer = registry .getDeserializer(new ExperimenterIdTypeDeserializerKey( - EncodeConstants.OF13_VERSION_ID, expId, expType, ExperimenterMessageOfChoice.class)); + EncodeConstants.OF_VERSION_1_3, expId, expType, ExperimenterMessageOfChoice.class)); builder.setExperimenterMessageOfChoice(deserializer.deserialize(message)); } catch (ClassCastException | IllegalStateException es) { final OFDeserializer deserializer = registry.getDeserializer( ExperimenterDeserializerKeyFactory.createMultipartReplyMessageDeserializerKey( - EncodeConstants.OF13_VERSION_ID, expId, expType)); + EncodeConstants.OF_VERSION_1_3, expId, expType)); final ExperimenterDataOfChoice data = deserializer.deserialize(message); final MessageTypeKey key = new MessageTypeKey<>( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, (Class) data.implementedInterface()); final ConvertorMessageFromOFJava convertor = OFSessionUtil @@ -65,8 +67,7 @@ public class MultipartReplyExperimenterDeserializer implements OFDeserializer, DeserializerRegistryInjector { - private static final MessageCodeKey MATCH_KEY = new MessageCodeMatchKey(EncodeConstants.OF13_VERSION_ID, + private static final MessageCodeKey MATCH_KEY = new MessageCodeMatchKey(EncodeConstants.OF_VERSION_1_3, EncodeConstants.EMPTY_VALUE, Match.class, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH); @@ -101,7 +101,7 @@ public class MultipartReplyFlowStatsDeserializer implements OFDeserializer, DeserializerRegistryInjector { @@ -65,7 +66,7 @@ public class MultipartReplyGroupDescDeserializer implements OFDeserializer deserializer = Preconditions.checkNotNull(registry) - .getDeserializer(new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, - type, MultipartReplyBody.class)); + .getDeserializer(new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, type, MultipartReplyBody.class)); return new MultipartReplyBuilder() .setVersion(EncodeConstants.OF_VERSION_1_3) diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyMeterConfigDeserializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyMeterConfigDeserializer.java index 1f3b5876be..732b85096c 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyMeterConfigDeserializer.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyMeterConfigDeserializer.java @@ -35,6 +35,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.meter.band.headers.meter.band.header.MeterBandTypesBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.multipart.types.rev170112.multipart.reply.MultipartReplyBody; import org.opendaylight.yangtools.yang.binding.util.BindingMap; +import org.opendaylight.yangtools.yang.common.Uint32; public class MultipartReplyMeterConfigDeserializer implements OFDeserializer, DeserializerRegistryInjector { @@ -97,11 +98,12 @@ public class MultipartReplyMeterConfigDeserializer implements OFDeserializer deserializer = registry.getDeserializer( - new ExperimenterIdDeserializerKey(EncodeConstants.OF13_VERSION_ID, expId, + new ExperimenterIdDeserializerKey(EncodeConstants.OF_VERSION_1_3, expId, Experimenter.class)); subItemBuilder @@ -114,7 +116,8 @@ public class MultipartReplyMeterConfigDeserializer implements OFDeserializer 0) { final long port = message.readUnsignedInt(); final NodeConnectorId nodeConnectorId = new NodeConnectorId(OpenflowPortsUtil - .getProtocolAgnosticPortUri(EncodeConstants.OF13_VERSION_ID, port)); + .getProtocolAgnosticPortUri(EncodeConstants.OF_VERSION_1_3, port)); items.add(new QueueIdAndStatisticsMapBuilder() .setNodeConnectorId(nodeConnectorId) diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyTableFeaturesDeserializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyTableFeaturesDeserializer.java index ec850e0452..954796c48e 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyTableFeaturesDeserializer.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyTableFeaturesDeserializer.java @@ -63,6 +63,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.features.table.features.table.properties.TableFeaturePropertiesBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.features.table.features.table.properties.TableFeaturePropertiesKey; import org.opendaylight.yangtools.yang.binding.util.BindingMap; +import org.opendaylight.yangtools.yang.common.Uint32; import org.opendaylight.yangtools.yang.common.Uint8; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -245,12 +246,12 @@ public class MultipartReplyTableFeaturesDeserializer implements OFDeserializer propDeserializer = registry .getDeserializer(ExperimenterDeserializerKeyFactory - .createMultipartReplyTFDeserializerKey(EncodeConstants.OF13_VERSION_ID, expId)); + .createMultipartReplyTFDeserializerKey(EncodeConstants.OF_VERSION_1_3, expId)); // TODO: Finish experimenter table features (currently using OFJava deserialization only to skip // bytes) @@ -315,7 +316,7 @@ public class MultipartReplyTableFeaturesDeserializer implements OFDeserializer> codeToFieldMap = ImmutableMap .>builder() .put(new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.ARP_OP), ArpOp.class) .put(new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.ARP_SHA), ArpSha.class) .put(new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.ARP_SPA), ArpSpa.class) .put(new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.ARP_THA), ArpTha.class) .put(new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.ARP_TPA), ArpTpa.class) .put(new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.ETH_DST), EthDst.class) .put(new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.ETH_SRC), EthSrc.class) .put(new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.ICMPV4_CODE), Icmpv4Code.class) .put(new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.ICMPV4_TYPE), Icmpv4Type.class) .put(new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.ICMPV6_CODE), Icmpv6Code.class) .put(new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.ICMPV6_TYPE), Icmpv6Type.class) .put(new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.IN_PHY_PORT), InPhyPort.class) .put(new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.IN_PORT), InPort.class) .put(new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.IP_DSCP), IpDscp.class) .put(new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.IP_ECN), IpEcn.class) .put(new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.IP_PROTO), IpProto.class) .put(new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.IPV4_DST), Ipv4Dst.class) .put(new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.IPV4_SRC), Ipv4Src.class) .put(new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.IPV6_DST), Ipv6Dst.class) .put(new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.IPV6_SRC), Ipv6Src.class) .put(new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.IPV6_EXTHDR), Ipv6Exthdr.class) .put(new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.IPV6_FLABEL), Ipv6Flabel.class) .put(new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.IPV6_ND_SLL), Ipv6NdSll.class) .put(new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.IPV6_ND_TLL), Ipv6NdTll.class) .put(new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.IPV6_ND_TARGET), Ipv6NdTarget.class) .put(new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.METADATA), Metadata.class) .put(new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.MPLS_BOS), MplsBos.class) .put(new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.MPLS_LABEL), MplsLabel.class) .put(new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.MPLS_TC), MplsTc.class) .put(new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.PBB_ISID), PbbIsid.class) .put(new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.SCTP_DST), SctpDst.class) .put(new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.SCTP_SRC), SctpSrc.class) .put(new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.TCP_SRC), TcpSrc.class) .put(new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.TCP_DST), TcpDst.class) .put(new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.TUNNEL_ID), TunnelId.class) .put(new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.UDP_SRC), UdpSrc.class) .put(new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.UDP_DST), UdpDst.class) .put(new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.VLAN_PCP), VlanPcp.class) .put(new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.VLAN_VID), VlanVid.class) .put(new MatchEntryDeserializerKey( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.EXPERIMENTER_CLASS, OxmMatchConstants.NXM_NX_TCP_FLAG), TcpFlags.class) .build(); @@ -254,7 +254,7 @@ public class TableFeaturesMatchFieldDeserializer { final int oxmClass = message.getUnsignedShort(message.readerIndex()); final int oxmField = message.getUnsignedByte(message.readerIndex() + Short.BYTES) >>> 1; - final MatchEntryDeserializerKey key = new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, oxmClass, + final MatchEntryDeserializerKey key = new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, oxmClass, oxmField); if (oxmClass == EncodeConstants.EXPERIMENTER_VALUE) { key.setExperimenterId(Uint32.valueOf( diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/util/ActionUtil.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/util/ActionUtil.java index 9ef95ce1bf..0cfa49fcdb 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/util/ActionUtil.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/util/ActionUtil.java @@ -20,6 +20,7 @@ import org.opendaylight.openflowplugin.api.openflow.protocol.deserialization.Mes import org.opendaylight.openflowplugin.extension.api.path.ActionPath; import org.opendaylight.openflowplugin.openflow.md.core.extension.ActionExtensionHelper; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Utility class for action deserialization. @@ -38,8 +39,8 @@ public final class ActionUtil { * @param registry deserializer registry * @param path Action path */ - public static Action readAction(short version, ByteBuf message, DeserializerRegistry registry, - ActionPath path) { + public static Action readAction(final Uint8 version, final ByteBuf message, final DeserializerRegistry registry, + final ActionPath path) { int type = message.getUnsignedShort(message.readerIndex()); final Long expId; @@ -76,8 +77,8 @@ public final class ActionUtil { * @param registry deserializer registry * @param path Action path */ - public static Action readActionHeader(short version, ByteBuf message, DeserializerRegistry registry, - ActionPath path) { + public static Action readActionHeader(final Uint8 version, final ByteBuf message, + final DeserializerRegistry registry, final ActionPath path) { int type = message.getUnsignedShort(message.readerIndex()); final Long expId; @@ -105,7 +106,7 @@ public final class ActionUtil { } } - private static MessageCodeKey getCodeKey(short version, int type, Long expId) { + private static MessageCodeKey getCodeKey(final Uint8 version, final int type, final Long expId) { return expId != null ? new ExperimenterActionDeserializerKey(version, expId) : new ActionDeserializerKey(version, type, null); } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/util/InstructionUtil.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/util/InstructionUtil.java index 297535c9cc..1c6dcfd675 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/util/InstructionUtil.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/util/InstructionUtil.java @@ -18,6 +18,7 @@ import org.opendaylight.openflowplugin.api.openflow.protocol.deserialization.Mes import org.opendaylight.openflowplugin.extension.api.path.ActionPath; import org.opendaylight.openflowplugin.impl.protocol.deserialization.key.MessageCodeActionExperimenterKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.Instruction; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Utility class for action deserialization. @@ -34,8 +35,7 @@ public final class InstructionUtil { * @param message OpenFlow buffered message * @param registry deserializer registry */ - @SuppressWarnings("checkstyle:LineLength") - public static Instruction readInstruction(final short version, + public static Instruction readInstruction(final Uint8 version, final ByteBuf message, final DeserializerRegistry registry) { final int type = message.getUnsignedShort(message.readerIndex()); @@ -75,8 +75,7 @@ public final class InstructionUtil { * @param message OpenFlow buffered message * @param registry deserializer registry */ - @SuppressWarnings("checkstyle:LineLength") - public static Instruction readInstructionHeader(final short version, + public static Instruction readInstructionHeader(final Uint8 version, final ByteBuf message, final DeserializerRegistry registry) { final int type = message.getUnsignedShort(message.readerIndex()); diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/ActionSerializerInjector.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/ActionSerializerInjector.java index 4ed43cc124..e82642e151 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/ActionSerializerInjector.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/ActionSerializerInjector.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.protocol.serialization; import com.google.common.annotations.VisibleForTesting; @@ -70,6 +69,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.acti import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetVlanIdActionCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetVlanPcpActionCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.StripVlanActionCase; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Util class for injecting new action serializers into OpenflowJava. @@ -88,7 +88,7 @@ public final class ActionSerializerInjector { static void injectSerializers(final SerializerExtensionProvider provider) { // Inject new action serializers here using injector created by createInjector method final Function, Consumer>> injector = - createInjector(provider, EncodeConstants.OF13_VERSION_ID); + createInjector(provider, EncodeConstants.OF_VERSION_1_3); injector.apply(SetFieldCase.class).accept(new SetFieldActionSerializer()); injector.apply(CopyTtlInCase.class).accept(new CopyTtlInActionSerializer()); @@ -129,8 +129,7 @@ public final class ActionSerializerInjector { */ @VisibleForTesting static Function, Consumer>> createInjector( - final SerializerExtensionProvider provider, - final byte version) { + final SerializerExtensionProvider provider, final Uint8 version) { return type -> serializer -> provider.registerSerializer( new MessageTypeKey<>(version, type), diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/InstructionSerializerInjector.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/InstructionSerializerInjector.java index 74a9cc2b02..25e8a3c670 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/InstructionSerializerInjector.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/InstructionSerializerInjector.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.protocol.serialization; import com.google.common.annotations.VisibleForTesting; @@ -28,6 +27,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instru import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.instruction.MeterCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.instruction.WriteActionsCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.instruction.WriteMetadataCase; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Util class for injecting new instruction serializers into OpenflowJava. @@ -46,7 +46,7 @@ public final class InstructionSerializerInjector { static void injectSerializers(final SerializerExtensionProvider provider) { // Inject new instruction serializers here using injector created by createInjector method final Function, Consumer>> injector = - createInjector(provider, EncodeConstants.OF13_VERSION_ID); + createInjector(provider, EncodeConstants.OF_VERSION_1_3); injector.apply(ApplyActionsCase.class).accept(new ApplyActionsInstructionSerializer()); injector.apply(ClearActionsCase.class).accept(new ClearActionsInstructionSerializer()); injector.apply(GoToTableCase.class).accept(new GoToTableInstructionSerializer()); @@ -65,11 +65,8 @@ public final class InstructionSerializerInjector { */ @VisibleForTesting static Function, Consumer>> createInjector( - final SerializerExtensionProvider provider, - final byte version) { + final SerializerExtensionProvider provider, final Uint8 version) { return type -> serializer -> - provider.registerSerializer( - new MessageTypeKey<>(version, type), - serializer); + provider.registerSerializer(new MessageTypeKey<>(version, type), serializer); } } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/MatchSerializerInjector.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/MatchSerializerInjector.java index 08094d6e32..c803241650 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/MatchSerializerInjector.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/MatchSerializerInjector.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.protocol.serialization; import com.google.common.annotations.VisibleForTesting; @@ -81,9 +80,7 @@ public final class MatchSerializerInjector { */ static void injectSerializers(final SerializerExtensionProvider provider) { final MatchSerializer serializer = new MatchSerializer(); - provider.registerSerializer( - new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, Match.class), - serializer); + provider.registerSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, Match.class), serializer); // Inject all match entry serializers to match serializers using injector created by createInjector method final Function>> injector = diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/MessageSerializerInjector.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/MessageSerializerInjector.java index 3805d4cdd1..b29d232cd5 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/MessageSerializerInjector.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/MessageSerializerInjector.java @@ -28,6 +28,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.Group import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterMessage; import org.opendaylight.yang.gen.v1.urn.opendaylight.multipart.types.rev170112.MultipartRequest; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Util class for injecting new message serializers into OpenflowJava. @@ -46,7 +47,7 @@ final class MessageSerializerInjector { static void injectSerializers(final SerializerExtensionProvider provider, final boolean isGroupAddModEnabled) { // Inject new message serializers here using injector created by createInjector method final Function, Consumer>> injector = - createInjector(provider, EncodeConstants.OF13_VERSION_ID); + createInjector(provider, EncodeConstants.OF_VERSION_1_3); injector.apply(FlowMessage.class).accept(new FlowMessageSerializer()); injector.apply(MeterMessage.class).accept(new MeterMessageSerializer()); @@ -66,12 +67,9 @@ final class MessageSerializerInjector { */ @VisibleForTesting static Function, Consumer>> createInjector( - final SerializerExtensionProvider provider, - final byte version) { + final SerializerExtensionProvider provider, final Uint8 version) { return type -> serializer -> - provider.registerSerializer( - new MessageTypeKey<>(version, type), - serializer); + provider.registerSerializer(new MessageTypeKey<>(version, type), serializer); } } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/MultipartMatchFieldSerializerInjector.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/MultipartMatchFieldSerializerInjector.java index 46d2f7ef32..c3543e9b38 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/MultipartMatchFieldSerializerInjector.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/MultipartMatchFieldSerializerInjector.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.protocol.serialization; import com.google.common.annotations.VisibleForTesting; @@ -101,6 +100,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.UdpSr import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.VlanPcp; import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.VlanVid; import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.set.field.match.SetFieldMatch; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Util class for injecting new multipart match field serializers into OpenflowJava. @@ -119,7 +119,7 @@ final class MultipartMatchFieldSerializerInjector { static void injectSerializers(final SerializerExtensionProvider provider) { // Inject new message serializers here using injector created by createInjector method final Function, Consumer>> injector = - createInjector(provider, EncodeConstants.OF13_VERSION_ID); + createInjector(provider, EncodeConstants.OF_VERSION_1_3); injector.apply(ArpOp.class).accept(new ArpOpMatchFieldSerializer()); injector.apply(ArpSha.class).accept(new ArpShaMatchFieldSerializer()); @@ -177,12 +177,8 @@ final class MultipartMatchFieldSerializerInjector { */ @VisibleForTesting static Function, Consumer>> createInjector( - final SerializerExtensionProvider provider, - final byte version) { + final SerializerExtensionProvider provider, final Uint8 version) { return type -> serializer -> - provider.registerSerializer( - new MessageTypeKey<>(version, type), - serializer); + provider.registerSerializer(new MessageTypeKey<>(version, type), serializer); } - } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/MultipartSerializerInjector.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/MultipartSerializerInjector.java index 5482c81284..ee09b21cfd 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/MultipartSerializerInjector.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/MultipartSerializerInjector.java @@ -46,12 +46,12 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.experimenter import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.multipart.request.multipart.request.body.MultipartRequestPortStats; import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.multipart.request.multipart.request.body.MultipartRequestQueueStats; import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.multipart.request.multipart.request.body.MultipartRequestTableFeatures; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Util class for injecting new multipart serializers into OpenflowJava. */ final class MultipartSerializerInjector { - private MultipartSerializerInjector() { } @@ -65,7 +65,7 @@ final class MultipartSerializerInjector { // Inject new message serializers here using injector created by createInjector method final Function, Consumer>> injector = - createInjector(provider, EncodeConstants.OF13_VERSION_ID); + createInjector(provider, EncodeConstants.OF_VERSION_1_3); MultipartMatchFieldSerializerInjector.injectSerializers(provider); MultipartTableFeaturesSerializerInjector.injectSerializers(provider); @@ -99,11 +99,8 @@ final class MultipartSerializerInjector { @VisibleForTesting static Function, Consumer>> createInjector( - final SerializerExtensionProvider provider, final byte version) { + final SerializerExtensionProvider provider, final Uint8 version) { return type -> serializer -> - provider.registerSerializer( - new MessageTypeKey<>(version, type), - serializer); + provider.registerSerializer(new MessageTypeKey<>(version, type), serializer); } - } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/MultipartTableFeaturesSerializerInjector.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/MultipartTableFeaturesSerializerInjector.java index bb2b83eb6e..6d5cc79b1f 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/MultipartTableFeaturesSerializerInjector.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/MultipartTableFeaturesSerializerInjector.java @@ -44,6 +44,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.WriteActionsMiss; import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.WriteSetfield; import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.WriteSetfieldMiss; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Util class for injecting new multipart table features serializers into OpenflowJava. @@ -62,7 +63,7 @@ final class MultipartTableFeaturesSerializerInjector { static void injectSerializers(final SerializerExtensionProvider provider) { // Inject new message serializers here using injector created by createInjector method final Function, Consumer>> injector = - createInjector(provider, EncodeConstants.OF13_VERSION_ID); + createInjector(provider, EncodeConstants.OF_VERSION_1_3); injector.apply(Instructions.class).accept(new InstructionsTablePropertySerializer()); injector.apply(InstructionsMiss.class).accept(new InstructionsMissTablePropertySerializer()); @@ -91,12 +92,9 @@ final class MultipartTableFeaturesSerializerInjector { */ @VisibleForTesting static Function, Consumer>> createInjector( - final SerializerExtensionProvider provider, - final byte version) { + final SerializerExtensionProvider provider, final Uint8 version) { return type -> serializer -> - provider.registerSerializer( - new MessageTypeKey<>(version, type), - serializer); + provider.registerSerializer(new MessageTypeKey<>(version, type), serializer); } } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/actions/AbstractSetFieldActionSerializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/actions/AbstractSetFieldActionSerializer.java index b5b2a6a843..f03d13107f 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/actions/AbstractSetFieldActionSerializer.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/actions/AbstractSetFieldActionSerializer.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.protocol.serialization.actions; import com.google.common.base.Preconditions; @@ -21,13 +20,12 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.acti public abstract class AbstractSetFieldActionSerializer extends AbstractActionSerializer implements SerializerRegistryInjector { - private SerializerRegistry registry; @Override - public void serialize(Action input, ByteBuf outBuffer) { + public void serialize(final Action input, final ByteBuf outBuffer) { final OFSerializer serializer = Preconditions.checkNotNull(registry) - .getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, SetFieldCase.class)); + .getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, SetFieldCase.class)); serializer.serialize(buildAction(input), outBuffer); } @@ -52,8 +50,7 @@ public abstract class AbstractSetFieldActionSerializer extends AbstractActionSer } @Override - public void injectSerializerRegistry(SerializerRegistry serializerRegistry) { + public void injectSerializerRegistry(final SerializerRegistry serializerRegistry) { registry = serializerRegistry; } - } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/actions/SetFieldActionSerializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/actions/SetFieldActionSerializer.java index cfe0ca4d44..678c412505 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/actions/SetFieldActionSerializer.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/actions/SetFieldActionSerializer.java @@ -25,7 +25,7 @@ public class SetFieldActionSerializer extends AbstractActionSerializer serializer = Preconditions.checkNotNull(registry) - .getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, Match.class)); + .getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, Match.class)); serializer.serializeHeader(setField, outBuffer); // Serialize padding based on match length @@ -57,7 +57,7 @@ public class SetFieldActionSerializer extends AbstractActionSerializer extends AbstractInstructionSerializer implements SerializerRegistryInjector { @@ -36,7 +37,7 @@ public abstract class AbstractActionInstructionSerializer * @param outBuffer output buffer * @param startIndex start index of byte buffer */ - protected void writeActions(final ActionList actions, final short version, final ByteBuf outBuffer, + protected void writeActions(final ActionList actions, final Uint8 version, final ByteBuf outBuffer, final int startIndex) { if (actions != null) { final int lengthIndex = outBuffer.writerIndex(); diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/instructions/ApplyActionsInstructionSerializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/instructions/ApplyActionsInstructionSerializer.java index 02f7ac6163..ac253380b6 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/instructions/ApplyActionsInstructionSerializer.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/instructions/ApplyActionsInstructionSerializer.java @@ -16,10 +16,10 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instru public class ApplyActionsInstructionSerializer extends AbstractActionInstructionSerializer { @Override - public void serialize(ApplyActionsCase input, ByteBuf outBuffer) { + public void serialize(final ApplyActionsCase input, final ByteBuf outBuffer) { int index = outBuffer.writerIndex(); super.serialize(input, outBuffer); - writeActions(input.getApplyActions(), EncodeConstants.OF13_VERSION_ID, outBuffer,index); + writeActions(input.getApplyActions(), EncodeConstants.OF_VERSION_1_3, outBuffer,index); } @Override diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/instructions/WriteActionsInstructionSerializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/instructions/WriteActionsInstructionSerializer.java index 0241ae4155..d9fdb6b530 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/instructions/WriteActionsInstructionSerializer.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/instructions/WriteActionsInstructionSerializer.java @@ -16,10 +16,10 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instru public class WriteActionsInstructionSerializer extends AbstractActionInstructionSerializer { @Override - public void serialize(WriteActionsCase input, ByteBuf outBuffer) { + public void serialize(final WriteActionsCase input, final ByteBuf outBuffer) { int index = outBuffer.writerIndex(); super.serialize(input, outBuffer); - writeActions(input.getWriteActions(), EncodeConstants.OF13_VERSION_ID, outBuffer,index); + writeActions(input.getWriteActions(), EncodeConstants.OF_VERSION_1_3, outBuffer,index); } @Override diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/MatchSerializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/MatchSerializer.java index 0e1eb9bf05..cd9283713e 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/MatchSerializer.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/MatchSerializer.java @@ -28,7 +28,7 @@ import org.opendaylight.openflowplugin.extension.api.core.extension.ExtensionCon import org.opendaylight.openflowplugin.openflow.md.core.extension.ExtensionResolvers; import org.opendaylight.openflowplugin.openflow.md.core.session.OFSessionUtil; import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.ExperimenterClass; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.list.grouping.ExtensionList; @@ -108,7 +108,7 @@ public class MatchSerializer implements OFSerializer, HeaderSerializer key = new MatchEntrySerializerKey<>( - EncodeConstants.OF13_VERSION_ID, entry.getOxmClass(), entry.getOxmMatchField()); + EncodeConstants.OF_VERSION_1_3, entry.getOxmClass(), entry.getOxmMatchField()); // If entry is experimenter, set experimenter ID to key if (entry.getOxmClass().equals(ExperimenterClass.class)) { diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/FlowMessageSerializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/FlowMessageSerializer.java index cb91780b54..240a80e468 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/FlowMessageSerializer.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/FlowMessageSerializer.java @@ -162,8 +162,7 @@ public class FlowMessageSerializer extends AbstractMessageSerializer>getSerializer( - new MessageTypeKey<>(message.getVersion().toJava(), Match.class)).serialize(message.getMatch(), - outBuffer); + new MessageTypeKey<>(message.getVersion(), Match.class)).serialize(message.getMatch(), outBuffer); } /** @@ -193,7 +192,7 @@ public class FlowMessageSerializer extends AbstractMessageSerializer InstructionUtil.writeInstruction(i, EncodeConstants.OF13_VERSION_ID, registry, + flowInstructions.forEach(i -> InstructionUtil.writeInstruction(i, EncodeConstants.OF_VERSION_1_3, registry, outBuffer)); } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/MeterMessageSerializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/MeterMessageSerializer.java index d63a5179ba..6241e38387 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/MeterMessageSerializer.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/MeterMessageSerializer.java @@ -99,8 +99,8 @@ public class MeterMessageSerializer extends AbstractMessageSerializer key = - new ExperimenterIdSerializerKey<>(EncodeConstants.OF13_VERSION_ID, - band.getExperimenter().toJava(), (Class) type.implementedInterface()); + new ExperimenterIdSerializerKey<>(EncodeConstants.OF_VERSION_1_3, + band.getExperimenter(), (Class) type.implementedInterface()); final OFSerializer serializer = registry.getSerializer(key); try { diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestExperimenterSerializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestExperimenterSerializer.java index ea1bface7d..f079bed9a5 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestExperimenterSerializer.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestExperimenterSerializer.java @@ -37,7 +37,7 @@ public class MultipartRequestExperimenterSerializer implements OFSerializer serializer = registry.getSerializer(new MessageTypeKey<>( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, input.getExperimenterMessageOfChoice().implementedInterface())); try { @@ -58,8 +58,8 @@ public class MultipartRequestExperimenterSerializer implements OFSerializer serializer = registry.getSerializer( ExperimenterSerializerKeyFactory.createMultipartRequestSerializerKey( - EncodeConstants.OF13_VERSION_ID, converter.getExperimenterId().getValue().toJava(), - converter.getType())); + EncodeConstants.OF_VERSION_1_3, converter.getExperimenterId().getValue(), + converter.getType().toJava())); try { serializer.serialize(converter.convert(input.getExperimenterMessageOfChoice(), null), byteBuf); diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestFlowAggregateStatsSerializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestFlowAggregateStatsSerializer.java index 6ca6294333..b1ce9b132b 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestFlowAggregateStatsSerializer.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestFlowAggregateStatsSerializer.java @@ -43,7 +43,7 @@ public class MultipartRequestFlowAggregateStatsSerializer implements OFSerialize new FlowCookie(OFConstants.DEFAULT_COOKIE_MASK)).getValue().longValue()); Preconditions.checkNotNull(registry).>getSerializer( - new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, Match.class)) + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, Match.class)) .serialize(stats.getMatch(), byteBuf); } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestFlowStatsSerializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestFlowStatsSerializer.java index 37a856feac..65e94ffda7 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestFlowStatsSerializer.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestFlowStatsSerializer.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.protocol.serialization.multipart; import com.google.common.base.MoreObjects; @@ -43,7 +42,7 @@ public class MultipartRequestFlowStatsSerializer implements OFSerializer>getSerializer( - new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, Match.class)) + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, Match.class)) .serialize(stats.getMatch(), byteBuf); } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestMessageSerializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestMessageSerializer.java index 5a54984526..fb4649e170 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestMessageSerializer.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestMessageSerializer.java @@ -54,7 +54,7 @@ public class MultipartRequestMessageSerializer extends AbstractMessageSerializer final OFSerializer serializer = Preconditions.checkNotNull(registry) .getSerializer(new MessageTypeKey<>( - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, multipartRequestBody.implementedInterface())); serializer.serialize(multipartRequestBody, outBuffer); diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestTableFeaturesSerializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestTableFeaturesSerializer.java index 0913ce10b4..e27bc20c3e 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestTableFeaturesSerializer.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestTableFeaturesSerializer.java @@ -58,7 +58,7 @@ public class MultipartRequestTableFeaturesSerializer implements OFSerializer) property.getTableFeaturePropType().implementedInterface(); registry.>getSerializer( - new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, clazz)) + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, clazz)) .serialize(property.getTableFeaturePropType(), byteBuf); } } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplyActionsMissTablePropertySerializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplyActionsMissTablePropertySerializer.java index 52734f8e5c..3a74ec8730 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplyActionsMissTablePropertySerializer.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplyActionsMissTablePropertySerializer.java @@ -34,7 +34,7 @@ public class ApplyActionsMissTablePropertySerializer extends .forEach(action -> ActionUtil .writeActionHeader( action, - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, registry, byteBuf)); } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplyActionsTablePropertySerializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplyActionsTablePropertySerializer.java index 2bda2d9eba..1d2abbf88f 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplyActionsTablePropertySerializer.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplyActionsTablePropertySerializer.java @@ -35,7 +35,7 @@ public class ApplyActionsTablePropertySerializer extends AbstractTablePropertySe .forEach(action -> ActionUtil .writeActionHeader( action, - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, registry, byteBuf)); } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplySetfieldMissTablePropertySerializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplySetfieldMissTablePropertySerializer.java index 22a51ec358..cea5a739db 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplySetfieldMissTablePropertySerializer.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplySetfieldMissTablePropertySerializer.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.protocol.serialization.multipart.tablefeatures; import com.google.common.base.Preconditions; @@ -32,9 +31,7 @@ public class ApplySetfieldMissTablePropertySerializer extends .nonnullSetFieldMatch().values() .forEach(setFieldMatch -> Preconditions.checkNotNull(registry) .>getSerializer( - new MessageTypeKey<>( - EncodeConstants.OF13_VERSION_ID, - setFieldMatch.getMatchType())) + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, setFieldMatch.getMatchType())) .serialize(setFieldMatch, byteBuf)); } @@ -52,5 +49,4 @@ public class ApplySetfieldMissTablePropertySerializer extends public void injectSerializerRegistry(final SerializerRegistry serializerRegistry) { registry = serializerRegistry; } - } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplySetfieldTablePropertySerializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplySetfieldTablePropertySerializer.java index 0ce17c1d8a..8d5efc79d8 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplySetfieldTablePropertySerializer.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplySetfieldTablePropertySerializer.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.protocol.serialization.multipart.tablefeatures; import com.google.common.base.Preconditions; @@ -22,7 +21,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table public class ApplySetfieldTablePropertySerializer extends AbstractTablePropertySerializer implements SerializerRegistryInjector { - private SerializerRegistry registry; @Override @@ -32,9 +30,7 @@ public class ApplySetfieldTablePropertySerializer extends AbstractTablePropertyS .nonnullSetFieldMatch().values() .forEach(setFieldMatch -> Preconditions.checkNotNull(registry) .>getSerializer( - new MessageTypeKey<>( - EncodeConstants.OF13_VERSION_ID, - setFieldMatch.getMatchType())) + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, setFieldMatch.getMatchType())) .serialize(setFieldMatch, byteBuf)); } @@ -52,5 +48,4 @@ public class ApplySetfieldTablePropertySerializer extends AbstractTablePropertyS public void injectSerializerRegistry(final SerializerRegistry serializerRegistry) { registry = serializerRegistry; } - } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/InstructionsMissTablePropertySerializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/InstructionsMissTablePropertySerializer.java index 6c97371bc5..0ff0531965 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/InstructionsMissTablePropertySerializer.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/InstructionsMissTablePropertySerializer.java @@ -34,7 +34,7 @@ public class InstructionsMissTablePropertySerializer extends .forEach(instruction -> InstructionUtil .writeInstructionHeader( instruction, - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, registry, byteBuf)); } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/InstructionsTablePropertySerializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/InstructionsTablePropertySerializer.java index cf900fb058..aaf3e97dfb 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/InstructionsTablePropertySerializer.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/InstructionsTablePropertySerializer.java @@ -34,7 +34,7 @@ public class InstructionsTablePropertySerializer extends AbstractTablePropertySe .forEach(instruction -> InstructionUtil .writeInstructionHeader( instruction, - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, registry, byteBuf)); } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/MatchTablePropertySerializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/MatchTablePropertySerializer.java index cf7072137c..324e8e7dc5 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/MatchTablePropertySerializer.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/MatchTablePropertySerializer.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.protocol.serialization.multipart.tablefeatures; import com.google.common.base.Preconditions; @@ -32,9 +31,7 @@ public class MatchTablePropertySerializer extends AbstractTablePropertySerialize .nonnullSetFieldMatch().values() .forEach(setFieldMatch -> Preconditions.checkNotNull(registry) .>getSerializer( - new MessageTypeKey<>( - EncodeConstants.OF13_VERSION_ID, - setFieldMatch.getMatchType())) + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, setFieldMatch.getMatchType())) .serialize(setFieldMatch, byteBuf)); } @@ -52,5 +49,4 @@ public class MatchTablePropertySerializer extends AbstractTablePropertySerialize public void injectSerializerRegistry(final SerializerRegistry serializerRegistry) { registry = serializerRegistry; } - } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WildcardsTablePropertySerializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WildcardsTablePropertySerializer.java index 88c01dd3bb..8983a48a9f 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WildcardsTablePropertySerializer.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WildcardsTablePropertySerializer.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.protocol.serialization.multipart.tablefeatures; import com.google.common.base.Preconditions; @@ -32,9 +31,7 @@ public class WildcardsTablePropertySerializer extends AbstractTablePropertySeria .nonnullSetFieldMatch().values() .forEach(setFieldMatch -> Preconditions.checkNotNull(registry) .>getSerializer( - new MessageTypeKey<>( - EncodeConstants.OF13_VERSION_ID, - setFieldMatch.getMatchType())) + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, setFieldMatch.getMatchType())) .serialize(setFieldMatch, byteBuf)); } @@ -52,5 +49,4 @@ public class WildcardsTablePropertySerializer extends AbstractTablePropertySeria public void injectSerializerRegistry(final SerializerRegistry serializerRegistry) { registry = serializerRegistry; } - } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WriteActionsMissTablePropertySerializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WriteActionsMissTablePropertySerializer.java index 30bd3d874b..d6d907d10e 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WriteActionsMissTablePropertySerializer.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WriteActionsMissTablePropertySerializer.java @@ -34,7 +34,7 @@ public class WriteActionsMissTablePropertySerializer extends .forEach(action -> ActionUtil .writeActionHeader( action, - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, registry, byteBuf)); } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WriteActionsTablePropertySerializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WriteActionsTablePropertySerializer.java index f990fba6ce..a37bac5a7a 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WriteActionsTablePropertySerializer.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WriteActionsTablePropertySerializer.java @@ -35,7 +35,7 @@ public class WriteActionsTablePropertySerializer extends AbstractTablePropertySe .forEach(action -> ActionUtil .writeActionHeader( action, - EncodeConstants.OF13_VERSION_ID, + EncodeConstants.OF_VERSION_1_3, registry, byteBuf)); } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WriteSetfieldMissTablePropertySerializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WriteSetfieldMissTablePropertySerializer.java index ce8d2bee75..d3d5efa4ad 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WriteSetfieldMissTablePropertySerializer.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WriteSetfieldMissTablePropertySerializer.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.protocol.serialization.multipart.tablefeatures; import com.google.common.base.Preconditions; @@ -22,7 +21,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table public class WriteSetfieldMissTablePropertySerializer extends AbstractTablePropertySerializer implements SerializerRegistryInjector { - private SerializerRegistry registry; @Override @@ -32,9 +30,7 @@ public class WriteSetfieldMissTablePropertySerializer extends .nonnullSetFieldMatch().values() .forEach(setFieldMatch -> Preconditions.checkNotNull(registry) .>getSerializer( - new MessageTypeKey<>( - EncodeConstants.OF13_VERSION_ID, - setFieldMatch.getMatchType())) + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, setFieldMatch.getMatchType())) .serialize(setFieldMatch, byteBuf)); } @@ -52,5 +48,4 @@ public class WriteSetfieldMissTablePropertySerializer extends public void injectSerializerRegistry(final SerializerRegistry serializerRegistry) { registry = serializerRegistry; } - } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WriteSetfieldTablePropertySerializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WriteSetfieldTablePropertySerializer.java index d69e7a0805..92ca92d224 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WriteSetfieldTablePropertySerializer.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WriteSetfieldTablePropertySerializer.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.protocol.serialization.multipart.tablefeatures; import com.google.common.base.Preconditions; @@ -32,9 +31,7 @@ public class WriteSetfieldTablePropertySerializer extends AbstractTablePropertyS .nonnullSetFieldMatch().values() .forEach(setFieldMatch -> Preconditions.checkNotNull(registry) .>getSerializer( - new MessageTypeKey<>( - EncodeConstants.OF13_VERSION_ID, - setFieldMatch.getMatchType())) + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, setFieldMatch.getMatchType())) .serialize(setFieldMatch, byteBuf)); } @@ -52,5 +49,4 @@ public class WriteSetfieldTablePropertySerializer extends AbstractTablePropertyS public void injectSerializerRegistry(final SerializerRegistry serializerRegistry) { registry = serializerRegistry; } - } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/util/ActionUtil.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/util/ActionUtil.java index 3eb271a6ad..72efe38e1f 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/util/ActionUtil.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/util/ActionUtil.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.protocol.serialization.util; import io.netty.buffer.ByteBuf; @@ -24,6 +23,7 @@ import org.opendaylight.openflowplugin.openflow.md.core.session.OFSessionUtil; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.ExtensionKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.GeneralExtensionGrouping; +import org.opendaylight.yangtools.yang.common.Uint8; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,7 +46,8 @@ public final class ActionUtil { * @param outBuffer output buffer */ @SuppressWarnings("unchecked") - public static void writeAction(Action action, short version, SerializerRegistry registry, ByteBuf outBuffer) { + public static void writeAction(final Action action, final Uint8 version, final SerializerRegistry registry, + final ByteBuf outBuffer) { try { Optional.ofNullable(OFSessionUtil.getExtensionConvertorProvider()) .flatMap(provider -> @@ -85,7 +86,8 @@ public final class ActionUtil { * @param outBuffer output buffer */ @SuppressWarnings("unchecked") - public static void writeActionHeader(Action action, short version, SerializerRegistry registry, ByteBuf outBuffer) { + public static void writeActionHeader(final Action action, final Uint8 version, final SerializerRegistry registry, + final ByteBuf outBuffer) { try { Optional.ofNullable(OFSessionUtil.getExtensionConvertorProvider()) .flatMap(provider -> @@ -130,7 +132,7 @@ public final class ActionUtil { private static Optional convertExtensionGrouping(final ExtensionConverterProvider provider, final GeneralExtensionGrouping action, - final short version) { + final Uint8 version) { final ConverterExtensionKey key = new ConverterExtensionKey<>(action.getExtensionKey(), version); @@ -151,7 +153,7 @@ public final class ActionUtil { private static Optional convertGenericAction(final ExtensionConverterProvider provider, final Action action, - final short version) { + final Uint8 version) { final TypeVersionKey key = new TypeVersionKey<>((Class) action.implementedInterface(), version); diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/util/InstructionUtil.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/util/InstructionUtil.java index dce5bde7bf..0913633768 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/util/InstructionUtil.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/util/InstructionUtil.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.protocol.serialization.util; import io.netty.buffer.ByteBuf; @@ -14,6 +13,7 @@ import org.opendaylight.openflowjava.protocol.api.extensibility.OFSerializer; import org.opendaylight.openflowjava.protocol.api.extensibility.SerializerRegistry; import org.opendaylight.openflowjava.protocol.api.keys.MessageTypeKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.Instruction; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Utility class for instruction serialization. @@ -33,18 +33,14 @@ public final class InstructionUtil { */ @SuppressWarnings("unchecked") public static void writeInstruction(final Instruction instruction, - final short version, + final Uint8 version, final SerializerRegistry registry, final ByteBuf outBuffer) { - registry.>getSerializer( - new MessageTypeKey<>( - version, - (Class) instruction.implementedInterface())) + new MessageTypeKey<>(version, (Class) instruction.implementedInterface())) .serialize(instruction, outBuffer); } - /** * Serialize instruction header. * @@ -55,15 +51,11 @@ public final class InstructionUtil { */ @SuppressWarnings("unchecked") public static void writeInstructionHeader(final Instruction instruction, - final short version, + final Uint8 version, final SerializerRegistry registry, final ByteBuf outBuffer) { - registry.>getSerializer( - new MessageTypeKey<>( - version, - (Class) instruction.implementedInterface())) + new MessageTypeKey<>(version, (Class) instruction.implementedInterface())) .serializeHeader(instruction, outBuffer); } - } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/flow/DeviceFlowRegistryImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/flow/DeviceFlowRegistryImpl.java index 122a50dad4..e71e10bd88 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/flow/DeviceFlowRegistryImpl.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/flow/DeviceFlowRegistryImpl.java @@ -62,7 +62,7 @@ public class DeviceFlowRegistryImpl implements DeviceFlowRegistry { private final Consumer flowConsumer; private final DataBroker dataBroker; - public DeviceFlowRegistryImpl(final short version, final DataBroker dataBroker, + public DeviceFlowRegistryImpl(final Uint8 version, final DataBroker dataBroker, final KeyedInstanceIdentifier instanceIdentifier, final FlowGroupInfoHistoryAppender history) { this.dataBroker = requireNonNull(dataBroker); diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/flow/FlowRegistryKeyFactory.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/flow/FlowRegistryKeyFactory.java index f695ac656b..fdf28ad398 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/flow/FlowRegistryKeyFactory.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/flow/FlowRegistryKeyFactory.java @@ -36,7 +36,7 @@ public final class FlowRegistryKeyFactory { } @NonNull - public static FlowRegistryKey create(final short version, @NonNull final Flow flow) { + public static FlowRegistryKey create(final Uint8 version, @NonNull final Flow flow) { //TODO: mandatory flow input values (or default values) should be specified via yang model final Uint8 tableId = Preconditions.checkNotNull(flow.getTableId(), "flow tableId must not be null"); final Uint16 priority = MoreObjects.firstNonNull(flow.getPriority(), OFConstants.DEFAULT_FLOW_PRIORITY); diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/role/RoleContextImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/role/RoleContextImpl.java index 097fa8cf58..286219fc32 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/role/RoleContextImpl.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/role/RoleContextImpl.java @@ -155,7 +155,7 @@ public class RoleContextImpl implements RoleContext { } LOG.debug("Sending new role {} to device {}", newRole, deviceInfo); - if (deviceInfo.getVersion() >= OFConstants.OFP_VERSION_1_3) { + if (OFConstants.OFP_VERSION_1_3.compareTo(deviceInfo.getVersion()) <= 0) { final SetRoleInput setRoleInput = new SetRoleInputBuilder() .setControllerRole(newRole) .setNode(new NodeRef(deviceInfo.getNodeInstanceIdentifier())) diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImpl.java index 19d4ef6e1e..3ac23e840c 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImpl.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImpl.java @@ -129,7 +129,7 @@ class RpcContextImpl implements RpcContext { nodeInstanceIdentifier.getKey().getId().getValue(), tracker.availablePermits()); } - final Long xid = deviceInfo.reserveXidForDeviceMessage(); + final Uint32 xid = deviceInfo.reserveXidForDeviceMessage(); if (xid == null) { LOG.warn("Xid cannot be reserved for new RequestContext, node:{}", nodeInstanceIdentifier.getKey().getId().getValue()); @@ -137,7 +137,7 @@ class RpcContextImpl implements RpcContext { return null; } - return new AbstractRequestContext<>(Uint32.valueOf(xid)) { + return new AbstractRequestContext<>(xid) { @Override public void close() { tracker.release(); diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/AbstractMultipartCollectorService.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/AbstractMultipartCollectorService.java index 8318a7eea5..11930a2257 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/AbstractMultipartCollectorService.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/AbstractMultipartCollectorService.java @@ -54,7 +54,7 @@ public abstract class AbstractMultipartCollectorService @Override protected OfHeader buildRequest(final Xid xid, final MultipartType input) { - return MultipartRequestInputFactory.makeMultipartRequest(xid.getValue().toJava(), + return MultipartRequestInputFactory.makeMultipartRequest(xid.getValue(), getVersion(), input, canUseSingleLayerSerialization()); diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/AbstractService.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/AbstractService.java index 7bd326fe50..d5a99fa8aa 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/AbstractService.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/AbstractService.java @@ -32,14 +32,16 @@ import org.opendaylight.yangtools.yang.binding.DataContainer; import org.opendaylight.yangtools.yang.common.RpcError; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; +import org.opendaylight.yangtools.yang.common.Uint32; import org.opendaylight.yangtools.yang.common.Uint64; +import org.opendaylight.yangtools.yang.common.Uint8; import org.slf4j.Logger; import org.slf4j.LoggerFactory; public abstract class AbstractService { private static final Logger LOG = LoggerFactory.getLogger(AbstractService.class); - private final short version; + private final Uint8 version; private final Uint64 datapathId; private final RequestContextStack requestContextStack; private final DeviceContext deviceContext; @@ -68,7 +70,7 @@ public abstract class AbstractService { this.eventIdentifier = eventIdentifier; } - public short getVersion() { + public Uint8 getVersion() { return version; } @@ -156,8 +158,7 @@ public abstract class AbstractService { final OutboundQueue outboundQueue = getDeviceContext().getPrimaryConnectionContext().getOutboundQueueProvider(); - // FIXME: reconcile uint32 vs. Long overflows - final Long queueXid = xid.getValue().toJava(); + final Uint32 queueXid = xid.getValue(); if (isComplete != null) { outboundQueue.commitEntry(queueXid, request, createCallback(requestContext, requestType), isComplete); } else { diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/RoleService.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/RoleService.java index f7a3adbec7..6cbae9a91b 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/RoleService.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/RoleService.java @@ -31,6 +31,7 @@ import org.opendaylight.yangtools.yang.common.RpcError; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; import org.opendaylight.yangtools.yang.common.Uint64; +import org.opendaylight.yangtools.yang.common.Uint8; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -52,7 +53,7 @@ public class RoleService extends AbstractSimpleService getGenerationIdFromDevice(final Short version) { + public ListenableFuture getGenerationIdFromDevice(final Uint8 version) { LOG.info("getGenerationIdFromDevice called for device: {}", getDeviceInfo().getNodeId().getValue()); // send a dummy no-change role request to get the generation-id of the switch @@ -96,7 +97,7 @@ public class RoleService extends AbstractSimpleService> submitRoleChange(final OfpRole ofpRole, final Short version, + public ListenableFuture> submitRoleChange(final OfpRole ofpRole, final Uint8 version, final Uint64 generationId) { LOG.info("submitRoleChange called for device:{}, role:{}", getDeviceInfo().getNodeId(), ofpRole); diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/batch/FlatBatchFlowAdapters.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/batch/FlatBatchFlowAdapters.java index aa345f742c..05677b9382 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/batch/FlatBatchFlowAdapters.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/batch/FlatBatchFlowAdapters.java @@ -15,13 +15,13 @@ import com.google.common.util.concurrent.MoreExecutors; import java.util.Map; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.ProcessFlatBatchOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.ProcessFlatBatchOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.add.flow._case.FlatBatchAddFlow; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.remove.flow._case.FlatBatchRemoveFlow; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.update.flow._case.FlatBatchUpdateFlow; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.failure.ids.aug.FlatBatchFailureFlowIdCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.flat.batch.add.flow._case.FlatBatchAddFlow; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.flat.batch.remove.flow._case.FlatBatchRemoveFlow; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.flat.batch.update.flow._case.FlatBatchUpdateFlow; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.output.BatchFailure; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.output.BatchFailureBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.output.BatchFailureKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.output.batch.failure.batch.item.id.choice.FlatBatchFailureFlowIdCaseBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.Flow; import org.opendaylight.yang.gen.v1.urn.opendaylight.flows.service.rev160314.AddFlowsBatchInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.flows.service.rev160314.AddFlowsBatchInputBuilder; diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/batch/FlatBatchGroupAdapters.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/batch/FlatBatchGroupAdapters.java index 4f913252d9..6217982565 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/batch/FlatBatchGroupAdapters.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/batch/FlatBatchGroupAdapters.java @@ -17,13 +17,13 @@ import java.util.List; import java.util.Map; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.ProcessFlatBatchOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.ProcessFlatBatchOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.add.group._case.FlatBatchAddGroup; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.remove.group._case.FlatBatchRemoveGroup; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.update.group._case.FlatBatchUpdateGroup; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.failure.ids.aug.FlatBatchFailureGroupIdCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.flat.batch.add.group._case.FlatBatchAddGroup; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.flat.batch.remove.group._case.FlatBatchRemoveGroup; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.flat.batch.update.group._case.FlatBatchUpdateGroup; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.output.BatchFailure; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.output.BatchFailureBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.output.BatchFailureKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.output.batch.failure.batch.item.id.choice.FlatBatchFailureGroupIdCaseBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.groups.service.rev160315.AddGroupsBatchInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.groups.service.rev160315.AddGroupsBatchInputBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.groups.service.rev160315.BatchGroupOutputListGrouping; diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/batch/FlatBatchMeterAdapters.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/batch/FlatBatchMeterAdapters.java index 677797d3a3..1b38e8157b 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/batch/FlatBatchMeterAdapters.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/batch/FlatBatchMeterAdapters.java @@ -14,14 +14,16 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.MoreExecutors; import java.util.ArrayList; import java.util.List; +import java.util.Map; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.ProcessFlatBatchOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.ProcessFlatBatchOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.add.meter._case.FlatBatchAddMeter; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.remove.meter._case.FlatBatchRemoveMeter; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.update.meter._case.FlatBatchUpdateMeter; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.failure.ids.aug.FlatBatchFailureMeterIdCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.flat.batch.add.meter._case.FlatBatchAddMeter; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.flat.batch.remove.meter._case.FlatBatchRemoveMeter; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.flat.batch.update.meter._case.FlatBatchUpdateMeter; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.output.BatchFailure; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.output.BatchFailureBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.output.batch.failure.batch.item.id.choice.FlatBatchFailureMeterIdCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.output.BatchFailureKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeRef; import org.opendaylight.yang.gen.v1.urn.opendaylight.meters.service.rev160316.AddMetersBatchInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.meters.service.rev160316.AddMetersBatchInputBuilder; @@ -121,9 +123,8 @@ public final class FlatBatchMeterAdapters { static Function, RpcResult> convertBatchMeterResult(final int stepOffset) { return input -> { - List batchFailures = wrapBatchMeterFailuresForFlat(input, stepOffset); - ProcessFlatBatchOutputBuilder outputBuilder = - new ProcessFlatBatchOutputBuilder().setBatchFailure(batchFailures); + ProcessFlatBatchOutputBuilder outputBuilder = new ProcessFlatBatchOutputBuilder() + .setBatchFailure(wrapBatchMeterFailuresForFlat(input, stepOffset)); return RpcResultBuilder.status(input.isSuccessful()) .withRpcErrors(input.getErrors()) .withResult(outputBuilder.build()) @@ -131,9 +132,10 @@ public final class FlatBatchMeterAdapters { }; } - private static List wrapBatchMeterFailuresForFlat( - final RpcResult input, final int stepOffset) { - final List batchFailures = new ArrayList<>(); + private static + Map wrapBatchMeterFailuresForFlat(final RpcResult input, + final int stepOffset) { + final BindingMap.Builder batchFailures = BindingMap.orderedBuilder(); if (input.getResult().getBatchFailedMetersOutput() != null) { for (BatchFailedMetersOutput stepOutput : input.getResult().nonnullBatchFailedMetersOutput().values()) { final BatchFailure batchFailure = new BatchFailureBuilder() @@ -145,7 +147,7 @@ public final class FlatBatchMeterAdapters { batchFailures.add(batchFailure); } } - return batchFailures; + return batchFailures.build(); } /** diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/multilayer/MultiLayerAggregateFlowMultipartService.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/multilayer/MultiLayerAggregateFlowMultipartService.java index c2ebf4fbd5..3093bc4302 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/multilayer/MultiLayerAggregateFlowMultipartService.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/multilayer/MultiLayerAggregateFlowMultipartService.java @@ -70,10 +70,10 @@ public class MultiLayerAggregateFlowMultipartService extends AbstractAggregateFl final Uint8 tableId = MoreObjects.firstNonNull(input.getTableId(), OFConstants.OFPTT_ALL); mprAggregateRequestBuilder.setTableId(tableId); long outputPortValue = MoreObjects.firstNonNull(input.getOutPort(), OFConstants.OFPP_ANY).longValue(); - mprAggregateRequestBuilder.setOutPort(outputPortValue); + mprAggregateRequestBuilder.setOutPort(Uint32.valueOf(outputPortValue)); - final short version = getVersion(); - if (version == OFConstants.OFP_VERSION_1_3) { + final Uint8 version = getVersion(); + if (OFConstants.OFP_VERSION_1_3.equals(version)) { if (input.getCookie() == null) { mprAggregateRequestBuilder.setCookie(OFConstants.DEFAULT_COOKIE); diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/sal/SalPortServiceImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/sal/SalPortServiceImpl.java index 1924c89ccf..d6e149ceb5 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/sal/SalPortServiceImpl.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/sal/SalPortServiceImpl.java @@ -25,7 +25,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.port.service.rev131107.SalP import org.opendaylight.yang.gen.v1.urn.opendaylight.port.service.rev131107.UpdatePortInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.port.service.rev131107.UpdatePortOutput; import org.opendaylight.yangtools.yang.common.RpcResult; -import org.opendaylight.yangtools.yang.common.Uint8; public final class SalPortServiceImpl extends AbstractSimpleService implements SalPortService { @@ -55,7 +54,7 @@ public final class SalPortServiceImpl .convert(getPortFromInput(input), data); final PortModInputBuilder mdInput = new PortModInputBuilder(ofPortModInput - .orElse(PortConvertor.defaultResult(Uint8.valueOf(getVersion())))) + .orElse(PortConvertor.defaultResult(getVersion()))) .setXid(xid.getValue()); return mdInput.build(); diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/util/RequestInputUtils.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/util/RequestInputUtils.java index 61c4d76b92..9edf942243 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/util/RequestInputUtils.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/util/RequestInputUtils.java @@ -11,16 +11,16 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev13 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MultipartType; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartRequestInputBuilder; import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint8; public final class RequestInputUtils { - private RequestInputUtils() { throw new IllegalStateException("This class should not be instantiated."); } public static MultipartRequestInputBuilder createMultipartHeader(final MultipartType multipart, final Uint32 xid, - final Short version) { + final Uint8 version) { MultipartRequestInputBuilder mprInput = new MultipartRequestInputBuilder(); mprInput.setType(multipart); mprInput.setVersion(version); @@ -28,5 +28,4 @@ public final class RequestInputUtils { mprInput.setFlags(new MultipartRequestFlags(false)); return mprInput; } - } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/AggregateFlowsInTableService.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/AggregateFlowsInTableService.java index b99de55d07..2a586862b7 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/AggregateFlowsInTableService.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/AggregateFlowsInTableService.java @@ -34,6 +34,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyAggregateCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestAggregateCaseBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.aggregate._case.MultipartRequestAggregateBuilder; +import org.opendaylight.yangtools.yang.common.Uint8; public final class AggregateFlowsInTableService extends AbstractCompatibleStatService messageTranslator = translatorLibrary.lookupTranslator(translatorKey); diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/AllFlowsInTableService.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/AllFlowsInTableService.java index 0dfaf9bd6f..c0f5da4883 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/AllFlowsInTableService.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/AllFlowsInTableService.java @@ -29,6 +29,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestFlowCaseBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.flow._case.MultipartRequestFlowBuilder; +import org.opendaylight.yangtools.yang.common.Uint8; public class AllFlowsInTableService extends AbstractCompatibleStatService { @@ -37,8 +38,8 @@ public class AllFlowsInTableService extends AbstractCompatibleStatService mpResult, TransactionId emulatedTxId) { + public FlowsStatisticsUpdate transformToNotification(final List mpResult, + final TransactionId emulatedTxId) { return FlowStatisticsToNotificationTransformer.transformToNotification(mpResult, getDeviceInfo(), getOfVersion(), diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/AllGroupsStatsService.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/AllGroupsStatsService.java index 1e7949467e..075d5facb7 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/AllGroupsStatsService.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/AllGroupsStatsService.java @@ -31,28 +31,21 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestGroupCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestGroupCaseBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.group._case.MultipartRequestGroupBuilder; +import org.opendaylight.yangtools.yang.common.Uint32; final class AllGroupsStatsService extends AbstractCompatibleStatService { - - private static final MultipartRequestGroupCase GROUP_CASE; - - static { - final MultipartRequestGroupCaseBuilder caseBuilder = new MultipartRequestGroupCaseBuilder(); - final MultipartRequestGroupBuilder mprGroupBuild = new MultipartRequestGroupBuilder(); - mprGroupBuild.setGroupId(new GroupId(BinContent.intToUnsignedLong(Group.OFPGALL.getIntValue()))); - caseBuilder.setMultipartRequestGroup(mprGroupBuild.build()); - - GROUP_CASE = caseBuilder.build(); - } + private static final MultipartRequestGroupCase GROUP_CASE = new MultipartRequestGroupCaseBuilder() + .setMultipartRequestGroup(new MultipartRequestGroupBuilder() + .setGroupId(new GroupId(Uint32.valueOf(BinContent.intToUnsignedLong(Group.OFPGALL.getIntValue())))) + .build()) + .build(); private final ConvertorExecutor convertorExecutor; - AllGroupsStatsService(RequestContextStack requestContextStack, - DeviceContext deviceContext, - AtomicLong compatibilityXidSeed, - ConvertorExecutor convertorExecutor) { + AllGroupsStatsService(final RequestContextStack requestContextStack, final DeviceContext deviceContext, + final AtomicLong compatibilityXidSeed, final ConvertorExecutor convertorExecutor) { super(requestContextStack, deviceContext, compatibilityXidSeed); this.convertorExecutor = convertorExecutor; } @@ -71,12 +64,13 @@ final class AllGroupsStatsService extends } @Override - public GetAllGroupStatisticsOutput buildTxCapableResult(TransactionId emulatedTxId) { + public GetAllGroupStatisticsOutput buildTxCapableResult(final TransactionId emulatedTxId) { return new GetAllGroupStatisticsOutputBuilder().setTransactionId(emulatedTxId).build(); } @Override - public GroupStatisticsUpdated transformToNotification(List result, TransactionId emulatedTxId) { + public GroupStatisticsUpdated transformToNotification(final List result, + final TransactionId emulatedTxId) { return GroupStatisticsToNotificationTransformer.transformToNotification(result, getDeviceInfo(), emulatedTxId, diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/AllMeterConfigStatsService.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/AllMeterConfigStatsService.java index a62a472361..3c85ee81c1 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/AllMeterConfigStatsService.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/AllMeterConfigStatsService.java @@ -38,25 +38,18 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestMeterConfigCaseBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.meter.config._case.MultipartRequestMeterConfigBuilder; import org.opendaylight.yangtools.yang.binding.util.BindingMap; +import org.opendaylight.yangtools.yang.common.Uint32; final class AllMeterConfigStatsService extends AbstractCompatibleStatService { - - private static final MultipartRequestMeterConfigCase METER_CONFIG_CASE; - - - static { - MultipartRequestMeterConfigCaseBuilder caseBuilder = - new MultipartRequestMeterConfigCaseBuilder(); - MultipartRequestMeterConfigBuilder mprMeterConfigBuild = - new MultipartRequestMeterConfigBuilder(); - mprMeterConfigBuild.setMeterId(new MeterId(BinContent.intToUnsignedLong(Meter.OFPMALL.getIntValue()))); - caseBuilder.setMultipartRequestMeterConfig(mprMeterConfigBuild.build()); - - METER_CONFIG_CASE = caseBuilder.build(); - } + private static final MultipartRequestMeterConfigCase METER_CONFIG_CASE = + new MultipartRequestMeterConfigCaseBuilder() + .setMultipartRequestMeterConfig(new MultipartRequestMeterConfigBuilder() + .setMeterId(new MeterId(Uint32.valueOf(BinContent.intToUnsignedLong(Meter.OFPMALL.getIntValue())))) + .build()) + .build(); private final ConvertorExecutor convertorExecutor; private final VersionConvertorData data; diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/AllMeterStatsService.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/AllMeterStatsService.java index e280175324..eaecb2e9df 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/AllMeterStatsService.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/AllMeterStatsService.java @@ -31,29 +31,21 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestMeterCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestMeterCaseBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.meter._case.MultipartRequestMeterBuilder; +import org.opendaylight.yangtools.yang.common.Uint32; final class AllMeterStatsService extends AbstractCompatibleStatService { - private static final MultipartRequestMeterCase METER_CASE; - - static { - MultipartRequestMeterCaseBuilder caseBuilder = - new MultipartRequestMeterCaseBuilder(); - MultipartRequestMeterBuilder mprMeterBuild = - new MultipartRequestMeterBuilder(); - mprMeterBuild.setMeterId(new MeterId(BinContent.intToUnsignedLong(Meter.OFPMALL.getIntValue()))); - caseBuilder.setMultipartRequestMeter(mprMeterBuild.build()); - - METER_CASE = caseBuilder.build(); - } + private static final MultipartRequestMeterCase METER_CASE = new MultipartRequestMeterCaseBuilder() + .setMultipartRequestMeter(new MultipartRequestMeterBuilder() + .setMeterId(new MeterId(Uint32.valueOf(BinContent.intToUnsignedLong(Meter.OFPMALL.getIntValue())))) + .build()) + .build(); private final ConvertorExecutor convertorExecutor; - AllMeterStatsService(RequestContextStack requestContextStack, - DeviceContext deviceContext, - AtomicLong compatibilityXidSeed, - ConvertorExecutor convertorExecutor) { + AllMeterStatsService(final RequestContextStack requestContextStack, final DeviceContext deviceContext, + final AtomicLong compatibilityXidSeed, final ConvertorExecutor convertorExecutor) { super(requestContextStack, deviceContext, compatibilityXidSeed); this.convertorExecutor = convertorExecutor; } @@ -67,12 +59,13 @@ final class AllMeterStatsService extends AbstractCompatibleStatService result, TransactionId emulatedTxId) { + public MeterStatisticsUpdated transformToNotification(final List result, + final TransactionId emulatedTxId) { return MeterStatisticsToNotificationTransformer.transformToNotification(result, getDeviceInfo(), getOfVersion(), diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/AllQueuesOnePortService.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/AllQueuesOnePortService.java index 3383ba6046..f8c1e40107 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/AllQueuesOnePortService.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/AllQueuesOnePortService.java @@ -29,14 +29,15 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216. import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.GetAllQueuesStatisticsFromGivenPortOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.GetAllQueuesStatisticsFromGivenPortOutputBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.QueueStatisticsUpdate; +import org.opendaylight.yangtools.yang.common.Uint8; final class AllQueuesOnePortService extends AbstractCompatibleStatService { - AllQueuesOnePortService(RequestContextStack requestContextStack, - DeviceContext deviceContext, - AtomicLong compatibilityXidSeed) { + AllQueuesOnePortService(final RequestContextStack requestContextStack, + final DeviceContext deviceContext, + final AtomicLong compatibilityXidSeed) { super(requestContextStack, deviceContext, compatibilityXidSeed); } @@ -47,7 +48,7 @@ final class AllQueuesOnePortService extends AbstractCompatibleStatService result, TransactionId emulatedTxId) { + public QueueStatisticsUpdate transformToNotification(final List result, + final TransactionId emulatedTxId) { return QueueStatisticsToNotificationTransformer.transformToNotification(result, getDeviceInfo(), getOfVersion(), diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/FlowsInTableService.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/FlowsInTableService.java index 048fd71c84..9421879abb 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/FlowsInTableService.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/FlowsInTableService.java @@ -31,6 +31,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestFlowCaseBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.flow._case.MultipartRequestFlowBuilder; +import org.opendaylight.yangtools.yang.common.Uint32; public final class FlowsInTableService extends AbstractCompatibleStatService { @@ -40,8 +41,8 @@ public final class FlowsInTableService extends AbstractCompatibleStatService result, TransactionId emulatedTxId) { + public FlowsStatisticsUpdate transformToNotification(final List result, + final TransactionId emulatedTxId) { return FlowStatisticsToNotificationTransformer.transformToNotification(result, getDeviceInfo(), getOfVersion(), diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/OneQueueOnePortService.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/OneQueueOnePortService.java index 2f7b59b469..a7e4f9f923 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/OneQueueOnePortService.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/OneQueueOnePortService.java @@ -28,15 +28,16 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216. import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.GetQueueStatisticsFromGivenPortOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.GetQueueStatisticsFromGivenPortOutputBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.QueueStatisticsUpdate; +import org.opendaylight.yangtools.yang.common.Uint8; final class OneQueueOnePortService extends AbstractCompatibleStatService { - OneQueueOnePortService(RequestContextStack requestContextStack, - DeviceContext deviceContext, - AtomicLong compatibilityXidSeed) { + OneQueueOnePortService(final RequestContextStack requestContextStack, + final DeviceContext deviceContext, + final AtomicLong compatibilityXidSeed) { super(requestContextStack, deviceContext, compatibilityXidSeed); } @@ -48,7 +49,7 @@ final class OneQueueOnePortService // Select specific queue mprQueueBuilder.setQueueId(input.getQueueId().getValue()); // Select specific port - final short version = getVersion(); + final Uint8 version = getVersion(); mprQueueBuilder.setPortNo(InventoryDataServiceUtil.portNumberfromNodeConnectorId( OpenflowVersion.get(version), input.getNodeConnectorId())); caseBuilder.setMultipartRequestQueue(mprQueueBuilder.build()); @@ -61,12 +62,13 @@ final class OneQueueOnePortService } @Override - public GetQueueStatisticsFromGivenPortOutput buildTxCapableResult(TransactionId emulatedTxId) { + public GetQueueStatisticsFromGivenPortOutput buildTxCapableResult(final TransactionId emulatedTxId) { return new GetQueueStatisticsFromGivenPortOutputBuilder().setTransactionId(emulatedTxId).build(); } @Override - public QueueStatisticsUpdate transformToNotification(List result, TransactionId emulatedTxId) { + public QueueStatisticsUpdate transformToNotification(final List result, + final TransactionId emulatedTxId) { return QueueStatisticsToNotificationTransformer .transformToNotification(result, getDeviceInfo(), getOfVersion(), emulatedTxId); } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/PortStatsService.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/PortStatsService.java index 8bb5a21f41..a4bdf4666c 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/PortStatsService.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/PortStatsService.java @@ -28,14 +28,15 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.G import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.GetNodeConnectorStatisticsOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.GetNodeConnectorStatisticsOutputBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.NodeConnectorStatisticsUpdate; +import org.opendaylight.yangtools.yang.common.Uint8; final class PortStatsService extends AbstractCompatibleStatService { - PortStatsService(RequestContextStack requestContextStack, - DeviceContext deviceContext, - AtomicLong compatibilityXidSeed) { + PortStatsService(final RequestContextStack requestContextStack, + final DeviceContext deviceContext, + final AtomicLong compatibilityXidSeed) { super(requestContextStack, deviceContext, compatibilityXidSeed); } @@ -47,7 +48,7 @@ final class PortStatsService extends AbstractCompatibleStatService result, - TransactionId emulatedTxId) { + public NodeConnectorStatisticsUpdate transformToNotification(final List result, + final TransactionId emulatedTxId) { return NodeConnectorStatisticsToNotificationTransformer.transformToNotification(result, getDeviceInfo(), getOfVersion(), diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/compatibility/AbstractCompatibleStatService.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/compatibility/AbstractCompatibleStatService.java index eebddf33ac..7f6a232bc2 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/compatibility/AbstractCompatibleStatService.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/compatibility/AbstractCompatibleStatService.java @@ -11,7 +11,6 @@ import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.MoreExecutors; -import java.math.BigInteger; import java.util.List; import java.util.concurrent.atomic.AtomicLong; import org.opendaylight.mdsal.binding.api.NotificationPublishService; @@ -26,6 +25,7 @@ import org.opendaylight.yangtools.yang.binding.DataContainer; import org.opendaylight.yangtools.yang.binding.Notification; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; +import org.opendaylight.yangtools.yang.common.Uint64; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -57,7 +57,7 @@ public abstract class AbstractCompatibleStatService>> rpcResultListenableFuture = handleServiceCall(input); diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/dedicated/StatisticsGatheringOnTheFlyService.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/dedicated/StatisticsGatheringOnTheFlyService.java index be20375a20..e90d10ec0a 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/dedicated/StatisticsGatheringOnTheFlyService.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/dedicated/StatisticsGatheringOnTheFlyService.java @@ -53,7 +53,7 @@ public class StatisticsGatheringOnTheFlyService @Override protected OfHeader buildRequest(final Xid xid, final MultipartType input) { - return MultipartRequestInputFactory.makeMultipartRequest(xid.getValue().toJava(), + return MultipartRequestInputFactory.makeMultipartRequest(xid.getValue(), getVersion(), input, canUseSingleLayerSerialization()); diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/dedicated/StatisticsGatheringService.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/dedicated/StatisticsGatheringService.java index 99bd745b15..a0638491c7 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/dedicated/StatisticsGatheringService.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/dedicated/StatisticsGatheringService.java @@ -46,7 +46,7 @@ public class StatisticsGatheringService @Override protected OfHeader buildRequest(final Xid xid, final MultipartType input) { - return MultipartRequestInputFactory.makeMultipartRequest(xid.getValue().toJava(), + return MultipartRequestInputFactory.makeMultipartRequest(xid.getValue(), getVersion(), input, canUseSingleLayerSerialization()); diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/multilayer/FlowDirectStatisticsService.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/multilayer/FlowDirectStatisticsService.java index c7061d3b7a..f506ddfe8f 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/multilayer/FlowDirectStatisticsService.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/multilayer/FlowDirectStatisticsService.java @@ -33,6 +33,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.flow._case.MultipartReplyFlow; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestFlowCaseBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.flow._case.MultipartRequestFlowBuilder; +import org.opendaylight.yangtools.yang.common.Uint32; public class FlowDirectStatisticsService extends AbstractFlowDirectStatisticsService { @@ -86,7 +87,7 @@ public class FlowDirectStatisticsService extends AbstractFlowDirectStatisticsSer } if (input.getOutPort() != null) { - mprFlowRequestBuilder.setOutPort(input.getOutPort().longValue()); + mprFlowRequestBuilder.setOutPort(Uint32.valueOf(input.getOutPort().longValue())); } else { mprFlowRequestBuilder.setOutPort(OFConstants.OFPP_ANY); } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/translator/PacketReceivedTranslator.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/translator/PacketReceivedTranslator.java index 317817d985..72e8d64c06 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/translator/PacketReceivedTranslator.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/translator/PacketReceivedTranslator.java @@ -27,6 +27,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.Pa import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.packet.received.MatchBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TableId; import org.opendaylight.yangtools.yang.common.Uint64; +import org.opendaylight.yangtools.yang.common.Uint8; public class PacketReceivedTranslator implements MessageTranslator { private final ConvertorExecutor convertorExecutor; @@ -62,7 +63,9 @@ public class PacketReceivedTranslator implements MessageTranslator diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/translator/TranslatorKeyFactory.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/translator/TranslatorKeyFactory.java index 1560459845..7da98c4690 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/translator/TranslatorKeyFactory.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/translator/TranslatorKeyFactory.java @@ -5,20 +5,21 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.translator; +import static java.util.Objects.requireNonNull; + import org.opendaylight.openflowplugin.api.openflow.md.core.TranslatorKey; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Created by Martin Bobak <mbobak@cisco.com> on 3.4.2015. */ public class TranslatorKeyFactory { + private final Uint8 version; - short version; - - public TranslatorKeyFactory(final short version) { - this.version = version; + public TranslatorKeyFactory(final Uint8 version) { + this.version = requireNonNull(version); } public TranslatorKey createTranslatorKey(final Class messageClass) { diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/AddressNormalizationUtil.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/AddressNormalizationUtil.java index 70a1c95546..b309f9566b 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/AddressNormalizationUtil.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/AddressNormalizationUtil.java @@ -25,6 +25,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types. import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress; import org.opendaylight.yang.gen.v1.urn.opendaylight.opendaylight.ipv6.arbitrary.bitmask.fields.rev160224.Ipv6ArbitraryMask; import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint8; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,7 +48,7 @@ public final class AddressNormalizationUtil { * @param protocolVersion the OpenFLow protocol version * @return normalized uri */ - public static @Nullable Uri normalizeProtocolAgnosticPort(@Nullable final Uri port, final short protocolVersion) { + public static @Nullable Uri normalizeProtocolAgnosticPort(@Nullable final Uri port, final Uint8 protocolVersion) { if (port == null) { return null; } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/FlatBatchUtil.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/FlatBatchUtil.java index 4ffaea8372..975ddf0087 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/FlatBatchUtil.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/FlatBatchUtil.java @@ -22,20 +22,22 @@ import org.opendaylight.openflowplugin.impl.services.batch.BatchPlanStep; import org.opendaylight.openflowplugin.impl.services.batch.BatchStepType; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.ProcessFlatBatchOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.ProcessFlatBatchOutputBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.FlatBatchAddFlowCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.FlatBatchRemoveFlowCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.FlatBatchUpdateFlowCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.FlatBatchAddGroupCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.FlatBatchRemoveGroupCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.FlatBatchUpdateGroupCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.FlatBatchAddMeterCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.FlatBatchRemoveMeterCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.FlatBatchUpdateMeterCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.Batch; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.BatchChoice; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchAddFlowCase; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchAddGroupCase; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchAddMeterCase; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchRemoveFlowCase; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchRemoveGroupCase; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchRemoveMeterCase; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchUpdateFlowCase; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchUpdateGroupCase; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchUpdateMeterCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.output.BatchFailure; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.output.BatchFailureKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.service.batch.common.rev160322.BatchOrderGrouping; import org.opendaylight.yangtools.yang.binding.DataContainer; +import org.opendaylight.yangtools.yang.binding.util.BindingMap; import org.opendaylight.yangtools.yang.common.RpcError; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; @@ -184,7 +186,7 @@ public final class FlatBatchUtil { return jobsResults -> { boolean isSuccessful = true; List rpcErrors = new ArrayList<>(); - List batchFailures = new ArrayList<>(); + BindingMap.Builder batchFailures = BindingMap.orderedBuilder(); for (RpcResult jobResult : jobsResults) { if (jobResult != null) { @@ -196,7 +198,7 @@ public final class FlatBatchUtil { return RpcResultBuilder.status(isSuccessful) .withRpcErrors(rpcErrors) - .withResult(new ProcessFlatBatchOutputBuilder().setBatchFailure(batchFailures).build()) + .withResult(new ProcessFlatBatchOutputBuilder().setBatchFailure(batchFailures.build()).build()) .build(); }; } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/FlowCreatorUtil.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/FlowCreatorUtil.java index ccf8fd09ac..6a5dd2e331 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/FlowCreatorUtil.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/FlowCreatorUtil.java @@ -41,21 +41,21 @@ public final class FlowCreatorUtil { throw new AssertionError("FlowCreatorUtil is not expected to be instantiated."); } - public static void setWildcardedFlowMatch(final short version, final MultipartRequestFlowBuilder flowBuilder) { - if (version == OFConstants.OFP_VERSION_1_0) { + public static void setWildcardedFlowMatch(final Uint8 version, final MultipartRequestFlowBuilder flowBuilder) { + if (OFConstants.OFP_VERSION_1_0.equals(version)) { flowBuilder.setMatchV10(createWildcardedMatchV10()); } - if (version == OFConstants.OFP_VERSION_1_3) { + if (OFConstants.OFP_VERSION_1_3.equals(version)) { flowBuilder.setMatch(createWildcardedMatch()); } } - public static void setWildcardedFlowMatch(final short version, + public static void setWildcardedFlowMatch(final Uint8 version, final MultipartRequestAggregateBuilder aggregateBuilder) { - if (version == OFConstants.OFP_VERSION_1_0) { + if (OFConstants.OFP_VERSION_1_0.equals(version)) { aggregateBuilder.setMatchV10(createWildcardedMatchV10()); } - if (version == OFConstants.OFP_VERSION_1_3) { + if (OFConstants.OFP_VERSION_1_3.equals(version)) { aggregateBuilder.setMatch(createWildcardedMatch()); } } @@ -98,7 +98,7 @@ public final class FlowCreatorUtil { * @param version Protocol version. * @return {@code true} only if a flow entry can be modified. */ - public static boolean canModifyFlow(final OriginalFlow original, final UpdatedFlow updated, final Short version) { + public static boolean canModifyFlow(final OriginalFlow original, final UpdatedFlow updated, final Uint8 version) { // FLOW_MOD does not change match, priority, idle_timeout, hard_timeout, // flags, and cookie. if (!Objects.equals(original.getMatch(), updated.getMatch()) || !equalsWithDefault(original.getPriority(), @@ -113,7 +113,7 @@ public final class FlowCreatorUtil { } if (!Boolean.TRUE.equals(updated.getStrict()) && version != null - && version.shortValue() != OFConstants.OFP_VERSION_1_0) { + && !OFConstants.OFP_VERSION_1_0.equals(version)) { FlowCookie cookieMask = updated.getCookieMask(); if (cookieMask != null) { Uint64 mask = cookieMask.getValue(); diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/FlowUtil.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/FlowUtil.java index b9cd473609..6e9a92480b 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/FlowUtil.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/FlowUtil.java @@ -16,6 +16,7 @@ import java.util.Collection; import java.util.Collections; import java.util.Iterator; import java.util.List; +import java.util.Map; import org.apache.commons.lang3.tuple.Pair; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowId; @@ -36,8 +37,11 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flows.service.rev160314.Upd import org.opendaylight.yang.gen.v1.urn.opendaylight.flows.service.rev160314.batch.flow.output.list.grouping.BatchFailedFlowsOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.flows.service.rev160314.batch.flow.output.list.grouping.BatchFailedFlowsOutputBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; +import org.opendaylight.yangtools.yang.binding.Identifiable; +import org.opendaylight.yangtools.yang.binding.Identifier; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; +import org.opendaylight.yangtools.yang.binding.util.BindingMap; import org.opendaylight.yangtools.yang.common.RpcError; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; @@ -79,7 +83,7 @@ public final class FlowUtil { RpcResult> FLOW_REMOVE_TRANSFORM = batchFlowsCumulativeResult -> { final RemoveFlowsBatchOutput batchOutput = new RemoveFlowsBatchOutputBuilder() - .setBatchFailedFlowsOutput(batchFlowsCumulativeResult.getResult()).build(); + .setBatchFailedFlowsOutput(index(batchFlowsCumulativeResult.getResult())).build(); final RpcResultBuilder resultBld = createCumulativeRpcResult(batchFlowsCumulativeResult, batchOutput); @@ -93,7 +97,7 @@ public final class FlowUtil { RpcResult> FLOW_ADD_TRANSFORM = batchFlowsCumulativeResult -> { final AddFlowsBatchOutput batchOutput = new AddFlowsBatchOutputBuilder() - .setBatchFailedFlowsOutput(batchFlowsCumulativeResult.getResult()).build(); + .setBatchFailedFlowsOutput(index(batchFlowsCumulativeResult.getResult())).build(); final RpcResultBuilder resultBld = createCumulativeRpcResult(batchFlowsCumulativeResult, batchOutput); @@ -107,7 +111,7 @@ public final class FlowUtil { RpcResult> FLOW_UPDATE_TRANSFORM = batchFlowsCumulativeResult -> { final UpdateFlowsBatchOutput batchOutput = new UpdateFlowsBatchOutputBuilder() - .setBatchFailedFlowsOutput(batchFlowsCumulativeResult.getResult()).build(); + .setBatchFailedFlowsOutput(index(batchFlowsCumulativeResult.getResult())).build(); final RpcResultBuilder resultBld = createCumulativeRpcResult(batchFlowsCumulativeResult, batchOutput); @@ -118,6 +122,10 @@ public final class FlowUtil { throw new IllegalStateException("This class should not be instantiated."); } + static , V extends Identifiable> Map index(final List list) { + return list == null ? null : BindingMap.ordered(list); + } + /** * Wrap given list of problematic flow-ids into {@link RpcResult} of given type. * diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/GroupUtil.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/GroupUtil.java index 7f2d3b9e2f..fd36e71a51 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/GroupUtil.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/GroupUtil.java @@ -52,7 +52,7 @@ public final class GroupUtil { public static final Function>, RpcResult> GROUP_ADD_TRANSFORM = batchGroupsCumulatedResult -> { final AddGroupsBatchOutput batchOutput = new AddGroupsBatchOutputBuilder() - .setBatchFailedGroupsOutput(batchGroupsCumulatedResult.getResult()).build(); + .setBatchFailedGroupsOutput(FlowUtil.index(batchGroupsCumulatedResult.getResult())).build(); final RpcResultBuilder resultBld = createCumulativeRpcResult(batchGroupsCumulatedResult, batchOutput); @@ -67,7 +67,7 @@ public final class GroupUtil { GROUP_REMOVE_TRANSFORM = batchGroupsCumulatedResult -> { final RemoveGroupsBatchOutput batchOutput = new RemoveGroupsBatchOutputBuilder() - .setBatchFailedGroupsOutput(batchGroupsCumulatedResult.getResult()).build(); + .setBatchFailedGroupsOutput(FlowUtil.index(batchGroupsCumulatedResult.getResult())).build(); final RpcResultBuilder resultBld = createCumulativeRpcResult(batchGroupsCumulatedResult, batchOutput); @@ -82,7 +82,7 @@ public final class GroupUtil { GROUP_UPDATE_TRANSFORM = batchGroupsCumulatedResult -> { final UpdateGroupsBatchOutput batchOutput = new UpdateGroupsBatchOutputBuilder() - .setBatchFailedGroupsOutput(batchGroupsCumulatedResult.getResult()).build(); + .setBatchFailedGroupsOutput(FlowUtil.index(batchGroupsCumulatedResult.getResult())).build(); final RpcResultBuilder resultBld = createCumulativeRpcResult(batchGroupsCumulatedResult, batchOutput); diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/MatchNormalizationUtil.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/MatchNormalizationUtil.java index d2e6bae15f..4580276dd9 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/MatchNormalizationUtil.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/MatchNormalizationUtil.java @@ -45,14 +45,15 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._3.match.Ipv6MatchBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._3.match.TunnelIpv4Match; import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._3.match.TunnelIpv4MatchBuilder; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Utility class for match normalization. */ public final class MatchNormalizationUtil { // Cache normalizers for common OpenFlow versions - private static final Map>> NORMALIZERS = ImmutableMap - .>>builder() + private static final Map>> NORMALIZERS = ImmutableMap + .>>builder() .put(OFConstants.OFP_VERSION_1_0, createNormalizers(OFConstants.OFP_VERSION_1_0) .collect(Collectors.toSet())) .put(OFConstants.OFP_VERSION_1_3, createNormalizers(OFConstants.OFP_VERSION_1_3) @@ -71,7 +72,7 @@ public final class MatchNormalizationUtil { * @return normalized OpenFlow match */ @NonNull - public static Match normalizeMatch(@NonNull final Match match, final short version) { + public static Match normalizeMatch(@NonNull final Match match, final Uint8 version) { final MatchBuilder matchBuilder = new MatchBuilder(match); Optional.ofNullable(NORMALIZERS.get(version)) @@ -82,7 +83,7 @@ public final class MatchNormalizationUtil { } @NonNull - private static Stream> createNormalizers(final short version) { + private static Stream> createNormalizers(final Uint8 version) { return Stream.of( MatchNormalizationUtil::normalizeExtensionMatch, MatchNormalizationUtil::normalizeEthernetMatch, @@ -92,8 +93,8 @@ public final class MatchNormalizationUtil { MatchNormalizationUtil::normalizeIpv4MatchArbitraryBitMask, MatchNormalizationUtil::normalizeIpv6Match, MatchNormalizationUtil::normalizeIpv6MatchArbitraryBitMask, - (match) -> normalizeInPortMatch(match, version), - (match) -> normalizeInPhyPortMatch(match, version)); + match -> normalizeInPortMatch(match, version), + match -> normalizeInPhyPortMatch(match, version)); } @NonNull @@ -103,7 +104,7 @@ public final class MatchNormalizationUtil { @NonNull @VisibleForTesting - static MatchBuilder normalizeInPortMatch(@NonNull final MatchBuilder match, final short version) { + static MatchBuilder normalizeInPortMatch(@NonNull final MatchBuilder match, final Uint8 version) { return Optional .ofNullable(match.getInPort()) .flatMap(inPort -> Optional.ofNullable(normalizeProtocolAgnosticPort(inPort, version))) @@ -113,7 +114,7 @@ public final class MatchNormalizationUtil { @NonNull @VisibleForTesting - static MatchBuilder normalizeInPhyPortMatch(@NonNull final MatchBuilder match, final short version) { + static MatchBuilder normalizeInPhyPortMatch(final @NonNull MatchBuilder match, final Uint8 version) { return Optional .ofNullable(match.getInPhyPort()) .flatMap(inPhyPort -> Optional.ofNullable(normalizeProtocolAgnosticPort(inPhyPort, version))) @@ -123,7 +124,7 @@ public final class MatchNormalizationUtil { @NonNull @VisibleForTesting - static MatchBuilder normalizeArpMatch(@NonNull final MatchBuilder match) { + static MatchBuilder normalizeArpMatch(final @NonNull MatchBuilder match) { return Optional .ofNullable(match.getLayer3Match()) .filter(ArpMatch.class::isInstance) @@ -181,7 +182,7 @@ public final class MatchNormalizationUtil { @NonNull @VisibleForTesting - static MatchBuilder normalizeIpv4MatchArbitraryBitMask(@NonNull final MatchBuilder match) { + static MatchBuilder normalizeIpv4MatchArbitraryBitMask(final @NonNull MatchBuilder match) { return Optional .ofNullable(match.getLayer3Match()) .filter(Ipv4MatchArbitraryBitMask.class::isInstance) @@ -200,7 +201,7 @@ public final class MatchNormalizationUtil { @NonNull @VisibleForTesting - static MatchBuilder normalizeIpv6Match(@NonNull final MatchBuilder match) { + static MatchBuilder normalizeIpv6Match(final @NonNull MatchBuilder match) { return Optional .ofNullable(match.getLayer3Match()) .filter(Ipv6Match.class::isInstance) @@ -218,7 +219,7 @@ public final class MatchNormalizationUtil { @NonNull @VisibleForTesting - static MatchBuilder normalizeIpv6MatchArbitraryBitMask(@NonNull final MatchBuilder match) { + static MatchBuilder normalizeIpv6MatchArbitraryBitMask(final @NonNull MatchBuilder match) { return Optional .ofNullable(match.getLayer3Match()) .filter(Ipv6MatchArbitraryBitMask.class::isInstance) @@ -236,7 +237,7 @@ public final class MatchNormalizationUtil { @NonNull @VisibleForTesting - static MatchBuilder normalizeEthernetMatch(@NonNull final MatchBuilder match) { + static MatchBuilder normalizeEthernetMatch(final @NonNull MatchBuilder match) { return Optional .ofNullable(match.getEthernetMatch()) .map(eth -> match.setEthernetMatch(new EthernetMatchBuilder(eth) @@ -257,5 +258,4 @@ public final class MatchNormalizationUtil { .build())) .orElse(match); } - } \ No newline at end of file diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/MessageFactory.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/MessageFactory.java index 1c2342d94c..f853296148 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/MessageFactory.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/MessageFactory.java @@ -8,13 +8,14 @@ package org.opendaylight.openflowplugin.impl.util; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.HelloElementType; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.HelloInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.HelloInputBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.hello.Elements; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.hello.ElementsBuilder; +import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint8; public abstract class MessageFactory { @@ -25,7 +26,7 @@ public abstract class MessageFactory { * @param helloXid transaction id for hello message * @return HelloInput without elements */ - public static HelloInput createHelloInput(short helloVersion, long helloXid) { + public static HelloInput createHelloInput(final Uint8 helloVersion, final Uint32 helloXid) { return createHelloInput(helloVersion, helloXid, null); } @@ -37,7 +38,8 @@ public abstract class MessageFactory { * @param versionOrder list of openflow version in order * @return HelloInput with elements (version bitmap) */ - public static HelloInput createHelloInput(short helloVersion, long helloXid, List versionOrder) { + public static HelloInput createHelloInput(final Uint8 helloVersion, final Uint32 helloXid, + final List versionOrder) { HelloInputBuilder helloInputbuilder = prepareHelloInputBuilder(helloVersion, helloXid); if (versionOrder != null) { @@ -45,14 +47,14 @@ public abstract class MessageFactory { elementsBuilder.setType(HelloElementType.VERSIONBITMAP); int resultVersionListSize = 0; if (!versionOrder.isEmpty()) { - resultVersionListSize = versionOrder.get(0) + 1; + resultVersionListSize = versionOrder.get(0).toJava() + 1; } List booleanList = new ArrayList<>(resultVersionListSize); int versionOrderIndex = versionOrder.size() - 1; while (versionOrderIndex >= 0) { - short version = versionOrder.get(versionOrderIndex); + short version = versionOrder.get(versionOrderIndex).toJava(); if (version == booleanList.size()) { booleanList.add(true); versionOrderIndex--; @@ -63,8 +65,7 @@ public abstract class MessageFactory { elementsBuilder.setVersionBitmap(booleanList); - List elementList = Collections.singletonList(elementsBuilder.build()); - helloInputbuilder.setElements(elementList); + helloInputbuilder.setElements(List.of(elementsBuilder.build())); } return helloInputbuilder.build(); } @@ -77,7 +78,7 @@ public abstract class MessageFactory { * @return builder with prepared header */ private static HelloInputBuilder prepareHelloInputBuilder( - short highestVersion, long xid) { + final Uint8 highestVersion, final Uint32 xid) { HelloInputBuilder helloInputbuilder = new HelloInputBuilder(); helloInputbuilder.setVersion(highestVersion); helloInputbuilder.setXid(xid); @@ -90,7 +91,7 @@ public abstract class MessageFactory { * @param elements list of versions * @return version boolean list */ - public static List digVersions(List elements) { + public static List digVersions(final List elements) { List result = null; if (elements != null && !elements.isEmpty()) { for (Elements elm : elements) { diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/MeterUtil.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/MeterUtil.java index d80f5f0629..3e4182fafa 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/MeterUtil.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/MeterUtil.java @@ -52,7 +52,7 @@ public final class MeterUtil { public static final Function>, RpcResult> METER_ADD_TRANSFORM = batchMetersCumulatedResult -> { final AddMetersBatchOutput batchOutput = new AddMetersBatchOutputBuilder() - .setBatchFailedMetersOutput(batchMetersCumulatedResult.getResult()).build(); + .setBatchFailedMetersOutput(FlowUtil.index(batchMetersCumulatedResult.getResult())).build(); final RpcResultBuilder resultBld = createCumulativeRpcResult(batchMetersCumulatedResult, batchOutput); @@ -67,7 +67,7 @@ public final class MeterUtil { METER_REMOVE_TRANSFORM = batchMetersCumulatedResult -> { final RemoveMetersBatchOutput batchOutput = new RemoveMetersBatchOutputBuilder() - .setBatchFailedMetersOutput(batchMetersCumulatedResult.getResult()).build(); + .setBatchFailedMetersOutput(FlowUtil.index(batchMetersCumulatedResult.getResult())).build(); final RpcResultBuilder resultBld = createCumulativeRpcResult(batchMetersCumulatedResult, batchOutput); @@ -82,7 +82,7 @@ public final class MeterUtil { METER_UPDATE_TRANSFORM = batchMetersCumulatedResult -> { final UpdateMetersBatchOutput batchOutput = new UpdateMetersBatchOutputBuilder() - .setBatchFailedMetersOutput(batchMetersCumulatedResult.getResult()).build(); + .setBatchFailedMetersOutput(FlowUtil.index(batchMetersCumulatedResult.getResult())).build(); final RpcResultBuilder resultBld = createCumulativeRpcResult(batchMetersCumulatedResult, batchOutput); diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/NodeConnectorRefToPortTranslator.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/NodeConnectorRefToPortTranslator.java index 4d00092816..457df45008 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/NodeConnectorRefToPortTranslator.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/NodeConnectorRefToPortTranslator.java @@ -26,6 +26,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; import org.opendaylight.yangtools.yang.common.Uint32; import org.opendaylight.yangtools.yang.common.Uint64; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Created by Tomas Slusny on 23.3.2016. @@ -65,7 +66,7 @@ public final class NodeConnectorRefToPortTranslator { */ @SuppressWarnings("unchecked") @Nullable - public static Uint32 fromNodeConnectorRef(@NonNull final NodeConnectorRef nodeConnectorRef, final short version) { + public static Uint32 fromNodeConnectorRef(@NonNull final NodeConnectorRef nodeConnectorRef, final Uint8 version) { Preconditions.checkNotNull(nodeConnectorRef); Uint32 port = null; @@ -91,9 +92,9 @@ public final class NodeConnectorRefToPortTranslator { Uint32 port = null; - if (packetIn.getVersion().toJava() == OFConstants.OFP_VERSION_1_0 && packetIn.getInPort() != null) { + if (OFConstants.OFP_VERSION_1_0.equals(packetIn.getVersion()) && packetIn.getInPort() != null) { port = Uint32.valueOf(packetIn.getInPort()); - } else if (packetIn.getVersion().toJava() == OFConstants.OFP_VERSION_1_3) { + } else if (OFConstants.OFP_VERSION_1_3.equals(packetIn.getVersion())) { if (packetIn.getMatch() != null && packetIn.getMatch().getMatchEntry() != null) { List entries = packetIn.getMatch().getMatchEntry(); diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/PortTranslatorUtil.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/PortTranslatorUtil.java index feb69fca0a..50322c8f45 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/PortTranslatorUtil.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/PortTranslatorUtil.java @@ -28,6 +28,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PortStatusMessage; import org.opendaylight.yangtools.yang.common.Uint32; import org.opendaylight.yangtools.yang.common.Uint64; +import org.opendaylight.yangtools.yang.common.Uint8; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -119,7 +120,7 @@ public abstract class PortTranslatorUtil { pc.getNoFwd(), pc.getNoPacketIn(), pc.getNoRecv(), pc.getPortDown()); } - public static NodeConnectorUpdated translatePort(final Short version, final Uint64 datapathId, + public static NodeConnectorUpdated translatePort(final Uint8 version, final Uint64 datapathId, final Uint32 portNumber, final PortGrouping port) { OpenflowVersion ofVersion = OpenflowVersion.get(version); final NodeConnectorUpdatedBuilder builder = InventoryDataServiceUtil @@ -156,7 +157,7 @@ public abstract class PortTranslatorUtil { return builder.addAugmentation(fcncub.build()).build(); } - public static NodeConnectorRemoved translatePortRemoved(final Short version, final Uint64 datapathId, + public static NodeConnectorRemoved translatePortRemoved(final Uint8 version, final Uint64 datapathId, final Uint32 portNumber, final PortGrouping port) { OpenflowVersion ofVersion = OpenflowVersion.get(version); NodeConnectorRemovedBuilder builder = new NodeConnectorRemovedBuilder(); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/common/MultipartRequestInputFactoryTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/common/MultipartRequestInputFactoryTest.java index f64b4e1ac0..059c19de21 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/common/MultipartRequestInputFactoryTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/common/MultipartRequestInputFactoryTest.java @@ -38,17 +38,18 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.queue._case.MultipartRequestQueue; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.table.features._case.MultipartRequestTableFeatures; import org.opendaylight.yangtools.yang.binding.DataContainer; +import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Test for {@link MultipartRequestInputFactory}. */ public class MultipartRequestInputFactoryTest { - private final long xid = 42L; - private short ofVersion; + private final Uint32 xid = Uint32.valueOf(42); + private Uint8 ofVersion; @Before - public void setUp() { ofVersion = OFConstants.OFP_VERSION_1_3; } @@ -255,9 +256,9 @@ public class MultipartRequestInputFactoryTest { private void checkHeader(final MultipartRequestInput mpRqInput, final MultipartType mpType) { Assert.assertFalse(mpRqInput.getFlags().getOFPMPFREQMORE()); - Assert.assertEquals(ofVersion, mpRqInput.getVersion().shortValue()); + Assert.assertEquals(ofVersion, mpRqInput.getVersion()); Assert.assertEquals(mpType, mpRqInput.getType()); - Assert.assertEquals(xid, mpRqInput.getXid().longValue()); + Assert.assertEquals(xid, mpRqInput.getXid()); } private static void checkEmptyBody(final Class mpRqBody, final Class elements = Lists.newArrayList(element); - Short proposal = handshakeManager.proposeCommonBitmapVersion(elements); - Assert.assertEquals(Short.valueOf((short) 1), proposal); + Assert.assertEquals(Uint8.ONE, handshakeManager.proposeCommonBitmapVersion(List.of(element))); } } @@ -138,23 +136,17 @@ public class HandshakeManagerImplTest { * {@link org.opendaylight.openflowplugin.openflow.md.core.HandshakeManagerImpl#proposeNextVersion(short)}. */ @Test - @SuppressWarnings("checkstyle:Illegalcatch") public void testProposeNextVersion() { short[] remoteVer = new short[]{0x05, 0x04, 0x03, 0x02, 0x01, 0x8f, 0xff}; short[] expectedProposal = new short[]{0x04, 0x04, 0x01, 0x01, 0x01, 0x04, 0x04}; for (int i = 0; i < remoteVer.length; i++) { - short actualProposal = handshakeManager.proposeNextVersion(remoteVer[i]); + Uint8 actualProposal = handshakeManager.proposeNextVersion(Uint8.valueOf(remoteVer[i])); Assert.assertEquals(String.format("proposing for version: %04x", remoteVer[i]), expectedProposal[i], - actualProposal); + actualProposal.toJava()); } - try { - handshakeManager.proposeNextVersion((short) 0); - Assert.fail("there should be no proposition for this version"); - } catch (Exception e) { - // expected - } + assertThrows(IllegalArgumentException.class, () -> handshakeManager.proposeNextVersion(Uint8.ZERO)); } //////// Version Negotiation Tests ////////////// @@ -166,7 +158,7 @@ public class HandshakeManagerImplTest { @Test public void testVersionNegotiation10() { LOG.debug("testVersionNegotiation10"); - Short version = OFConstants.OFP_VERSION_1_0; + Uint8 version = OFConstants.OFP_VERSION_1_0; Mockito.when(adapter.getFeatures(any(GetFeaturesInput.class))) .thenReturn(Futures.immediateFuture(resultFeatures)); @@ -185,7 +177,7 @@ public class HandshakeManagerImplTest { @Test public void testVersionNegotiation10SwitchStarts() { LOG.debug("testVersionNegotiation10-ss"); - Short version = OFConstants.OFP_VERSION_1_0; + Uint8 version = OFConstants.OFP_VERSION_1_0; Mockito.when(adapter.getFeatures(any(GetFeaturesInput.class))) .thenReturn(Futures.immediateFuture(resultFeatures)); @@ -203,12 +195,11 @@ public class HandshakeManagerImplTest { public void testVersionNegotiation00() { LOG.debug("testVersionNegotiation00"); expectedErrors = 1; - Short version = (short) 0x00; - handshakeManager.shake(createHelloMessage(version, helloXid).build()); + handshakeManager.shake(createHelloMessage(Uint8.ZERO, helloXid).build()); Mockito.verify(handshakeListener, Mockito.never()) - .onHandshakeSuccessful(any(GetFeaturesOutput.class), anyShort()); + .onHandshakeSuccessful(any(GetFeaturesOutput.class), any(Uint8.class)); } /** @@ -219,14 +210,14 @@ public class HandshakeManagerImplTest { public void testVersionNegotiation00SwitchStarts() { LOG.debug("testVersionNegotiation00-ss"); expectedErrors = 1; - Short version = (short) 0x00; + Uint8 version = Uint8.ZERO; handshakeManager.shake(null); handshakeManager.shake(createHelloMessage(version, helloXid).build()); Mockito.verify(handshakeListener, Mockito.never()) - .onHandshakeSuccessful(any(GetFeaturesOutput.class), anyShort()); + .onHandshakeSuccessful(any(GetFeaturesOutput.class), any(Uint8.class)); } /** @@ -236,8 +227,8 @@ public class HandshakeManagerImplTest { @Test public void testVersionNegotiation11() { LOG.debug("testVersionNegotiation11"); - Short version = (short) 0x02; - Short expVersion = (short) 0x01; + final Uint8 version = Uint8.TWO; + final Uint8 expVersion = Uint8.ONE; Mockito.when(adapter.getFeatures(any(GetFeaturesInput.class))) .thenReturn(Futures.immediateFuture(resultFeatures)); @@ -255,8 +246,8 @@ public class HandshakeManagerImplTest { @Test public void testVersionNegotiation11SwitchStarts() { LOG.debug("testVersionNegotiation11-ss"); - final Short version = (short) 0x02; - final Short expVersion = (short) 0x01; + final Uint8 version = Uint8.TWO; + final Uint8 expVersion = Uint8.ONE; Mockito.when(adapter.getFeatures(any(GetFeaturesInput.class))) .thenReturn(Futures.immediateFuture(resultFeatures)); @@ -277,7 +268,7 @@ public class HandshakeManagerImplTest { @Test public void testVersionNegotiation13() { LOG.debug("testVersionNegotiation13"); - Short version = OFConstants.OFP_VERSION_1_3; + Uint8 version = OFConstants.OFP_VERSION_1_3; Mockito.when(adapter.getFeatures(any(GetFeaturesInput.class))) .thenReturn(Futures.immediateFuture(resultFeatures)); @@ -294,7 +285,7 @@ public class HandshakeManagerImplTest { @Test public void testVersionNegotiation13SwitchStarts() { LOG.debug("testVersionNegotiation13-ss"); - Short version = OFConstants.OFP_VERSION_1_3; + Uint8 version = OFConstants.OFP_VERSION_1_3; Mockito.when(adapter.getFeatures(any(GetFeaturesInput.class))) .thenReturn(Futures.immediateFuture(resultFeatures)); @@ -313,8 +304,8 @@ public class HandshakeManagerImplTest { @Test public void testVersionNegotiation15() { LOG.debug("testVersionNegotiation15"); - Short version = (short) 0x06; - Short expVersion = OFConstants.OFP_VERSION_1_3; + Uint8 version = Uint8.valueOf(6); + Uint8 expVersion = OFConstants.OFP_VERSION_1_3; Mockito.when(adapter.getFeatures(any(GetFeaturesInput.class))) .thenReturn(Futures.immediateFuture(resultFeatures)); @@ -333,8 +324,8 @@ public class HandshakeManagerImplTest { @Test public void testVersionNegotiation15SwitchStart() { LOG.debug("testVersionNegotiation15-ss"); - Short version = (short) 0x06; - Short expVersion = OFConstants.OFP_VERSION_1_3; + Uint8 version = Uint8.valueOf(6); + Uint8 expVersion = OFConstants.OFP_VERSION_1_3; Mockito.when(adapter.getFeatures(any(GetFeaturesInput.class))) .thenReturn(Futures.immediateFuture(resultFeatures)); @@ -353,7 +344,7 @@ public class HandshakeManagerImplTest { @Test public void testVersionNegotiation15_MultipleCall() { LOG.debug("testVersionNegotiation15_MultipleCall"); - Short version = (short) 0x06; + Uint8 version = Uint8.valueOf(6); expectedErrors = 1; handshakeManager.shake(createHelloMessage(version, helloXid).build()); @@ -361,7 +352,7 @@ public class HandshakeManagerImplTest { handshakeManager.shake(createHelloMessage(version, helloXid).build()); Mockito.verify(handshakeListener, Mockito.never()) - .onHandshakeSuccessful(any(GetFeaturesOutput.class), anyShort()); + .onHandshakeSuccessful(any(GetFeaturesOutput.class), any(Uint8.class)); } /** @@ -371,7 +362,7 @@ public class HandshakeManagerImplTest { @Test public void testVersionNegotiation15_MultipleCallSwitchStarts() { LOG.debug("testVersionNegotiation15_MultipleCall-ss"); - Short version = (short) 0x06; + Uint8 version = Uint8.valueOf(6); expectedErrors = 1; handshakeManager.shake(null); @@ -381,7 +372,7 @@ public class HandshakeManagerImplTest { handshakeManager.shake(createHelloMessage(version, helloXid).build()); Mockito.verify(handshakeListener, Mockito.never()) - .onHandshakeSuccessful(any(GetFeaturesOutput.class), anyShort()); + .onHandshakeSuccessful(any(GetFeaturesOutput.class), any(Uint8.class)); } /** @@ -391,11 +382,11 @@ public class HandshakeManagerImplTest { @Test public void testVersionNegotiation10InBitmap() { LOG.debug("testVersionNegotiation10InBitmap"); - Short version = OFConstants.OFP_VERSION_1_0; + Uint8 version = OFConstants.OFP_VERSION_1_0; handshakeManager.setUseVersionBitmap(true); HelloMessageBuilder helloMessage = createHelloMessage(version, helloXid); - addVersionBitmap(Lists.newArrayList((short) 0x05, OFConstants.OFP_VERSION_1_0), helloMessage); + addVersionBitmap(List.of(Uint8.valueOf(5), OFConstants.OFP_VERSION_1_0), helloMessage); Mockito.when(adapter.getFeatures(any(GetFeaturesInput.class))) .thenReturn(Futures.immediateFuture(resultFeatures)); @@ -412,11 +403,11 @@ public class HandshakeManagerImplTest { @Test public void testVersionNegotiation10InBitmapSwitchStarts() { LOG.debug("testVersionNegotiation10InBitmap-ss"); - Short version = OFConstants.OFP_VERSION_1_0; + Uint8 version = OFConstants.OFP_VERSION_1_0; handshakeManager.setUseVersionBitmap(true); HelloMessageBuilder helloMessage = createHelloMessage(version, helloXid); - addVersionBitmap(Lists.newArrayList((short) 0x05, OFConstants.OFP_VERSION_1_0), helloMessage); + addVersionBitmap(List.of(Uint8.valueOf(5), OFConstants.OFP_VERSION_1_0), helloMessage); Mockito.when(adapter.getFeatures(any(GetFeaturesInput.class))) .thenReturn(Futures.immediateFuture(resultFeatures)); @@ -435,11 +426,11 @@ public class HandshakeManagerImplTest { @Test public void testVersionNegotiation13InBitmap() { LOG.debug("testVersionNegotiation13InBitmap"); - Short version = OFConstants.OFP_VERSION_1_3; + Uint8 version = OFConstants.OFP_VERSION_1_3; handshakeManager.setUseVersionBitmap(true); HelloMessageBuilder helloMessage = createHelloMessage(version, helloXid); - addVersionBitmap(Lists.newArrayList((short) 0x05, OFConstants.OFP_VERSION_1_3), helloMessage); + addVersionBitmap(List.of(Uint8.valueOf(5), OFConstants.OFP_VERSION_1_3), helloMessage); Mockito.when(adapter.getFeatures(any(GetFeaturesInput.class))) .thenReturn(Futures.immediateFuture(resultFeatures)); @@ -456,11 +447,11 @@ public class HandshakeManagerImplTest { @Test public void testVersionNegotiation13InBitmapSwitchFirst() { LOG.debug("testVersionNegotiation13InBitmap-ss"); - Short version = OFConstants.OFP_VERSION_1_3; + Uint8 version = OFConstants.OFP_VERSION_1_3; handshakeManager.setUseVersionBitmap(true); HelloMessageBuilder helloMessage = createHelloMessage(version, helloXid); - addVersionBitmap(Lists.newArrayList((short) 0x05, OFConstants.OFP_VERSION_1_3), helloMessage); + addVersionBitmap(List.of(Uint8.valueOf(5), OFConstants.OFP_VERSION_1_3), helloMessage); Mockito.when(adapter.getFeatures(any(GetFeaturesInput.class))) .thenReturn(Futures.immediateFuture(resultFeatures)); @@ -479,17 +470,17 @@ public class HandshakeManagerImplTest { @Test public void testVersionNegotiationNoCommonVersionInBitmap() { LOG.debug("testVersionNegotiationNoCommonVersionInBitmap"); - Short version = (short) 0x05; + Uint8 version = Uint8.valueOf(5); expectedErrors = 1; handshakeManager.setUseVersionBitmap(true); HelloMessageBuilder helloMessage = createHelloMessage(version, helloXid); - addVersionBitmap(Lists.newArrayList((short) 0x05, (short) 0x02), helloMessage); + addVersionBitmap(List.of(Uint8.valueOf(5), Uint8.TWO), helloMessage); handshakeManager.shake(helloMessage.build()); Mockito.verify(handshakeListener, Mockito.never()) - .onHandshakeSuccessful(any(GetFeaturesOutput.class), anyShort()); + .onHandshakeSuccessful(any(GetFeaturesOutput.class), any(Uint8.class)); } /** @@ -499,19 +490,19 @@ public class HandshakeManagerImplTest { @Test public void testVersionNegotiationNoCommonVersionInBitmapSwitchStarts() { LOG.debug("testVersionNegotiationNoCommonVersionInBitmap-ss"); - Short version = (short) 0x05; + Uint8 version = Uint8.valueOf(5); expectedErrors = 1; handshakeManager.setUseVersionBitmap(true); HelloMessageBuilder helloMessage = createHelloMessage(version, helloXid); - addVersionBitmap(Lists.newArrayList((short) 0x05, (short) 0x02), helloMessage); + addVersionBitmap(List.of(Uint8.valueOf(5), Uint8.TWO), helloMessage); handshakeManager.shake(null); handshakeManager.shake(helloMessage.build()); Mockito.verify(handshakeListener, Mockito.never()) - .onHandshakeSuccessful(any(GetFeaturesOutput.class), anyShort()); + .onHandshakeSuccessful(any(GetFeaturesOutput.class), any(Uint8.class)); } @@ -522,8 +513,8 @@ public class HandshakeManagerImplTest { * @param helloXid hello xid * @return builder */ - private static HelloMessageBuilder createHelloMessage(short ofpVersion10, long helloXid) { - return new HelloMessageBuilder().setVersion(Uint8.valueOf(ofpVersion10)).setXid(Uint32.valueOf(helloXid)); + private static HelloMessageBuilder createHelloMessage(final Uint8 ofpVersion10, final long helloXid) { + return new HelloMessageBuilder().setVersion(ofpVersion10).setXid(Uint32.valueOf(helloXid)); } /** @@ -532,20 +523,21 @@ public class HandshakeManagerImplTest { * @param helloBuilder hello builder * @return builder */ - private static HelloMessageBuilder addVersionBitmap(List versionOrder, HelloMessageBuilder helloBuilder) { - short highestVersion = versionOrder.get(0); - int elementsCount = highestVersion / Integer.SIZE; + private static HelloMessageBuilder addVersionBitmap(final List versionOrder, + final HelloMessageBuilder helloBuilder) { + final short highestVersion = versionOrder.get(0).toJava(); + final int elementsCount = highestVersion / Integer.SIZE; ElementsBuilder elementsBuilder = new ElementsBuilder(); List elementList = new ArrayList<>(); int orderIndex = versionOrder.size(); - int value = versionOrder.get(--orderIndex); + int value = versionOrder.get(--orderIndex).toJava(); for (int index = 0; index <= elementsCount; index++) { List booleanList = new ArrayList<>(); for (int i = 0; i < Integer.SIZE; i++) { if (value == index * Integer.SIZE + i) { booleanList.add(true); - value = orderIndex == 0 ? highestVersion : versionOrder.get(--orderIndex); + value = orderIndex == 0 ? highestVersion : versionOrder.get(--orderIndex).toJava(); } else { booleanList.add(false); } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/connection/OutboundQueueProviderImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/connection/OutboundQueueProviderImplTest.java index cc07a61199..645b5297b4 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/connection/OutboundQueueProviderImplTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/connection/OutboundQueueProviderImplTest.java @@ -18,9 +18,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 import org.opendaylight.yangtools.yang.common.Uint32; public class OutboundQueueProviderImplTest extends TestCase { - - private static final Long DUMMY_ENTRY_NUMBER = 44L; - private static final Uint32 DUMMY_XID = Uint32.valueOf(55L); + private static final Uint32 DUMMY_ENTRY_NUMBER = Uint32.valueOf(44); + private static final Uint32 DUMMY_XID = Uint32.valueOf(55); private final OutboundQueueProviderImpl outboundQueueProvider = new OutboundQueueProviderImpl(OFConstants.OFP_VERSION_1_3); @@ -29,7 +28,7 @@ public class OutboundQueueProviderImplTest extends TestCase { public void testReserveEntry() { outboundQueueProvider.onConnectionQueueChanged(null); - Long returnValue = outboundQueueProvider.reserveEntry(); + Uint32 returnValue = outboundQueueProvider.reserveEntry(); assertEquals(null, returnValue); OutboundQueue mockedQueue = mock(OutboundQueue.class); @@ -41,9 +40,9 @@ public class OutboundQueueProviderImplTest extends TestCase { @Test public void testCreateBarrierRequest() { - final BarrierInput barrierRequest = outboundQueueProvider.createBarrierRequest(DUMMY_XID.toJava()); + final BarrierInput barrierRequest = outboundQueueProvider.createBarrierRequest(DUMMY_XID); assertNotNull(barrierRequest); - assertEquals(OFConstants.OFP_VERSION_1_3, barrierRequest.getVersion().toJava()); + assertEquals(OFConstants.OFP_VERSION_1_3, barrierRequest.getVersion()); assertEquals(DUMMY_XID, barrierRequest.getXid()); } } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/connection/listener/HandshakeListenerImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/connection/listener/HandshakeListenerImplTest.java index 2f19fdb8ca..3528ed4dc7 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/connection/listener/HandshakeListenerImplTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/connection/listener/HandshakeListenerImplTest.java @@ -8,19 +8,20 @@ package org.opendaylight.openflowplugin.impl.connection.listener; +import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import java.net.InetSocketAddress; import org.junit.After; -import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; -import org.mockito.ArgumentMatchers; import org.mockito.Captor; import org.mockito.Mock; -import org.mockito.Mockito; import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.openflowjava.protocol.api.connection.ConnectionAdapter; import org.opendaylight.openflowplugin.api.OFConstants; @@ -35,6 +36,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetFeaturesOutput; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; import org.opendaylight.yangtools.yang.common.Uint64; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Test for {@link HandshakeListenerImpl}. @@ -60,49 +62,49 @@ public class HandshakeListenerImplTest { @Before public void setUp() { - Mockito.when(connectionAdapter.barrier(ArgumentMatchers.any())) + when(connectionAdapter.barrier(any())) .thenReturn(RpcResultBuilder.success(new BarrierOutputBuilder().build()).buildFuture()); - connectionContextSpy = Mockito.spy(new ConnectionContextImpl(connectionAdapter, - deviceConnectionStatusProvider)); - Mockito.when(connectionContextSpy.getConnectionAdapter()).thenReturn(connectionAdapter); - Mockito.when(features.getDatapathId()).thenReturn(Uint64.valueOf(10)); + connectionContextSpy = spy(new ConnectionContextImpl(connectionAdapter, deviceConnectionStatusProvider)); + when(connectionContextSpy.getConnectionAdapter()).thenReturn(connectionAdapter); + when(features.getDatapathId()).thenReturn(Uint64.TEN); + when(features.getVersion()).thenReturn(Uint8.ONE); handshakeListener = new HandshakeListenerImpl(connectionContextSpy, deviceConnectedHandler); handshakeListener.setHandshakeContext(handshakeContext); } @After public void tearDown() { - Mockito.verify(handshakeContext).close(); + verify(handshakeContext).close(); } @Test public void testOnHandshakeSuccessfull() { handshakeListener.onHandshakeSuccessful(features, OFConstants.OFP_VERSION_1_3); - Mockito.verify(connectionContextSpy).changeStateToWorking(); - Mockito.verify(connectionContextSpy).setFeatures(any(FeaturesReply.class)); - Mockito.verify(connectionContextSpy).setNodeId(nodeIdCaptor.capture()); - Mockito.verify(connectionContextSpy).handshakeSuccessful(); - Mockito.verify(deviceConnectedHandler).deviceConnected(connectionContextSpy); - Mockito.verify(handshakeContext).close(); + verify(connectionContextSpy).changeStateToWorking(); + verify(connectionContextSpy).setFeatures(any(FeaturesReply.class)); + verify(connectionContextSpy).setNodeId(nodeIdCaptor.capture()); + verify(connectionContextSpy).handshakeSuccessful(); + verify(deviceConnectedHandler).deviceConnected(connectionContextSpy); + verify(handshakeContext).close(); - Assert.assertEquals("openflow:10", nodeIdCaptor.getValue().getValue()); + assertEquals("openflow:10", nodeIdCaptor.getValue().getValue()); } @Test public void testOnHandshakeFailure1() { connectionContextSpy.setNodeId(new NodeId("ut-device:10")); handshakeListener.onHandshakeFailure(); - Mockito.verify(handshakeContext).close(); - Mockito.verify(connectionContextSpy).closeConnection(false); + verify(handshakeContext).close(); + verify(connectionContextSpy).closeConnection(false); } @Test public void testOnHandshakeFailure2() { - Mockito.when(connectionAdapter.getRemoteAddress()) + when(connectionAdapter.getRemoteAddress()) .thenReturn(InetSocketAddress.createUnresolved("ut-ofp.example.org", 4242)); connectionContextSpy.setNodeId(new NodeId("openflow:1")); handshakeListener.onHandshakeFailure(); - Mockito.verify(handshakeContext).close(); - Mockito.verify(connectionContextSpy).closeConnection(false); + verify(handshakeContext).close(); + verify(connectionContextSpy).closeConnection(false); } } \ No newline at end of file diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/device/DeviceContextImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/device/DeviceContextImplTest.java index 76462bbd50..3c64bc4c4d 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/device/DeviceContextImplTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/device/DeviceContextImplTest.java @@ -220,7 +220,7 @@ public class DeviceContextImplTest { Mockito.lenient().when(deviceInfo.getVersion()).thenReturn(OFConstants.OFP_VERSION_1_3); Mockito.lenient().when(featuresOutput.getDatapathId()).thenReturn(DUMMY_DATAPATH_ID); - Mockito.lenient().when(featuresOutput.getVersion()).thenReturn(Uint8.valueOf(OFConstants.OFP_VERSION_1_3)); + Mockito.lenient().when(featuresOutput.getVersion()).thenReturn(OFConstants.OFP_VERSION_1_3); Mockito.when(contextChainHolder.getContextChain(deviceInfo)).thenReturn(contextChain); Mockito.when(contextChain.isMastered(ContextChainMastershipState.CHECK, false)).thenReturn(true); @@ -421,7 +421,7 @@ public class DeviceContextImplTest { final GetFeaturesOutput mockedFeature = mock(GetFeaturesOutput.class); lenient().when(mockedFeature.getDatapathId()).thenReturn(DUMMY_DATAPATH_ID); - lenient().when(mockedPortStatusMessage.getVersion()).thenReturn(Uint8.valueOf(OFConstants.OFP_VERSION_1_3)); + lenient().when(mockedPortStatusMessage.getVersion()).thenReturn(OFConstants.OFP_VERSION_1_3); lenient().when(mockedPortStatusMessage.getReason()).thenReturn(PortReason.OFPPRADD); lenient().when(mockedPortStatusMessage.getPortNo()).thenReturn(Uint32.valueOf(42L)); deviceContextSpy.processPortStatusMessage(mockedPortStatusMessage); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/device/DeviceManagerImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/device/DeviceManagerImplTest.java index f64100a67d..42e667b395 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/device/DeviceManagerImplTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/device/DeviceManagerImplTest.java @@ -61,6 +61,7 @@ import org.opendaylight.yangtools.util.concurrent.FluentFutures; import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; import org.opendaylight.yangtools.yang.common.Uint16; import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint8; @RunWith(MockitoJUnitRunner.class) public class DeviceManagerImplTest { @@ -114,6 +115,7 @@ public class DeviceManagerImplTest { when(mockConnectionContext.getDeviceInfo()).thenReturn(deviceInfo); when(deviceInfo.getNodeInstanceIdentifier()).thenReturn(DUMMY_IDENTIFIER); when(deviceInfo.getNodeId()).thenReturn(DUMMY_NODE_ID); + when(deviceInfo.getVersion()).thenReturn(Uint8.ONE); when(mockedFuture.isDone()).thenReturn(true); doReturn(mockedFuture).when(writeTransaction).commit(); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/device/initialization/OF10DeviceInitializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/device/initialization/OF10DeviceInitializerTest.java index d6e984a361..6b1fe97e14 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/device/initialization/OF10DeviceInitializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/device/initialization/OF10DeviceInitializerTest.java @@ -44,6 +44,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint8; @RunWith(MockitoJUnitRunner.class) public class OF10DeviceInitializerTest { @@ -91,6 +92,7 @@ public class OF10DeviceInitializerTest { when(deviceContext.getDeviceState()).thenReturn(deviceState); when(deviceInfo.getNodeInstanceIdentifier()).thenReturn(nodeInstanceIdentifier); when(deviceInfo.getNodeId()).thenReturn(nodeInstanceIdentifier.getKey().getId()); + when(deviceInfo.getVersion()).thenReturn(Uint8.ONE); when(deviceContext.getDeviceInfo()).thenReturn(deviceInfo); when(deviceContext.getMessageSpy()).thenReturn(messageSpy); when(translatorLibrary.lookupTranslator(any())).thenReturn(messageTranslator); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/device/initialization/OF13DeviceInitializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/device/initialization/OF13DeviceInitializerTest.java index 5c76d584a5..cdc5ec01e3 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/device/initialization/OF13DeviceInitializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/device/initialization/OF13DeviceInitializerTest.java @@ -49,6 +49,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint8; @RunWith(MockitoJUnitRunner.class) public class OF13DeviceInitializerTest { @@ -96,6 +97,7 @@ public class OF13DeviceInitializerTest { when(deviceContext.getDeviceState()).thenReturn(deviceState); when(deviceInfo.getNodeInstanceIdentifier()).thenReturn(nodeInstanceIdentifier); when(deviceInfo.getNodeId()).thenReturn(nodeInstanceIdentifier.getKey().getId()); + when(deviceInfo.getVersion()).thenReturn(Uint8.ONE); when(deviceContext.getDeviceInfo()).thenReturn(deviceInfo); when(deviceContext.getMessageSpy()).thenReturn(messageSpy); when(deviceContext.oook()).thenReturn(translatorLibrary); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/MessageDeserializerInjectorTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/MessageDeserializerInjectorTest.java index c8c0ea0887..95334fe1fb 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/MessageDeserializerInjectorTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/MessageDeserializerInjectorTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.protocol.deserialization; import static org.mockito.Mockito.verify; @@ -38,18 +37,17 @@ public class MessageDeserializerInjectorTest { @Before public void setUp() { injector = MessageDeserializerInjector.createInjector(switchConnectionProvider, EncodeConstants - .OF13_VERSION_ID); + .OF_VERSION_1_3); } @Test public void injectDeserializers() { injector.apply(10).apply(OfHeader.class).accept(ofDeserializer); verify(switchConnectionProvider).unregisterDeserializerMapping(new TypeToClassKey(EncodeConstants - .OF13_VERSION_ID, 10)); + .OF_VERSION_1_3, 10)); verify(switchConnectionProvider).registerDeserializerMapping(new TypeToClassKey(EncodeConstants - .OF13_VERSION_ID, 10), OfHeader.class); - verify(switchConnectionProvider).registerDeserializer(new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 10, + .OF_VERSION_1_3, 10), OfHeader.class); + verify(switchConnectionProvider).registerDeserializer(new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, 10, OfHeader.class), ofDeserializer); } - } \ No newline at end of file diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/AbstractActionDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/AbstractActionDeserializerTest.java index fffe678e77..25c4eb0132 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/AbstractActionDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/AbstractActionDeserializerTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.protocol.deserialization.action; import io.netty.buffer.ByteBuf; @@ -16,26 +15,24 @@ import org.opendaylight.openflowplugin.impl.protocol.deserialization.AbstractDes import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action; public abstract class AbstractActionDeserializerTest extends AbstractDeserializerTest { - private OFDeserializer deserializer; @Override protected void init() { deserializer = getRegistry().getDeserializer( - new MessageCodeExperimenterKey(EncodeConstants.OF13_VERSION_ID, getType(), Action.class, null)); + new MessageCodeExperimenterKey(EncodeConstants.OF_VERSION_1_3, getType(), Action.class, null)); } - protected void writeHeader(ByteBuf message) { + protected void writeHeader(final ByteBuf message) { message.writeShort(getType()); message.writeShort(getLength()); } - protected Action deserializeAction(ByteBuf message) { + protected Action deserializeAction(final ByteBuf message) { return deserializer.deserialize(message); } protected abstract short getType(); protected abstract short getLength(); - } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/SetFieldActionDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/SetFieldActionDeserializerTest.java index 84ccad31a4..234faea704 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/SetFieldActionDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/SetFieldActionDeserializerTest.java @@ -39,7 +39,7 @@ public class SetFieldActionDeserializerTest extends AbstractActionDeserializerTe assertTrue(action instanceof SetFieldCase); assertEquals( OpenflowPortsUtil - .getPortLogicalName(EncodeConstants.OF13_VERSION_ID, BinContent.intToUnsignedLong(portNum)), + .getPortLogicalName(EncodeConstants.OF_VERSION_1_3, BinContent.intToUnsignedLong(portNum)), ((SetFieldCase) action).getSetField().getInPort().getValue()); assertEquals(0, in.readableBytes()); } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/AbstractInstructionDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/AbstractInstructionDeserializerTest.java index 37330603a4..52b9587f5f 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/AbstractInstructionDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/AbstractInstructionDeserializerTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.protocol.deserialization.instruction; import io.netty.buffer.ByteBuf; @@ -16,26 +15,24 @@ import org.opendaylight.openflowplugin.impl.protocol.deserialization.AbstractDes import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.Instruction; public abstract class AbstractInstructionDeserializerTest extends AbstractDeserializerTest { - private OFDeserializer deserializer; @Override protected void init() { deserializer = getRegistry().getDeserializer( - new MessageCodeExperimenterKey(EncodeConstants.OF13_VERSION_ID, getType(), Instruction.class, null)); + new MessageCodeExperimenterKey(EncodeConstants.OF_VERSION_1_3, getType(), Instruction.class, null)); } - protected void writeHeader(ByteBuf message) { + protected void writeHeader(final ByteBuf message) { message.writeShort(getType()); message.writeShort(getLength()); } - protected Instruction deserializeInstruction(ByteBuf message) { + protected Instruction deserializeInstruction(final ByteBuf message) { return deserializer.deserialize(message); } protected abstract short getType(); protected abstract short getLength(); - } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/ApplyActionsInstructionDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/ApplyActionsInstructionDeserializerTest.java index ad567f3220..7293047c39 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/ApplyActionsInstructionDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/ApplyActionsInstructionDeserializerTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.protocol.deserialization.instruction; import static org.junit.Assert.assertEquals; @@ -28,10 +27,9 @@ public class ApplyActionsInstructionDeserializerTest extends AbstractInstruction private OFDeserializer deserializer; @Override - @SuppressWarnings("checkstyle:LineLength") protected void init() { deserializer = getRegistry().getDeserializer( - new MessageCodeActionExperimenterKey(EncodeConstants.OF13_VERSION_ID, getType(), Instruction.class, + new MessageCodeActionExperimenterKey(EncodeConstants.OF_VERSION_1_3, getType(), Instruction.class, ActionPath.INVENTORY_FLOWNODE_TABLE_APPLY_ACTIONS, null)); } @@ -72,5 +70,4 @@ public class ApplyActionsInstructionDeserializerTest extends AbstractInstruction protected short getLength() { return EncodeConstants.EMPTY_LENGTH; } - } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/WriteActionsInstructionDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/WriteActionsInstructionDeserializerTest.java index be39ff50ba..7bd447bd0f 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/WriteActionsInstructionDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/WriteActionsInstructionDeserializerTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.protocol.deserialization.instruction; import static org.junit.Assert.assertEquals; @@ -28,10 +27,9 @@ public class WriteActionsInstructionDeserializerTest extends AbstractInstruction private OFDeserializer deserializer; @Override - @SuppressWarnings("checkstyle:LineLength") protected void init() { deserializer = getRegistry().getDeserializer( - new MessageCodeActionExperimenterKey(EncodeConstants.OF13_VERSION_ID, getType(), Instruction.class, + new MessageCodeActionExperimenterKey(EncodeConstants.OF_VERSION_1_3, getType(), Instruction.class, ActionPath.INVENTORY_FLOWNODE_TABLE_WRITE_ACTIONS, null)); } @@ -72,5 +70,4 @@ public class WriteActionsInstructionDeserializerTest extends AbstractInstruction protected short getLength() { return EncodeConstants.EMPTY_LENGTH; } - } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/AbstractMatchEntryDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/AbstractMatchEntryDeserializerTest.java index 1ab88eafc0..22e970022a 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/AbstractMatchEntryDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/AbstractMatchEntryDeserializerTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.protocol.deserialization.match; import io.netty.buffer.ByteBuf; @@ -35,13 +34,13 @@ public abstract class AbstractMatchEntryDeserializerTest extends AbstractDeseria @Override protected void init() { - deserializer = getRegistry().getDeserializer(new MessageCodeMatchKey(EncodeConstants.OF13_VERSION_ID, + deserializer = getRegistry().getDeserializer(new MessageCodeMatchKey(EncodeConstants.OF_VERSION_1_3, EncodeConstants.EMPTY_LENGTH, Match.class, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH)); } - private void deserializeAlreadyFilledCase(ByteBuf inBuffer) { + private void deserializeAlreadyFilledCase(final ByteBuf inBuffer) { final MatchBuilder builder = new MatchBuilder() .setProtocolMatchFields(new ProtocolMatchFieldsBuilder().build()) .setEthernetMatch(new EthernetMatchBuilder().build()) @@ -64,14 +63,14 @@ public abstract class AbstractMatchEntryDeserializerTest extends AbstractDeseria } } - protected Match deserialize(ByteBuf inBuffer) { + protected Match deserialize(final ByteBuf inBuffer) { deserializeAlreadyFilledCase(inBuffer.copy()); final MatchBuilder builder = new MatchBuilder(); deserializer.deserializeEntry(inBuffer, builder); return builder.build(); } - protected void writeHeader(ByteBuf inBuffer, boolean hasMask) { + protected void writeHeader(final ByteBuf inBuffer, final boolean hasMask) { inBuffer.writeShort(getOxmClassCode()); int fieldAndMask = getOxmFieldCode() << 1; diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/InPhyPortEntryDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/InPhyPortEntryDeserializerTest.java index 092c5b6459..3cc3c35f37 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/InPhyPortEntryDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/InPhyPortEntryDeserializerTest.java @@ -28,7 +28,7 @@ public class InPhyPortEntryDeserializerTest extends AbstractMatchEntryDeserializ writeHeader(in, false); in.writeInt(port); - assertEquals(OpenflowPortsUtil.getPortLogicalName(EncodeConstants.OF13_VERSION_ID, + assertEquals(OpenflowPortsUtil.getPortLogicalName(EncodeConstants.OF_VERSION_1_3, BinContent.intToUnsignedLong(port)), deserialize(in).getInPhyPort().getValue()); assertEquals(0, in.readableBytes()); } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/InPortEntryDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/InPortEntryDeserializerTest.java index 18ef398cdc..43491b0b66 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/InPortEntryDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/InPortEntryDeserializerTest.java @@ -28,7 +28,7 @@ public class InPortEntryDeserializerTest extends AbstractMatchEntryDeserializerT writeHeader(in, false); in.writeInt(port); - assertEquals(OpenflowPortsUtil.getPortLogicalName(EncodeConstants.OF13_VERSION_ID, + assertEquals(OpenflowPortsUtil.getPortLogicalName(EncodeConstants.OF_VERSION_1_3, BinContent.intToUnsignedLong(port)), deserialize(in).getInPort().getValue()); assertEquals(0, in.readableBytes()); } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/FlowMessageDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/FlowMessageDeserializerTest.java index f80e48414c..fe224d064f 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/FlowMessageDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/FlowMessageDeserializerTest.java @@ -120,8 +120,7 @@ public class FlowMessageDeserializerTest extends AbstractDeserializerTest { buffer.setShort(instructionLengthIndex, buffer.writerIndex() - instructionStartIndex); // Deserialize and check everything - final FlowMessage message = (FlowMessage) getFactory() - .deserialize(buffer, EncodeConstants.OF13_VERSION_ID); + final FlowMessage message = (FlowMessage) getFactory().deserialize(buffer, EncodeConstants.OF_VERSION_1_3); assertEquals(XID, message.getXid().intValue()); assertEquals(COMMAND.getIntValue(), message.getCommand().getIntValue()); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/GroupMessageDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/GroupMessageDeserializerTest.java index 81f52b80ed..7967da69cd 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/GroupMessageDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/GroupMessageDeserializerTest.java @@ -70,8 +70,7 @@ public class GroupMessageDeserializerTest extends AbstractDeserializerTest { buffer.setShort(index, buffer.writerIndex() - index); // Deserialize and check everything - final GroupMessage message = (GroupMessage) getFactory() - .deserialize(buffer, EncodeConstants.OF13_VERSION_ID); + final GroupMessage message = (GroupMessage) getFactory().deserialize(buffer, EncodeConstants.OF_VERSION_1_3); assertEquals(XID, message.getXid().intValue()); assertEquals(COMMAND.getIntValue(), message.getCommand().getIntValue()); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/MeterMessageDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/MeterMessageDeserializerTest.java index b9fc87139e..175133cc4d 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/MeterMessageDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/MeterMessageDeserializerTest.java @@ -76,7 +76,7 @@ public class MeterMessageDeserializerTest extends AbstractDeserializerTest { buffer.writeByte(DSCP_PREC); buffer.writeZero(PADDING_IN_METER_BAND_DSCP_HEADER); - final MeterMessage message = (MeterMessage)getFactory().deserialize(buffer, EncodeConstants.OF13_VERSION_ID); + final MeterMessage message = (MeterMessage)getFactory().deserialize(buffer, EncodeConstants.OF_VERSION_1_3); assertEquals(message.getXid().intValue(), XID); assertEquals(message.getCommand().getIntValue(), COMMAND.getIntValue()); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/PacketInMessageDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/PacketInMessageDeserializerTest.java index 87af6a92dd..86adb0af63 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/PacketInMessageDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/PacketInMessageDeserializerTest.java @@ -73,7 +73,7 @@ public class PacketInMessageDeserializerTest extends AbstractDeserializerTest { buffer.writeBytes(PAYLOAD); final PacketInMessage message = - (PacketInMessage) getFactory().deserialize(buffer, EncodeConstants.OF13_VERSION_ID); + (PacketInMessage) getFactory().deserialize(buffer, EncodeConstants.OF_VERSION_1_3); assertEquals(XID, message.getXid().intValue()); assertEquals(PacketInUtil.getMdSalPacketInReason(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/PortMessageDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/PortMessageDeserializerTest.java index 26764fd332..6d8172fedf 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/PortMessageDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/PortMessageDeserializerTest.java @@ -99,7 +99,7 @@ public class PortMessageDeserializerTest extends AbstractDeserializerTest { buffer.writeZero(PADDING_IN_PORT_MOD_MESSAGE_3); - final PortMessage message = (PortMessage) getFactory().deserialize(buffer, EncodeConstants.OF13_VERSION_ID); + final PortMessage message = (PortMessage) getFactory().deserialize(buffer, EncodeConstants.OF_VERSION_1_3); assertEquals(XID, message.getXid().intValue()); assertEquals(PORT, message.getPortNumber().getUint32().intValue()); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/AbstractMultipartDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/AbstractMultipartDeserializerTest.java index 1d6376580c..3567f7cb94 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/AbstractMultipartDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/AbstractMultipartDeserializerTest.java @@ -21,10 +21,10 @@ public abstract class AbstractMultipartDeserializerTest extends AbstractDeseria @Override protected void init() { deserializer = getRegistry().getDeserializer( - new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, getType(), MultipartReplyBody.class)); + new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, getType(), MultipartReplyBody.class)); } - protected MultipartReplyBody deserializeMultipart(ByteBuf message) { + protected MultipartReplyBody deserializeMultipart(final ByteBuf message) { return deserializer.deserialize(message); } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyMessageDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyMessageDeserializerTest.java index 7404e19649..8cf63386f9 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyMessageDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyMessageDeserializerTest.java @@ -129,7 +129,7 @@ public class MultipartReplyMessageDeserializerTest extends AbstractDeserializerT // Deserialize and check everything final MultipartReply message = (MultipartReply) getFactory() - .deserialize(buffer, EncodeConstants.OF13_VERSION_ID); + .deserialize(buffer, EncodeConstants.OF_VERSION_1_3); final MultipartReplyFlowStats reply = (MultipartReplyFlowStats) message.getMultipartReplyBody(); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/ActionSerializerInjectorTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/ActionSerializerInjectorTest.java index aed0996f25..46ca0606ec 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/ActionSerializerInjectorTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/ActionSerializerInjectorTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.protocol.serialization; import static org.mockito.Mockito.verify; @@ -37,15 +36,14 @@ public class ActionSerializerInjectorTest { @Before public void setUp() { - injector = ActionSerializerInjector.createInjector(switchConnectionProvider, EncodeConstants.OF13_VERSION_ID); + injector = ActionSerializerInjector.createInjector(switchConnectionProvider, EncodeConstants.OF_VERSION_1_3); } @Test public void injectSerializers() { injector.apply(CopyTtlInCase.class).accept(actionSerializer); verify(switchConnectionProvider).registerSerializer( - new MessageTypeKey(EncodeConstants.OF13_VERSION_ID, CopyTtlInCase.class), + new MessageTypeKey(EncodeConstants.OF_VERSION_1_3, CopyTtlInCase.class), actionSerializer); } - } \ No newline at end of file diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/InstructionSerializerInjectorTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/InstructionSerializerInjectorTest.java index 830272cb24..eaf5c995ef 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/InstructionSerializerInjectorTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/InstructionSerializerInjectorTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.protocol.serialization; import static org.mockito.Mockito.verify; @@ -38,15 +37,14 @@ public class InstructionSerializerInjectorTest { @Before public void setUp() { injector = - InstructionSerializerInjector.createInjector(switchConnectionProvider, EncodeConstants.OF13_VERSION_ID); + InstructionSerializerInjector.createInjector(switchConnectionProvider, EncodeConstants.OF_VERSION_1_3); } @Test public void injectSerializers() { injector.apply(ApplyActionsCase.class).accept(instructionSerializer); verify(switchConnectionProvider).registerSerializer( - new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, ApplyActionsCase.class), + new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, ApplyActionsCase.class), instructionSerializer); } - } \ No newline at end of file diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/MessageSerializerInjectorTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/MessageSerializerInjectorTest.java index b7a9467711..05f9d20c38 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/MessageSerializerInjectorTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/MessageSerializerInjectorTest.java @@ -36,7 +36,7 @@ public class MessageSerializerInjectorTest { @Before public void setUp() { - injector = MessageSerializerInjector.createInjector(switchConnectionProvider, EncodeConstants.OF13_VERSION_ID); + injector = MessageSerializerInjector.createInjector(switchConnectionProvider, EncodeConstants.OF_VERSION_1_3); } @Test diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/actions/AbstractActionSerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/actions/AbstractActionSerializerTest.java index 32dbea23fc..3d903deeb7 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/actions/AbstractActionSerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/actions/AbstractActionSerializerTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.protocol.serialization.actions; import static org.junit.Assert.assertEquals; @@ -24,10 +23,10 @@ public abstract class AbstractActionSerializerTest extends AbstractSerializerTes @Override protected void init() { - serializer = getRegistry().getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, getClazz())); + serializer = getRegistry().getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, getClazz())); } - protected void assertAction(Action action, final Consumer assertBody) { + protected void assertAction(final Action action, final Consumer assertBody) { // Header serialization final ByteBuf bufferHeader = UnpooledByteBufAllocator.DEFAULT.buffer(); serializer.serializeHeader(action, bufferHeader); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/actions/SetNwTosActionSerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/actions/SetNwTosActionSerializerTest.java index c52744bea2..1def9d0303 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/actions/SetNwTosActionSerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/actions/SetNwTosActionSerializerTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.protocol.serialization.actions; import static org.junit.Assert.assertEquals; @@ -18,23 +17,19 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.acti import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.nw.tos.action._case.SetNwTosActionBuilder; public class SetNwTosActionSerializerTest extends AbstractSetFieldActionSerializerTest { - @Test public void testSerialize() { final int tos = 10; final Action action = new SetNwTosActionCaseBuilder() - .setSetNwTosAction(new SetNwTosActionBuilder() - .setTos(10) - .build()) + .setSetNwTosAction(new SetNwTosActionBuilder().setTos(10).build()) .build(); - assertAction(action, out -> assertEquals(out.readUnsignedByte(), (short) ActionUtil.tosToDscp((short) tos))); + assertAction(action, out -> assertEquals(out.readUnsignedByte(), ActionUtil.tosToDscp((short) tos).toJava())); } @Override protected Class getClazz() { return SetNwTosActionCase.class; } - } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/instructions/AbstractInstructionSerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/instructions/AbstractInstructionSerializerTest.java index 66f6ac63e4..c17a42e079 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/instructions/AbstractInstructionSerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/instructions/AbstractInstructionSerializerTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.protocol.serialization.instructions; import static org.junit.Assert.assertEquals; @@ -24,7 +23,7 @@ public abstract class AbstractInstructionSerializerTest extends AbstractSerializ @Override protected void init() { - serializer = getRegistry().getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, getClazz())); + serializer = getRegistry().getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, getClazz())); } protected void assertInstruction(final Instruction instruction, final Consumer assertBody) { diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/AbstractMatchEntrySerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/AbstractMatchEntrySerializerTest.java index 4b427d428e..a569539ee4 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/AbstractMatchEntrySerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/AbstractMatchEntrySerializerTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.protocol.serialization.match; import static org.junit.Assert.assertEquals; @@ -23,7 +22,7 @@ public abstract class AbstractMatchEntrySerializerTest extends AbstractSerialize @Override protected void init() { - serializer = getRegistry().getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, Match.class)); + serializer = getRegistry().getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, Match.class)); } protected void assertMatch(final Match match, diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/AsyncConfigMessageSerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/AsyncConfigMessageSerializerTest.java index f3c0a31cfa..a4225f8e67 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/AsyncConfigMessageSerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/AsyncConfigMessageSerializerTest.java @@ -87,7 +87,7 @@ public class AsyncConfigMessageSerializerTest extends AbstractSerializerTest { @Override protected void init() { serializer = getRegistry() - .getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, AsyncConfigMessage.class)); + .getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, AsyncConfigMessage.class)); } @Test diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/FlowMessageSerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/FlowMessageSerializerTest.java index 5b62f97174..1d17cdb602 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/FlowMessageSerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/FlowMessageSerializerTest.java @@ -181,7 +181,7 @@ public class FlowMessageSerializerTest extends AbstractSerializerTest { @Override protected void init() { serializer = getRegistry() - .getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, FlowMessage.class)); + .getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, FlowMessage.class)); } @Test diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/GroupMessageSerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/GroupMessageSerializerTest.java index 7e6b402f84..43b3838b54 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/GroupMessageSerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/GroupMessageSerializerTest.java @@ -97,7 +97,7 @@ public class GroupMessageSerializerTest extends AbstractSerializerTest { @Override protected void init() { serializer = getRegistry() - .getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, GroupMessage.class)); + .getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, GroupMessage.class)); } @Test diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/MeterMessageSerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/MeterMessageSerializerTest.java index db2e6569ea..560f9a8ee2 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/MeterMessageSerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/MeterMessageSerializerTest.java @@ -110,7 +110,7 @@ public class MeterMessageSerializerTest extends AbstractSerializerTest { @Override protected void init() { serializer = getRegistry() - .getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, MeterMessage.class)) ; + .getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, MeterMessage.class)) ; } @Test diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/PortMessageSerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/PortMessageSerializerTest.java index 4479bc6e04..7d9df98588 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/PortMessageSerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/PortMessageSerializerTest.java @@ -97,7 +97,7 @@ public class PortMessageSerializerTest extends AbstractSerializerTest { @Override protected void init() { serializer = getRegistry() - .getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, PortMessage.class)); + .getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, PortMessage.class)); } @Test diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestDescSerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestDescSerializerTest.java index 622676b9dc..7a0bea3be7 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestDescSerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestDescSerializerTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.protocol.serialization.multipart; import static org.junit.Assert.assertEquals; @@ -27,7 +26,7 @@ public class MultipartRequestDescSerializerTest extends AbstractSerializerTest { @Override protected void init() { - serializer = getRegistry().getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, + serializer = getRegistry().getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, MultipartRequestDesc.class)) ; } @@ -37,5 +36,4 @@ public class MultipartRequestDescSerializerTest extends AbstractSerializerTest { serializer.serialize(BODY, out); assertEquals(out.readableBytes(), 0); } - } \ No newline at end of file diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestFlowAggregateStatsSerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestFlowAggregateStatsSerializerTest.java index 1af8d6bf5c..2ce33d2ef1 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestFlowAggregateStatsSerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestFlowAggregateStatsSerializerTest.java @@ -55,7 +55,7 @@ public class MultipartRequestFlowAggregateStatsSerializerTest extends AbstractSe @Override protected void init() { - serializer = getRegistry().getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, + serializer = getRegistry().getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, MultipartRequestFlowAggregateStats.class)) ; } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestFlowStatsSerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestFlowStatsSerializerTest.java index 31faa9571e..1b6dfa57e6 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestFlowStatsSerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestFlowStatsSerializerTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.protocol.serialization.multipart; import static org.junit.Assert.assertEquals; @@ -56,7 +55,7 @@ public class MultipartRequestFlowStatsSerializerTest extends AbstractSerializerT @Override protected void init() { - serializer = getRegistry().getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, + serializer = getRegistry().getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, MultipartRequestFlowStats.class)) ; } @@ -89,5 +88,4 @@ public class MultipartRequestFlowStatsSerializerTest extends AbstractSerializerT assertEquals(out.readableBytes(), 0); } - } \ No newline at end of file diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestFlowTableStatsSerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestFlowTableStatsSerializerTest.java index 1832051267..5a3d34429f 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestFlowTableStatsSerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestFlowTableStatsSerializerTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.protocol.serialization.multipart; import static org.junit.Assert.assertEquals; @@ -27,7 +26,7 @@ public class MultipartRequestFlowTableStatsSerializerTest extends AbstractSerial @Override protected void init() { - serializer = getRegistry().getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, + serializer = getRegistry().getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, MultipartRequestFlowTableStats.class)) ; } @@ -37,5 +36,4 @@ public class MultipartRequestFlowTableStatsSerializerTest extends AbstractSerial serializer.serialize(BODY, out); assertEquals(out.readableBytes(), 0); } - } \ No newline at end of file diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestGroupDescSerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestGroupDescSerializerTest.java index 28e8572bc4..563dc4fb52 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestGroupDescSerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestGroupDescSerializerTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.protocol.serialization.multipart; import static org.junit.Assert.assertEquals; @@ -20,14 +19,13 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111. import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.multipart.request.multipart.request.body.MultipartRequestGroupDescBuilder; public class MultipartRequestGroupDescSerializerTest extends AbstractSerializerTest { - private static final MultipartRequestGroupDesc BODY = new MultipartRequestGroupDescBuilder() - .build(); + private static final MultipartRequestGroupDesc BODY = new MultipartRequestGroupDescBuilder().build(); private MultipartRequestGroupDescSerializer serializer; @Override protected void init() { - serializer = getRegistry().getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, + serializer = getRegistry().getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, MultipartRequestGroupDesc.class)) ; } @@ -37,5 +35,4 @@ public class MultipartRequestGroupDescSerializerTest extends AbstractSerializerT serializer.serialize(BODY, out); assertEquals(out.readableBytes(), 0); } - } \ No newline at end of file diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestGroupFeaturesSerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestGroupFeaturesSerializerTest.java index a698049946..a76c05ef48 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestGroupFeaturesSerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestGroupFeaturesSerializerTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.protocol.serialization.multipart; import static org.junit.Assert.assertEquals; @@ -20,14 +19,13 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111. import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.multipart.request.multipart.request.body.MultipartRequestGroupFeaturesBuilder; public class MultipartRequestGroupFeaturesSerializerTest extends AbstractSerializerTest { - private static final MultipartRequestGroupFeatures BODY = new MultipartRequestGroupFeaturesBuilder() - .build(); + private static final MultipartRequestGroupFeatures BODY = new MultipartRequestGroupFeaturesBuilder().build(); private MultipartRequestGroupFeaturesSerializer serializer; @Override protected void init() { - serializer = getRegistry().getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, + serializer = getRegistry().getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, MultipartRequestGroupFeatures.class)) ; } @@ -37,5 +35,4 @@ public class MultipartRequestGroupFeaturesSerializerTest extends AbstractSeriali serializer.serialize(BODY, out); assertEquals(out.readableBytes(), 0); } - } \ No newline at end of file diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestGroupStatsSerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestGroupStatsSerializerTest.java index f0159fac94..b5064a1799 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestGroupStatsSerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestGroupStatsSerializerTest.java @@ -31,7 +31,7 @@ public class MultipartRequestGroupStatsSerializerTest extends AbstractSerializer @Override protected void init() { - serializer = getRegistry().getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, + serializer = getRegistry().getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, MultipartRequestGroupStats.class)) ; } @@ -44,5 +44,4 @@ public class MultipartRequestGroupStatsSerializerTest extends AbstractSerializer out.skipBytes(PADDING_IN_MULTIPART_REQUEST_GROUP_BODY); assertEquals(out.readableBytes(), 0); } - } \ No newline at end of file diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestMessageSerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestMessageSerializerTest.java index a2e48f4658..0e6c905de6 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestMessageSerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestMessageSerializerTest.java @@ -54,7 +54,7 @@ public class MultipartRequestMessageSerializerTest extends AbstractSerializerTes @Override protected void init() { serializer = getRegistry() - .getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, MultipartRequest.class)); + .getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, MultipartRequest.class)); } @Test diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestMeterConfigSerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestMeterConfigSerializerTest.java index 04c5fbd464..34d5c1d293 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestMeterConfigSerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestMeterConfigSerializerTest.java @@ -30,7 +30,7 @@ public class MultipartRequestMeterConfigSerializerTest extends AbstractSerialize @Override protected void init() { - serializer = getRegistry().getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, + serializer = getRegistry().getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, MultipartRequestMeterConfig.class)); } @@ -43,5 +43,4 @@ public class MultipartRequestMeterConfigSerializerTest extends AbstractSerialize out.skipBytes(PADDING_IN_MULTIPART_REQUEST_METER_CONFIG_BODY); assertEquals(out.readableBytes(), 0); } - } \ No newline at end of file diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestMeterFeaturesSerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestMeterFeaturesSerializerTest.java index 70e36b9eb3..59a1f2e308 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestMeterFeaturesSerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestMeterFeaturesSerializerTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.protocol.serialization.multipart; import static org.junit.Assert.assertEquals; @@ -20,14 +19,13 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111. import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.multipart.request.multipart.request.body.MultipartRequestMeterFeaturesBuilder; public class MultipartRequestMeterFeaturesSerializerTest extends AbstractSerializerTest { - private static final MultipartRequestMeterFeatures BODY = new MultipartRequestMeterFeaturesBuilder() - .build(); + private static final MultipartRequestMeterFeatures BODY = new MultipartRequestMeterFeaturesBuilder().build(); private MultipartRequestMeterFeaturesSerializer serializer; @Override protected void init() { - serializer = getRegistry().getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, + serializer = getRegistry().getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, MultipartRequestMeterFeatures.class)) ; } @@ -37,5 +35,4 @@ public class MultipartRequestMeterFeaturesSerializerTest extends AbstractSeriali serializer.serialize(BODY, out); assertEquals(out.readableBytes(), 0); } - } \ No newline at end of file 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 64cb77766c..995b85a258 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 @@ -31,7 +31,7 @@ public class MultipartRequestMeterStatsSerializerTest extends AbstractSerializer @Override protected void init() { - serializer = getRegistry().getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, + serializer = getRegistry().getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, MultipartRequestMeterStats.class)); } @@ -44,5 +44,4 @@ public class MultipartRequestMeterStatsSerializerTest extends AbstractSerializer out.skipBytes(PADDING_IN_MULTIPART_REQUEST_METER_BODY); assertEquals(out.readableBytes(), 0); } - } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestPortDescSerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestPortDescSerializerTest.java index 666f6b5e29..298bdda13f 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestPortDescSerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestPortDescSerializerTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.protocol.serialization.multipart; import static org.junit.Assert.assertEquals; @@ -27,7 +26,7 @@ public class MultipartRequestPortDescSerializerTest extends AbstractSerializerTe @Override protected void init() { - serializer = getRegistry().getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, + serializer = getRegistry().getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, MultipartRequestPortDesc.class)); } @@ -37,5 +36,4 @@ public class MultipartRequestPortDescSerializerTest extends AbstractSerializerTe serializer.serialize(BODY, out); assertEquals(out.readableBytes(), 0); } - } \ No newline at end of file diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestPortStatsSerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestPortStatsSerializerTest.java index aae23c5a4b..322ff215f1 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestPortStatsSerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestPortStatsSerializerTest.java @@ -31,7 +31,7 @@ public class MultipartRequestPortStatsSerializerTest extends AbstractSerializerT @Override protected void init() { - serializer = getRegistry().getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, + serializer = getRegistry().getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, MultipartRequestPortStats.class)); } @@ -44,5 +44,4 @@ public class MultipartRequestPortStatsSerializerTest extends AbstractSerializerT out.skipBytes(PADDING_IN_MULTIPART_REQUEST_PORTSTATS_BODY); assertEquals(out.readableBytes(), 0); } - } \ No newline at end of file diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestQueueStatsSerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestQueueStatsSerializerTest.java index 89315cbfe9..2ae798d650 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestQueueStatsSerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestQueueStatsSerializerTest.java @@ -33,7 +33,7 @@ public class MultipartRequestQueueStatsSerializerTest extends AbstractSerializer @Override protected void init() { - serializer = getRegistry().getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, + serializer = getRegistry().getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, MultipartRequestQueueStats.class)); } @@ -46,5 +46,4 @@ public class MultipartRequestQueueStatsSerializerTest extends AbstractSerializer assertEquals(out.readUnsignedInt(), QUEUE_ID.longValue()); assertEquals(out.readableBytes(), 0); } - } \ No newline at end of file diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestTableFeaturesSerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestTableFeaturesSerializerTest.java index 8fadd75dda..0a5c3ca36d 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestTableFeaturesSerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestTableFeaturesSerializerTest.java @@ -70,7 +70,7 @@ public class MultipartRequestTableFeaturesSerializerTest extends AbstractSeriali @Override protected void init() { - serializer = getRegistry().getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, + serializer = getRegistry().getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, MultipartRequestTableFeatures.class)); } @@ -98,5 +98,4 @@ public class MultipartRequestTableFeaturesSerializerTest extends AbstractSeriali assertEquals(out.readableBytes(), 0); } - } \ No newline at end of file diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/AbstractTablePropertySerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/AbstractTablePropertySerializerTest.java index bdf28470fc..d2860d804e 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/AbstractTablePropertySerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/AbstractTablePropertySerializerTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.protocol.serialization.multipart.tablefeatures; import static org.junit.Assert.assertEquals; @@ -24,7 +23,7 @@ public abstract class AbstractTablePropertySerializerTest extends AbstractSerial @Override protected void init() { - serializer = getRegistry().getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, getClazz())); + serializer = getRegistry().getSerializer(new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, getClazz())); } protected void assertProperty(final TableFeaturePropType property, final Consumer assertBody) { diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImplTest.java index 479f0241f8..30afdaa2de 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImplTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImplTest.java @@ -8,10 +8,13 @@ package org.opendaylight.openflowplugin.impl.rpc; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.anySet; import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -20,7 +23,6 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.Mockito; import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.mdsal.binding.api.NotificationPublishService; import org.opendaylight.mdsal.binding.api.RpcProviderService; @@ -40,6 +42,7 @@ import org.opendaylight.yangtools.concepts.ObjectRegistration; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; import org.opendaylight.yangtools.yang.binding.RpcService; +import org.opendaylight.yangtools.yang.common.Uint32; @RunWith(MockitoJUnitRunner.class) public class RpcContextImplTest { @@ -80,6 +83,7 @@ public class RpcContextImplTest { when(deviceContext.getMessageSpy()).thenReturn(messageSpy); when(deviceContext.getDeviceInfo()).thenReturn(deviceInfo); when(deviceInfo.getNodeInstanceIdentifier()).thenReturn(nodeInstanceIdentifier); + when(deviceInfo.reserveXidForDeviceMessage()).thenReturn(Uint32.TWO); rpcContext = new RpcContextImpl( rpcProviderRegistry, @@ -139,9 +143,9 @@ public class RpcContextImplTest { public void testRegisterRpcServiceImplementation() { rpcContext.registerRpcServiceImplementation(TestRpcService.class, serviceInstance); - verify(rpcProviderRegistry, Mockito.times(1)).registerRpcImplementation(TestRpcService.class, serviceInstance, + verify(rpcProviderRegistry, times(1)).registerRpcImplementation(TestRpcService.class, serviceInstance, ImmutableSet.of(nodeInstanceIdentifier)); - assertEquals(rpcContext.isEmptyRpcRegistrations(), false); + assertFalse(rpcContext.isEmptyRpcRegistrations()); } @Test @@ -149,7 +153,7 @@ public class RpcContextImplTest { when(routedRpcReg.getInstance()).thenReturn(serviceInstance); rpcContext.registerRpcServiceImplementation(TestRpcService.class, serviceInstance); TestRpcService temp = rpcContext.lookupRpcService(TestRpcService.class); - assertEquals(serviceInstance,temp); + assertEquals(serviceInstance, temp); } @Test @@ -157,7 +161,7 @@ public class RpcContextImplTest { when(routedRpcReg.getInstance()).thenReturn(serviceInstance); rpcContext.registerRpcServiceImplementation(TestRpcService.class, serviceInstance); rpcContext.close(); - assertEquals(rpcContext.isEmptyRpcRegistrations(), true); + assertTrue(rpcContext.isEmptyRpcRegistrations()); } /** @@ -166,7 +170,7 @@ public class RpcContextImplTest { @Test public void testCreateRequestContext1() { when(deviceInfo.reserveXidForDeviceMessage()).thenReturn(null); - assertEquals(rpcContext.createRequestContext(),null); + assertNull(rpcContext.createRequestContext()); } /** @@ -183,9 +187,9 @@ public class RpcContextImplTest { @Test public void testUnregisterRpcServiceImpl() { rpcContext.registerRpcServiceImplementation(TestRpcService.class, serviceInstance); - assertEquals(rpcContext.isEmptyRpcRegistrations(), false); + assertFalse(rpcContext.isEmptyRpcRegistrations()); rpcContext.unregisterRpcServiceImplementation(TestRpcService.class); - assertEquals(rpcContext.isEmptyRpcRegistrations(), true); + assertTrue(rpcContext.isEmptyRpcRegistrations()); } //Stub for RpcService class. diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/EchoServiceTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/EchoServiceTest.java index e0e22b4fa7..6eaec2b7be 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/EchoServiceTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/EchoServiceTest.java @@ -46,6 +46,6 @@ public class EchoServiceTest extends ServiceMocking { assertTrue(request instanceof EchoInput); final byte[] data = ((EchoInput) request).getData(); assertArrayEquals(DUMMY_DATA, data); - assertEquals(OFConstants.OFP_VERSION_1_3, request.getVersion().shortValue()); + assertEquals(OFConstants.OFP_VERSION_1_3, request.getVersion()); } } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/ServiceMocking.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/ServiceMocking.java index 18f088d0ad..af16cf55df 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/ServiceMocking.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/ServiceMocking.java @@ -56,7 +56,7 @@ import org.opendaylight.yangtools.yang.common.Uint8; @RunWith(MockitoJUnitRunner.class) public abstract class ServiceMocking { protected static final Uint64 DUMMY_DATAPATH_ID = Uint64.valueOf(444); - protected static final Uint8 DUMMY_VERSION = Uint8.valueOf(OFConstants.OFP_VERSION_1_3); + protected static final Uint8 DUMMY_VERSION = OFConstants.OFP_VERSION_1_3; protected static final Uint32 DUMMY_XID_VALUE = Uint32.valueOf(2121L); protected static final Xid DUMMY_XID = new Xid(DUMMY_XID_VALUE); protected static final Uint32 DUMMY_EXPERIMENTER_ID = Uint32.valueOf(42); @@ -123,13 +123,12 @@ public abstract class ServiceMocking { lenient().when(mockedDeviceInfo.getNodeInstanceIdentifier()).thenReturn(DUMMY_NODE_II); when(mockedDeviceInfo.getDatapathId()).thenReturn(DUMMY_DATAPATH_ID); - when(mockedDeviceInfo.getVersion()).thenReturn(DUMMY_VERSION.toJava()); + when(mockedDeviceInfo.getVersion()).thenReturn(DUMMY_VERSION); lenient().when(mockedDeviceContext.getPrimaryConnectionContext()).thenReturn(mockedPrimConnectionContext); when(mockedDeviceContext.getMessageSpy()).thenReturn(mockedMessagSpy); lenient().when(mockedDeviceContext.getDeviceFlowRegistry()) - .thenReturn(new DeviceFlowRegistryImpl(DUMMY_VERSION.toJava(), dataBroker, DUMMY_NODE_II, - historyAppender)); + .thenReturn(new DeviceFlowRegistryImpl(DUMMY_VERSION, dataBroker, DUMMY_NODE_II, historyAppender)); lenient().when(mockedDeviceContext.getDeviceState()).thenReturn(mockedDeviceState); when(mockedDeviceContext.getDeviceInfo()).thenReturn(mockedDeviceInfo); lenient().when(mockedDeviceContext.getMultiMsgCollector(any())).thenReturn(multiMessageCollector); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/batch/FlatBatchFlowAdaptersTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/batch/FlatBatchFlowAdaptersTest.java index dcc402e6cb..0d98ca8e6e 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/batch/FlatBatchFlowAdaptersTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/batch/FlatBatchFlowAdaptersTest.java @@ -15,16 +15,16 @@ import java.util.Iterator; import java.util.List; import org.junit.Test; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.ProcessFlatBatchOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.add.flow._case.FlatBatchAddFlow; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.add.flow._case.FlatBatchAddFlowBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.remove.flow._case.FlatBatchRemoveFlow; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.remove.flow._case.FlatBatchRemoveFlowBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.update.flow._case.FlatBatchUpdateFlow; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.update.flow._case.FlatBatchUpdateFlowBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.failure.ids.aug.FlatBatchFailureFlowIdCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.failure.ids.aug.FlatBatchFailureFlowIdCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.flat.batch.add.flow._case.FlatBatchAddFlow; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.flat.batch.add.flow._case.FlatBatchAddFlowBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.flat.batch.remove.flow._case.FlatBatchRemoveFlow; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.flat.batch.remove.flow._case.FlatBatchRemoveFlowBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.flat.batch.update.flow._case.FlatBatchUpdateFlow; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.flat.batch.update.flow._case.FlatBatchUpdateFlowBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.output.BatchFailure; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.output.BatchFailureBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.output.batch.failure.batch.item.id.choice.FlatBatchFailureFlowIdCase; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.output.batch.failure.batch.item.id.choice.FlatBatchFailureFlowIdCaseBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowId; import org.opendaylight.yang.gen.v1.urn.opendaylight.flows.service.rev160314.AddFlowsBatchInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.flows.service.rev160314.AddFlowsBatchOutputBuilder; diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/batch/FlatBatchGroupAdaptersTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/batch/FlatBatchGroupAdaptersTest.java index 8c76dc0105..ec7e2f0014 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/batch/FlatBatchGroupAdaptersTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/batch/FlatBatchGroupAdaptersTest.java @@ -12,16 +12,16 @@ import java.util.Iterator; import org.junit.Assert; import org.junit.Test; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.ProcessFlatBatchOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.add.group._case.FlatBatchAddGroup; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.add.group._case.FlatBatchAddGroupBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.remove.group._case.FlatBatchRemoveGroup; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.remove.group._case.FlatBatchRemoveGroupBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.update.group._case.FlatBatchUpdateGroup; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.update.group._case.FlatBatchUpdateGroupBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.failure.ids.aug.FlatBatchFailureGroupIdCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.failure.ids.aug.FlatBatchFailureGroupIdCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.flat.batch.add.group._case.FlatBatchAddGroup; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.flat.batch.add.group._case.FlatBatchAddGroupBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.flat.batch.remove.group._case.FlatBatchRemoveGroup; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.flat.batch.remove.group._case.FlatBatchRemoveGroupBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.flat.batch.update.group._case.FlatBatchUpdateGroup; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.flat.batch.update.group._case.FlatBatchUpdateGroupBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.output.BatchFailure; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.output.BatchFailureBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.output.batch.failure.batch.item.id.choice.FlatBatchFailureGroupIdCase; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.output.batch.failure.batch.item.id.choice.FlatBatchFailureGroupIdCaseBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.GroupId; import org.opendaylight.yang.gen.v1.urn.opendaylight.groups.service.rev160315.AddGroupsBatchInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.groups.service.rev160315.AddGroupsBatchOutputBuilder; diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/batch/FlatBatchMeterAdaptersTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/batch/FlatBatchMeterAdaptersTest.java index c4e5ec1cca..ee5790e716 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/batch/FlatBatchMeterAdaptersTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/batch/FlatBatchMeterAdaptersTest.java @@ -12,16 +12,16 @@ import java.util.Iterator; import org.junit.Assert; import org.junit.Test; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.ProcessFlatBatchOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.add.meter._case.FlatBatchAddMeter; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.add.meter._case.FlatBatchAddMeterBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.remove.meter._case.FlatBatchRemoveMeter; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.remove.meter._case.FlatBatchRemoveMeterBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.update.meter._case.FlatBatchUpdateMeter; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.update.meter._case.FlatBatchUpdateMeterBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.failure.ids.aug.FlatBatchFailureMeterIdCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.failure.ids.aug.FlatBatchFailureMeterIdCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.flat.batch.add.meter._case.FlatBatchAddMeter; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.flat.batch.add.meter._case.FlatBatchAddMeterBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.flat.batch.remove.meter._case.FlatBatchRemoveMeter; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.flat.batch.remove.meter._case.FlatBatchRemoveMeterBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.flat.batch.update.meter._case.FlatBatchUpdateMeter; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.flat.batch.update.meter._case.FlatBatchUpdateMeterBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.output.BatchFailure; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.output.BatchFailureBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.output.batch.failure.batch.item.id.choice.FlatBatchFailureMeterIdCase; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.output.batch.failure.batch.item.id.choice.FlatBatchFailureMeterIdCaseBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeRef; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes; diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalAsyncConfigServiceImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalAsyncConfigServiceImplTest.java index 564f08a82d..0380e7b5e5 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalAsyncConfigServiceImplTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalAsyncConfigServiceImplTest.java @@ -5,9 +5,9 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.services.sal; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; @@ -17,7 +17,6 @@ import java.util.concurrent.Future; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.ArgumentMatchers; import org.mockito.Mockito; import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.openflowplugin.impl.services.ServiceMocking; @@ -75,7 +74,6 @@ public class SalAsyncConfigServiceImplTest extends ServiceMocking { Assert.assertTrue(getAsyncResult.isDone()); Assert.assertTrue(getAsyncResult.get().isSuccessful()); verify(mockedRequestContextStack).createRequestContext(); - verify(mockedOutboundQueue).commitEntry(eq(ServiceMocking.DUMMY_XID_VALUE.toJava()), - ArgumentMatchers.any(), ArgumentMatchers.any()); + verify(mockedOutboundQueue).commitEntry(eq(ServiceMocking.DUMMY_XID_VALUE), any(), any()); } } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalEchoServiceImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalEchoServiceImplTest.java index cd227966c5..44e0271a8c 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalEchoServiceImplTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalEchoServiceImplTest.java @@ -5,9 +5,9 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.services.sal; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; @@ -16,7 +16,6 @@ import com.google.common.util.concurrent.ListenableFuture; import java.util.concurrent.Future; import org.junit.Assert; import org.junit.Test; -import org.mockito.ArgumentMatchers; import org.mockito.Mockito; import org.opendaylight.openflowplugin.impl.services.ServiceMocking; import org.opendaylight.yang.gen.v1.urn.opendaylight.echo.service.rev150305.SendEchoInput; @@ -26,6 +25,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.EchoOutputBuilder; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; +import org.opendaylight.yangtools.yang.common.Uint32; public class SalEchoServiceImplTest extends ServiceMocking { @@ -55,8 +55,6 @@ public class SalEchoServiceImplTest extends ServiceMocking { Assert.assertTrue(echoOutput.isDone()); Assert.assertTrue(echoOutput.get().isSuccessful()); verify(mockedRequestContextStack).createRequestContext(); - verify(mockedOutboundQueue) - .commitEntry(eq(2121L), ArgumentMatchers.any(), - ArgumentMatchers.any()); + verify(mockedOutboundQueue).commitEntry(eq(Uint32.valueOf(2121)), any(), any()); } } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalExperimenterMessageServiceImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalExperimenterMessageServiceImplTest.java index 991944f40d..cf41711085 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalExperimenterMessageServiceImplTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalExperimenterMessageServiceImplTest.java @@ -52,7 +52,7 @@ public class SalExperimenterMessageServiceImplTest extends ServiceMocking { Mockito.when(extensionConverterProvider.getMessageConverter(ArgumentMatchers.any())) .thenReturn(extensionConverter); Mockito.when(extensionConverter.getExperimenterId()).thenReturn(new ExperimenterId(Uint32.valueOf(43))); - Mockito.when(extensionConverter.getType()).thenReturn(44L); + Mockito.when(extensionConverter.getType()).thenReturn(Uint32.valueOf(44)); } @Test diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalFlatBatchServiceImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalFlatBatchServiceImplTest.java index f9b2e22953..31f41faf81 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalFlatBatchServiceImplTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalFlatBatchServiceImplTest.java @@ -35,33 +35,33 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev16032 import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.ProcessFlatBatchInputBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.ProcessFlatBatchOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.ProcessFlatBatchOutputBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.failure.ids.aug.FlatBatchFailureFlowIdCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.failure.ids.aug.FlatBatchFailureFlowIdCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.FlatBatchAddFlowCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.FlatBatchRemoveFlowCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.FlatBatchUpdateFlowCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.flat.batch.add.flow._case.FlatBatchAddFlow; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.flat.batch.add.flow._case.FlatBatchAddFlowBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.flat.batch.add.flow._case.FlatBatchAddFlowKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.flat.batch.remove.flow._case.FlatBatchRemoveFlowBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.flat.batch.update.flow._case.FlatBatchUpdateFlowBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.FlatBatchAddGroupCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.FlatBatchRemoveGroupCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.FlatBatchUpdateGroupCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.flat.batch.add.group._case.FlatBatchAddGroupBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.flat.batch.remove.group._case.FlatBatchRemoveGroupBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.flat.batch.update.group._case.FlatBatchUpdateGroupBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.FlatBatchAddMeterCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.FlatBatchRemoveMeterCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.FlatBatchUpdateMeterCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.flat.batch.add.meter._case.FlatBatchAddMeterBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.flat.batch.remove.meter._case.FlatBatchRemoveMeterBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.flat.batch.update.meter._case.FlatBatchUpdateMeterBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.Batch; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.BatchBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.BatchKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchAddFlowCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchAddGroupCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchAddMeterCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchRemoveFlowCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchRemoveGroupCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchRemoveMeterCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchUpdateFlowCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchUpdateGroupCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchUpdateMeterCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.add.flow._case.FlatBatchAddFlow; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.add.flow._case.FlatBatchAddFlowBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.add.flow._case.FlatBatchAddFlowKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.add.group._case.FlatBatchAddGroupBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.add.meter._case.FlatBatchAddMeterBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.remove.flow._case.FlatBatchRemoveFlowBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.remove.group._case.FlatBatchRemoveGroupBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.remove.meter._case.FlatBatchRemoveMeterBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.update.flow._case.FlatBatchUpdateFlowBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.update.group._case.FlatBatchUpdateGroupBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.update.meter._case.FlatBatchUpdateMeterBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.output.BatchFailure; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.output.BatchFailureBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.output.batch.failure.batch.item.id.choice.FlatBatchFailureFlowIdCase; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.output.batch.failure.batch.item.id.choice.FlatBatchFailureFlowIdCaseBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowId; import org.opendaylight.yang.gen.v1.urn.opendaylight.flows.service.rev160314.AddFlowsBatchInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.flows.service.rev160314.AddFlowsBatchOutput; diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalFlowServiceImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalFlowServiceImplTest.java index fe0ea6f7e1..ebf4475a5f 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalFlowServiceImplTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalFlowServiceImplTest.java @@ -132,10 +132,9 @@ public class SalFlowServiceImplTest extends TestCase { when(mockedDeviceContext.getDeviceInfo()).thenReturn(mockedDeviceInfo); } - private SalFlowServiceImpl mockSalFlowService(final short version) { - Uint8 ver = Uint8.valueOf(version); - when(mockedFeatures.getVersion()).thenReturn(ver); - when(mockedFeaturesOutput.getVersion()).thenReturn(ver); + private SalFlowServiceImpl mockSalFlowService(final Uint8 version) { + when(mockedFeatures.getVersion()).thenReturn(version); + when(mockedFeaturesOutput.getVersion()).thenReturn(version); when(mockedDeviceInfo.getVersion()).thenReturn(version); final ConvertorManager convertorManager = ConvertorManagerFactory.createDefaultManager(); @@ -158,7 +157,7 @@ public class SalFlowServiceImplTest extends TestCase { addFlowFailCallback(OFConstants.OFP_VERSION_1_3); } - private void addFlowFailCallback(final short version) throws InterruptedException, ExecutionException { + private void addFlowFailCallback(final Uint8 version) throws InterruptedException, ExecutionException { AddFlowInput mockedAddFlowInput = new AddFlowInputBuilder() .setMatch(match) .setTableId(Uint8.ONE) @@ -187,7 +186,7 @@ public class SalFlowServiceImplTest extends TestCase { removeFlowFailCallback(OFConstants.OFP_VERSION_1_3); } - private void removeFlowFailCallback(final short version) throws InterruptedException, ExecutionException { + private void removeFlowFailCallback(final Uint8 version) throws InterruptedException, ExecutionException { RemoveFlowInput mockedRemoveFlowInput = new RemoveFlowInputBuilder() .setTableId(Uint8.ONE) .setMatch(match) @@ -212,7 +211,7 @@ public class SalFlowServiceImplTest extends TestCase { addFlow(OFConstants.OFP_VERSION_1_3); } - private void addFlow(final short version) throws ExecutionException, InterruptedException { + private void addFlow(final Uint8 version) throws ExecutionException, InterruptedException { AddFlowInput mockedAddFlowInput = new AddFlowInputBuilder() .setMatch(match) .setTableId(Uint8.ONE) @@ -235,7 +234,7 @@ public class SalFlowServiceImplTest extends TestCase { removeFlow(OFConstants.OFP_VERSION_1_3); } - private void removeFlow(final short version) throws Exception { + private void removeFlow(final Uint8 version) throws Exception { RemoveFlowInput mockedRemoveFlowInput = new RemoveFlowInputBuilder() .setMatch(match) .setTableId(Uint8.ONE) @@ -258,7 +257,7 @@ public class SalFlowServiceImplTest extends TestCase { updateFlow(OFConstants.OFP_VERSION_1_3); } - private void updateFlow(final short version) throws Exception { + private void updateFlow(final Uint8 version) throws Exception { UpdateFlowInput mockedUpdateFlowInput = mock(UpdateFlowInput.class); UpdateFlowInput mockedUpdateFlowInput1 = mock(UpdateFlowInput.class); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalTableServiceImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalTableServiceImplTest.java index e7969139e3..95e96ac22a 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalTableServiceImplTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalTableServiceImplTest.java @@ -7,7 +7,7 @@ */ package org.opendaylight.openflowplugin.impl.services.sal; -import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -18,7 +18,6 @@ import java.util.List; import java.util.concurrent.Future; import org.junit.Assert; import org.junit.Test; -import org.mockito.ArgumentMatchers; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.stubbing.Answer; @@ -59,9 +58,7 @@ public class SalTableServiceImplTest extends ServiceMocking { final FutureCallback callback = (FutureCallback) invocation.getArguments()[2]; callback.onSuccess(null); return null; - }) - .when(mockedOutboundQueue).commitEntry( - anyLong(), ArgumentMatchers.any(), ArgumentMatchers.any()); + }).when(mockedOutboundQueue).commitEntry(any(Uint32.class), any(), any()); final ConvertorManager convertorManager = ConvertorManagerFactory.createDefaultManager(); salTableService = new SalTableServiceImpl(mockedRequestContextStack, mockedDeviceContext, @@ -75,7 +72,7 @@ public class SalTableServiceImplTest extends ServiceMocking { RpcResultBuilder.>failed().build(); handleResultFuture.set(rpcResult); return null; - }).when(multiMessageCollector).endCollecting(ArgumentMatchers.any()); + }).when(multiMessageCollector).endCollecting(any()); final Future> rpcResultFuture = salTableService.updateTable(prepareUpdateTable()); Assert.assertNotNull(rpcResultFuture); @@ -90,7 +87,7 @@ public class SalTableServiceImplTest extends ServiceMocking { .build(); handleResultFuture.set(rpcResult); return null; - }).when(multiMessageCollector).endCollecting(ArgumentMatchers.any()); + }).when(multiMessageCollector).endCollecting(any()); final Future> rpcResultFuture = salTableService.updateTable(prepareUpdateTable()); Assert.assertNotNull(rpcResultFuture); @@ -118,7 +115,7 @@ public class SalTableServiceImplTest extends ServiceMocking { .build(); handleResultFuture.set(rpcResult); return null; - }).when(multiMessageCollector).endCollecting(ArgumentMatchers.any()); + }).when(multiMessageCollector).endCollecting(any()); final Future> rpcResultFuture = salTableService.updateTable(prepareUpdateTable()); Assert.assertNotNull(rpcResultFuture); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/util/RequestInputUtilsTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/util/RequestInputUtilsTest.java index 210ac32a94..6ef95bbba5 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/util/RequestInputUtilsTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/util/RequestInputUtilsTest.java @@ -15,11 +15,12 @@ import org.opendaylight.openflowplugin.api.OFConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MultipartType; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartRequestInput; import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint8; public class RequestInputUtilsTest { @Test public void createMultipartHeader() { - final short version = OFConstants.OFP_VERSION_1_3; + final Uint8 version = OFConstants.OFP_VERSION_1_3; final Uint32 xid = Uint32.valueOf(42L); final MultipartType type = MultipartType.OFPMPDESC; @@ -27,7 +28,7 @@ public class RequestInputUtilsTest { .createMultipartHeader(type, xid, version) .build(); - assertEquals(version, input.getVersion().toJava()); + assertEquals(version, input.getVersion()); assertEquals(xid, input.getXid()); assertEquals(type, input.getType()); assertFalse(input.getFlags().getOFPMPFREQMORE()); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/MultipartReplyTranslatorTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/MultipartReplyTranslatorTest.java index dee46593f0..dfc2bf06fa 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/MultipartReplyTranslatorTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/MultipartReplyTranslatorTest.java @@ -55,7 +55,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.n import org.opendaylight.yangtools.yang.binding.DataContainer; import org.opendaylight.yangtools.yang.common.Uint32; import org.opendaylight.yangtools.yang.common.Uint64; -import org.opendaylight.yangtools.yang.common.Uint8; public class MultipartReplyTranslatorTest { @@ -295,7 +294,7 @@ public class MultipartReplyTranslatorTest { final MultipartType multipartType) { ConnectionContext mockedConnectionContext = mock(ConnectionContext.class); FeaturesReply mockedFeaturesReply = mock(FeaturesReply.class); - when(mockedFeaturesReply.getVersion()).thenReturn(Uint8.valueOf(OFConstants.OFP_VERSION_1_3)); + when(mockedFeaturesReply.getVersion()).thenReturn(OFConstants.OFP_VERSION_1_3); when(mockedFeaturesReply.getDatapathId()).thenReturn(DUMMY_DATAPATH_ID); DeviceInfo deviceInfo = mock(DeviceInfo.class); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsContextImpMockInitiation.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsContextImpMockInitiation.java index 8269dbe12d..6ecd586311 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsContextImpMockInitiation.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsContextImpMockInitiation.java @@ -32,6 +32,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; import org.opendaylight.yangtools.yang.common.Uint64; +import org.opendaylight.yangtools.yang.common.Uint8; public class StatisticsContextImpMockInitiation { Boolean isTable = false; @@ -75,8 +76,9 @@ public class StatisticsContextImpMockInitiation { when(mockedDeviceContext.getPrimaryConnectionContext()).thenReturn(mockedConnectionContext); when(mockedDeviceContext.getMessageSpy()).thenReturn(mockedMessageSpy); + when(mockedDeviceInfo.getVersion()).thenReturn(Uint8.ONE); when(mockedDeviceInfo.getNodeInstanceIdentifier()).thenReturn(DUMMY_NODE_ID); - when(mockedDeviceInfo.getDatapathId()).thenReturn(Uint64.valueOf(10)); + when(mockedDeviceInfo.getDatapathId()).thenReturn(Uint64.TEN); when(mockedDeviceContext.getDeviceState()).thenReturn(mockedDeviceState); when(mockedDeviceContext.getDeviceInfo()).thenReturn(mockedDeviceInfo); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsContextImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsContextImplTest.java index 00e96f5b54..4ece9a5634 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsContextImplTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsContextImplTest.java @@ -8,7 +8,9 @@ package org.opendaylight.openflowplugin.impl.statistics; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -17,7 +19,7 @@ import static org.mockito.Mockito.when; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.MoreExecutors; import java.util.Collections; -import org.junit.Assert; +import java.util.concurrent.ExecutionException; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -36,15 +38,11 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; import org.opendaylight.yangtools.yang.common.Uint32; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; @RunWith(MockitoJUnitRunner.class) public class StatisticsContextImplTest extends StatisticsContextImpMockInitiation { + private static final Uint32 TEST_XID = Uint32.valueOf(55); - private static final Logger LOG = LoggerFactory.getLogger(StatisticsContextImplTest.class); - - private static final Long TEST_XID = 55L; private StatisticsContextImpl statisticsContext; private ConvertorManager convertorManager; @Mock @@ -55,15 +53,15 @@ public class StatisticsContextImplTest extends StatisticsContextImpMockInitiatio public void setUp() { convertorManager = ConvertorManagerFactory.createDefaultManager(); when(mockedDeviceInfo.reserveXidForDeviceMessage()).thenReturn(TEST_XID); - Mockito.when(mockedDeviceContext.getDeviceState()).thenReturn(mockedDeviceState); - Mockito.when(config.getIsTableStatisticsPollingOn()).thenReturn(true); - Mockito.when(config.getIsFlowStatisticsPollingOn()).thenReturn(true); - Mockito.when(config.getIsGroupStatisticsPollingOn()).thenReturn(true); - Mockito.when(config.getIsMeterStatisticsPollingOn()).thenReturn(true); - Mockito.when(config.getIsPortStatisticsPollingOn()).thenReturn(true); - Mockito.when(config.getIsQueueStatisticsPollingOn()).thenReturn(true); - Mockito.when(config.getBasicTimerDelay()).thenReturn(new NonZeroUint32Type(Uint32.valueOf(3000))); - Mockito.when(config.getMaximumTimerDelay()).thenReturn(new NonZeroUint32Type(Uint32.valueOf(50000))); + when(mockedDeviceContext.getDeviceState()).thenReturn(mockedDeviceState); + when(config.getIsTableStatisticsPollingOn()).thenReturn(true); + when(config.getIsFlowStatisticsPollingOn()).thenReturn(true); + when(config.getIsGroupStatisticsPollingOn()).thenReturn(true); + when(config.getIsMeterStatisticsPollingOn()).thenReturn(true); + when(config.getIsPortStatisticsPollingOn()).thenReturn(true); + when(config.getIsQueueStatisticsPollingOn()).thenReturn(true); + when(config.getBasicTimerDelay()).thenReturn(new NonZeroUint32Type(Uint32.valueOf(3000))); + when(config.getMaximumTimerDelay()).thenReturn(new NonZeroUint32Type(Uint32.valueOf(50000))); initStatisticsContext(); } @@ -85,16 +83,15 @@ public class StatisticsContextImplTest extends StatisticsContextImpMockInitiatio public void testCreateRequestContext() { final RequestContext requestContext = statisticsContext.createRequestContext(); assertNotNull(requestContext); - assertEquals(Uint32.valueOf(TEST_XID), requestContext.getXid().getValue()); - Assert.assertFalse(requestContext.getFuture().isDone()); + assertEquals(TEST_XID, requestContext.getXid().getValue()); + assertFalse(requestContext.getFuture().isDone()); } /** * There is nothing to check in close method. */ @Test - @SuppressWarnings("checkstyle:IllegalCatch") - public void testClose() { + public void testClose() throws InterruptedException, ExecutionException { statisticsContext = new StatisticsContextImpl<>(mockedDeviceContext, convertorManager, @@ -107,15 +104,9 @@ public class StatisticsContextImplTest extends StatisticsContextImpMockInitiatio final RequestContext requestContext = statisticsContext.createRequestContext(); statisticsContext.close(); - try { - Assert.assertTrue(requestContext.getFuture().isDone()); - final RpcResult rpcResult = requestContext.getFuture().get(); - Assert.assertFalse(rpcResult.isSuccessful()); - Assert.assertFalse(rpcResult.isSuccessful()); - } catch (final Exception e) { - LOG.error("request future value should be finished", e); - Assert.fail("request context closing failed"); - } + assertTrue(requestContext.getFuture().isDone()); + final RpcResult rpcResult = requestContext.getFuture().get(); + assertFalse(rpcResult.isSuccessful()); } @Test diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsGatheringUtilsTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsGatheringUtilsTest.java index b02043fceb..3be4cd36e5 100755 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsGatheringUtilsTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsGatheringUtilsTest.java @@ -83,7 +83,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.No import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.NodeMeterStatistics; -import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.nodes.node.meter.MeterStatistics; +import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.node.meter.statistics.MeterStatistics; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.FlowModFlags; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.GroupId; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.GroupType; @@ -185,7 +185,7 @@ public class StatisticsGatheringUtilsTest { when(deviceContext.isTransactionsEnabled()).thenReturn(Boolean.TRUE); when(connectionAdapter.getFeatures()).thenReturn(features); when(features.getDatapathId()).thenReturn(Uint64.ONE); - when(features.getVersion()).thenReturn(Uint8.valueOf(OFConstants.OFP_VERSION_1_3)); + when(features.getVersion()).thenReturn(OFConstants.OFP_VERSION_1_3); when(deviceInfo.getVersion()).thenReturn(OFConstants.OFP_VERSION_1_3); when(deviceInfo.getDatapathId()).thenReturn(Uint64.ONE); when(deviceInfo.getNodeInstanceIdentifier()).thenReturn(dummyNodePath); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/AbstractStatsServiceTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/AbstractStatsServiceTest.java index d376d3d0c9..b777ecd063 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/AbstractStatsServiceTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/AbstractStatsServiceTest.java @@ -38,7 +38,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.Uint64; -import org.opendaylight.yangtools.yang.common.Uint8; /** * Created by mirehak on 7/23/15. @@ -91,9 +90,9 @@ public abstract class AbstractStatsServiceTest { Mockito.lenient().when(deviceInfo.getDatapathId()).thenReturn(Uint64.valueOf(10)); Mockito.lenient().when(connectionContext.getFeatures()).thenReturn(features); Mockito.lenient().when(connectionContext.getOutboundQueueProvider()).thenReturn(outboundQueueProvider); - Mockito.lenient().when(features.getVersion()).thenReturn(Uint8.valueOf(OFConstants.OFP_VERSION_1_3)); + Mockito.lenient().when(features.getVersion()).thenReturn(OFConstants.OFP_VERSION_1_3); Mockito.lenient().when(getFeaturesOutput.getDatapathId()).thenReturn(Uint64.valueOf(123L)); - Mockito.lenient().when(getFeaturesOutput.getVersion()).thenReturn(Uint8.valueOf(OFConstants.OFP_VERSION_1_3)); + Mockito.lenient().when(getFeaturesOutput.getVersion()).thenReturn(OFConstants.OFP_VERSION_1_3); setUp(); } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightFlowStatisticsServiceImpl2Test.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightFlowStatisticsServiceImpl2Test.java index a533e8c9fd..f48b3c8e3e 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightFlowStatisticsServiceImpl2Test.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightFlowStatisticsServiceImpl2Test.java @@ -79,7 +79,7 @@ public class OpendaylightFlowStatisticsServiceImpl2Test extends AbstractStatsSer @Test public void testGetAggregateFlowStatisticsFromFlowTableForGivenMatch() throws Exception { Mockito.doAnswer(answerVoidToCallback).when(outboundQueueProvider) - .commitEntry(eq(42L), requestInput.capture(), Mockito.any()); + .commitEntry(eq(Uint32.valueOf(42)), requestInput.capture(), Mockito.any()); Mockito.doAnswer((Answer) invocation -> { final MultipartReplyMessageBuilder messageBuilder = new MultipartReplyMessageBuilder() .setVersion(EncodeConstants.OF_VERSION_1_3); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightFlowTableStatisticsServiceImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightFlowTableStatisticsServiceImplTest.java index e46bda3b1a..0c33acdf4b 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightFlowTableStatisticsServiceImplTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightFlowTableStatisticsServiceImplTest.java @@ -58,7 +58,7 @@ public class OpendaylightFlowTableStatisticsServiceImplTest extends AbstractSing @Test public void testGetFlowTablesStatistics() throws Exception { Mockito.doAnswer(answerVoidToCallback).when(outboundQueueProvider) - .commitEntry(eq(42L), requestInput.capture(), any(FutureCallback.class)); + .commitEntry(eq(Uint32.valueOf(42)), requestInput.capture(), any(FutureCallback.class)); GetFlowTablesStatisticsInputBuilder input = new GetFlowTablesStatisticsInputBuilder() .setNode(createNodeRef("unitProt:123")); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightGroupStatisticsServiceImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightGroupStatisticsServiceImplTest.java index a874d756c4..0d61ba0d01 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightGroupStatisticsServiceImplTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightGroupStatisticsServiceImplTest.java @@ -77,7 +77,7 @@ public class OpendaylightGroupStatisticsServiceImplTest extends AbstractSingleSt new AtomicLong(), notificationPublishService, convertorManager); Mockito.doAnswer(answerVoidToCallback).when(outboundQueueProvider) - .commitEntry(eq(42L), requestInput.capture(), any(FutureCallback.class)); + .commitEntry(eq(Uint32.valueOf(42)), requestInput.capture(), any(FutureCallback.class)); } @After diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightMeterStatisticsServiceImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightMeterStatisticsServiceImplTest.java index 7755cc90a3..9529aa0253 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightMeterStatisticsServiceImplTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightMeterStatisticsServiceImplTest.java @@ -77,7 +77,7 @@ public class OpendaylightMeterStatisticsServiceImplTest extends AbstractSingleSt new AtomicLong(), notificationPublishService, convertorManager); Mockito.doAnswer(answerVoidToCallback).when(outboundQueueProvider) - .commitEntry(eq(42L), requestInput.capture(), any(FutureCallback.class)); + .commitEntry(eq(Uint32.valueOf(42)), requestInput.capture(), any(FutureCallback.class)); } @After diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightPortStatisticsServiceImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightPortStatisticsServiceImplTest.java index d29a35b7fb..8a3e846985 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightPortStatisticsServiceImplTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightPortStatisticsServiceImplTest.java @@ -55,7 +55,7 @@ public class OpendaylightPortStatisticsServiceImplTest extends AbstractSingleSta new AtomicLong(), notificationPublishService); Mockito.doAnswer(answerVoidToCallback).when(outboundQueueProvider) - .commitEntry(eq(42L), requestInput.capture(), any(FutureCallback.class)); + .commitEntry(eq(Uint32.valueOf(42)), requestInput.capture(), any(FutureCallback.class)); } @After diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightQueueStatisticsServiceImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightQueueStatisticsServiceImplTest.java index bd16251848..cea28bc3b1 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightQueueStatisticsServiceImplTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightQueueStatisticsServiceImplTest.java @@ -65,7 +65,7 @@ public class OpendaylightQueueStatisticsServiceImplTest extends AbstractSingleSt @Test public void testGetAllQueuesStatisticsFromAllPorts() throws Exception { Mockito.doAnswer(answerVoidToCallback).when(outboundQueueProvider) - .commitEntry(eq(42L), requestInput.capture(), any(FutureCallback.class)); + .commitEntry(eq(Uint32.valueOf(42)), requestInput.capture(), any(FutureCallback.class)); GetAllQueuesStatisticsFromAllPortsInputBuilder input = new GetAllQueuesStatisticsFromAllPortsInputBuilder() .setNode(createNodeRef("unitProt:123")); @@ -105,7 +105,7 @@ public class OpendaylightQueueStatisticsServiceImplTest extends AbstractSingleSt @Test public void testGetAllQueuesStatisticsFromGivenPort() throws Exception { Mockito.doAnswer(answerVoidToCallback).when(outboundQueueProvider) - .commitEntry(eq(42L), requestInput.capture(), any(FutureCallback.class)); + .commitEntry(eq(Uint32.valueOf(42)), requestInput.capture(), any(FutureCallback.class)); GetAllQueuesStatisticsFromGivenPortInputBuilder input = new GetAllQueuesStatisticsFromGivenPortInputBuilder() .setNode(createNodeRef("unitProt:123")) @@ -125,7 +125,7 @@ public class OpendaylightQueueStatisticsServiceImplTest extends AbstractSingleSt @Test public void testGetQueueStatisticsFromGivenPort() throws Exception { Mockito.doAnswer(answerVoidToCallback).when(outboundQueueProvider) - .commitEntry(eq(42L), requestInput.capture(), any(FutureCallback.class)); + .commitEntry(eq(Uint32.valueOf(42)), requestInput.capture(), any(FutureCallback.class)); GetQueueStatisticsFromGivenPortInputBuilder input = new GetQueueStatisticsFromGivenPortInputBuilder() .setNode(createNodeRef("unitProt:123")) diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/compatibility/AbstractCompatibleStatServiceTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/compatibility/AbstractCompatibleStatServiceTest.java index 038e14b7fb..6f8cdd7b08 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/compatibility/AbstractCompatibleStatServiceTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/compatibility/AbstractCompatibleStatServiceTest.java @@ -95,7 +95,7 @@ public class AbstractCompatibleStatServiceTest extends AbstractStatsServiceTest return null; }; - Mockito.lenient().when(featuresOutput.getVersion()).thenReturn(Uint8.valueOf(OFConstants.OFP_VERSION_1_3)); + Mockito.lenient().when(featuresOutput.getVersion()).thenReturn(OFConstants.OFP_VERSION_1_3); Mockito.when(rqContextStack.createRequestContext()).thenReturn(rqContext); Mockito.lenient().when(deviceContext.getDeviceState()).thenReturn(deviceState); Mockito.when(deviceContext.getDeviceInfo()).thenReturn(deviceInfo); @@ -106,7 +106,7 @@ public class AbstractCompatibleStatServiceTest extends AbstractStatsServiceTest .endCollecting(any(EventIdentifier.class)); Mockito.doAnswer(answerVoidToCallback).when(outboundQueueProvider) - .commitEntry(eq(42L), requestInput.capture(), any(FutureCallback.class)); + .commitEntry(eq(Uint32.valueOf(42)), requestInput.capture(), any(FutureCallback.class)); Mockito.when(translatorLibrary.lookupTranslator(any(TranslatorKey.class))).thenReturn(translator); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/compatibility/OpendaylightFlowStatisticsServiceDelegateImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/compatibility/OpendaylightFlowStatisticsServiceDelegateImplTest.java index b40e2c27cb..24c0cf7c44 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/compatibility/OpendaylightFlowStatisticsServiceDelegateImplTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/compatibility/OpendaylightFlowStatisticsServiceDelegateImplTest.java @@ -86,7 +86,7 @@ public class OpendaylightFlowStatisticsServiceDelegateImplTest extends AbstractS rqContextStack, deviceContext, notificationPublishService, new AtomicLong(21), convertorManager); Mockito.doAnswer(answerVoidToCallback).when(outboundQueueProvider) - .commitEntry(eq(42L), requestInput.capture(), any(FutureCallback.class)); + .commitEntry(eq(Uint32.valueOf(42)), requestInput.capture(), any(FutureCallback.class)); Mockito.when(translatorLibrary.lookupTranslator(ArgumentMatchers.any())).thenReturn(translator); } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/AbstractDirectStatisticsServiceTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/AbstractDirectStatisticsServiceTest.java index 31231a8f57..454a96c8a4 100755 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/AbstractDirectStatisticsServiceTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/AbstractDirectStatisticsServiceTest.java @@ -53,8 +53,8 @@ import org.opendaylight.yangtools.yang.common.Uint8; @RunWith(MockitoJUnitRunner.class) public abstract class AbstractDirectStatisticsServiceTest { protected static final Uint32 PORT_NO = Uint32.ONE; - protected static final Uint64 DATAPATH_ID = Uint64.valueOf(10); - protected static final Uint8 OF_VERSION = Uint8.valueOf(OFConstants.OFP_VERSION_1_3); + protected static final Uint64 DATAPATH_ID = Uint64.TEN; + protected static final Uint8 OF_VERSION = OFConstants.OFP_VERSION_1_3; protected static final String NODE_ID = "openflow:10"; @Mock @@ -119,7 +119,7 @@ public abstract class AbstractDirectStatisticsServiceTest { when(deviceContext.getDeviceInfo()).thenReturn(deviceInfo); when(deviceInfo.getNodeInstanceIdentifier()).thenReturn(nodeInstanceIdentifier); lenient().when(deviceInfo.getNodeId()).thenReturn(new NodeId(NODE_ID)); - when(deviceInfo.getVersion()).thenReturn(OF_VERSION.toJava()); + when(deviceInfo.getVersion()).thenReturn(OF_VERSION); when(deviceInfo.getDatapathId()).thenReturn(DATAPATH_ID); lenient().when(getFeaturesOutput.getVersion()).thenReturn(OF_VERSION); lenient().when(getFeaturesOutput.getDatapathId()).thenReturn(DATAPATH_ID); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/translator/FlowRemovedTranslatorTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/translator/FlowRemovedTranslatorTest.java index 21e8b54d07..a686ee5232 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/translator/FlowRemovedTranslatorTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/translator/FlowRemovedTranslatorTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.translator; import static org.junit.Assert.assertEquals; @@ -39,6 +38,7 @@ import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; import org.opendaylight.yangtools.yang.common.Uint16; import org.opendaylight.yangtools.yang.common.Uint32; import org.opendaylight.yangtools.yang.common.Uint64; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Test of {@link AggregatedFlowStatisticsTranslator}. @@ -74,6 +74,7 @@ public class FlowRemovedTranslatorTest { translator = new FlowRemovedTranslator(convertorManager); translatorV10 = new FlowRemovedV10Translator(convertorManager); + when(deviceInfo.getVersion()).thenReturn(Uint8.ONE); when(deviceInfo.getNodeInstanceIdentifier()).thenReturn(nodeId); } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/DeviceInitializationUtilTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/DeviceInitializationUtilTest.java index 8703573b00..1b6b3dc259 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/DeviceInitializationUtilTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/DeviceInitializationUtilTest.java @@ -76,7 +76,7 @@ public class DeviceInitializationUtilTest { when(dataBroker.newWriteOnlyTransaction()).thenReturn(writeTransaction); when(connectionAdapter.getRemoteAddress()).thenReturn(INET_SOCKET_ADDRESS); when(featuresReply.getTables()).thenReturn(TABLES); - when(featuresReply.getVersion()).thenReturn(Uint8.valueOf(OFConstants.OFP_VERSION_1_3)); + when(featuresReply.getVersion()).thenReturn(OFConstants.OFP_VERSION_1_3); when(featuresReply.getCapabilities()).thenReturn(new Capabilities(false, false, false, false, false, false, false)); when(connectionContext.getFeatures()).thenReturn(featuresReply); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/FlatBatchUtilTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/FlatBatchUtilTest.java index 1d3dc4a68c..299c8ef62b 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/FlatBatchUtilTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/FlatBatchUtilTest.java @@ -17,49 +17,49 @@ import org.opendaylight.openflowplugin.impl.services.batch.BatchPlanStep; import org.opendaylight.openflowplugin.impl.services.batch.BatchStepType; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.ProcessFlatBatchOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.ProcessFlatBatchOutputBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.failure.ids.aug.FlatBatchFailureFlowIdCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.FlatBatchAddFlowCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.FlatBatchRemoveFlowCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.FlatBatchUpdateFlowCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.flat.batch.add.flow._case.FlatBatchAddFlow; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.flat.batch.add.flow._case.FlatBatchAddFlowBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.flat.batch.add.flow._case.FlatBatchAddFlowKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.flat.batch.remove.flow._case.FlatBatchRemoveFlow; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.flat.batch.remove.flow._case.FlatBatchRemoveFlowBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.flat.batch.remove.flow._case.FlatBatchRemoveFlowKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.flat.batch.update.flow._case.FlatBatchUpdateFlow; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.flat.batch.update.flow._case.FlatBatchUpdateFlowBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.flow.crud._case.aug.flat.batch.update.flow._case.FlatBatchUpdateFlowKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.FlatBatchAddGroupCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.FlatBatchRemoveGroupCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.FlatBatchUpdateGroupCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.flat.batch.add.group._case.FlatBatchAddGroup; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.flat.batch.add.group._case.FlatBatchAddGroupBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.flat.batch.add.group._case.FlatBatchAddGroupKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.flat.batch.remove.group._case.FlatBatchRemoveGroup; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.flat.batch.remove.group._case.FlatBatchRemoveGroupBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.flat.batch.remove.group._case.FlatBatchRemoveGroupKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.flat.batch.update.group._case.FlatBatchUpdateGroup; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.flat.batch.update.group._case.FlatBatchUpdateGroupBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.flat.batch.update.group._case.FlatBatchUpdateGroupKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.FlatBatchAddMeterCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.FlatBatchRemoveMeterCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.FlatBatchUpdateMeterCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.flat.batch.add.meter._case.FlatBatchAddMeter; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.flat.batch.add.meter._case.FlatBatchAddMeterBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.flat.batch.add.meter._case.FlatBatchAddMeterKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.flat.batch.remove.meter._case.FlatBatchRemoveMeter; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.flat.batch.remove.meter._case.FlatBatchRemoveMeterBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.flat.batch.remove.meter._case.FlatBatchRemoveMeterKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.flat.batch.update.meter._case.FlatBatchUpdateMeter; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.flat.batch.update.meter._case.FlatBatchUpdateMeterBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.flat.batch.update.meter._case.FlatBatchUpdateMeterKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.Batch; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.BatchBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.BatchChoice; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchAddFlowCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchAddGroupCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchAddMeterCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchRemoveFlowCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchRemoveGroupCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchRemoveMeterCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchUpdateFlowCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchUpdateGroupCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.FlatBatchUpdateMeterCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.add.flow._case.FlatBatchAddFlow; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.add.flow._case.FlatBatchAddFlowBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.add.flow._case.FlatBatchAddFlowKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.add.group._case.FlatBatchAddGroup; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.add.group._case.FlatBatchAddGroupBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.add.group._case.FlatBatchAddGroupKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.add.meter._case.FlatBatchAddMeter; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.add.meter._case.FlatBatchAddMeterBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.add.meter._case.FlatBatchAddMeterKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.remove.flow._case.FlatBatchRemoveFlow; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.remove.flow._case.FlatBatchRemoveFlowBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.remove.flow._case.FlatBatchRemoveFlowKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.remove.group._case.FlatBatchRemoveGroup; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.remove.group._case.FlatBatchRemoveGroupBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.remove.group._case.FlatBatchRemoveGroupKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.remove.meter._case.FlatBatchRemoveMeter; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.remove.meter._case.FlatBatchRemoveMeterBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.remove.meter._case.FlatBatchRemoveMeterKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.update.flow._case.FlatBatchUpdateFlow; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.update.flow._case.FlatBatchUpdateFlowBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.update.flow._case.FlatBatchUpdateFlowKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.update.group._case.FlatBatchUpdateGroup; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.update.group._case.FlatBatchUpdateGroupBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.update.group._case.FlatBatchUpdateGroupKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.update.meter._case.FlatBatchUpdateMeter; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.update.meter._case.FlatBatchUpdateMeterBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.update.meter._case.FlatBatchUpdateMeterKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.output.BatchFailure; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.output.BatchFailureBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.output.BatchFailureKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.output.batch.failure.batch.item.id.choice.FlatBatchFailureFlowIdCaseBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowId; import org.opendaylight.yangtools.yang.binding.util.BindingMap; import org.opendaylight.yangtools.yang.common.RpcError; diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/FlowCreatorUtilTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/FlowCreatorUtilTest.java index 1e7e87d51f..ac27764307 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/FlowCreatorUtilTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/FlowCreatorUtilTest.java @@ -35,6 +35,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 import org.opendaylight.yangtools.yang.common.Uint16; import org.opendaylight.yangtools.yang.common.Uint32; import org.opendaylight.yangtools.yang.common.Uint64; +import org.opendaylight.yangtools.yang.common.Uint8; public class FlowCreatorUtilTest { @@ -83,9 +84,7 @@ public class FlowCreatorUtilTest { */ @Test public void testCanModifyFlow() { - final Short of10 = Short.valueOf(OFConstants.OFP_VERSION_1_0); - final Short of13 = Short.valueOf(OFConstants.OFP_VERSION_1_3); - final Short[] versions = {null, of10, of13}; + final Uint8[] versions = {null, OFConstants.OFP_VERSION_1_0, OFConstants.OFP_VERSION_1_3}; final Boolean[] bools = {null, Boolean.TRUE, Boolean.FALSE}; final Uint16 defPri = Uint16.valueOf(0x8000); @@ -98,7 +97,7 @@ public class FlowCreatorUtilTest { final FlowCookie cookie1 = new FlowCookie(Uint64.valueOf(0x67890)); final FlowCookie cookieMask = new FlowCookie(Uint64.valueOf(0xffff00)); - for (final Short ver : versions) { + for (final Uint8 ver : versions) { final OriginalFlowBuilder originalBuilder = new OriginalFlowBuilder(); final UpdatedFlowBuilder updatedBuilder = new UpdatedFlowBuilder(); canModifyFlowTest(true, originalBuilder, updatedBuilder, ver); @@ -139,9 +138,9 @@ public class FlowCreatorUtilTest { } // Set different idle-timeout, hard-timeout, priority. - final Integer[] integers = {null, Integer.valueOf(3600)}; + final Integer[] integers = {null, 3600}; for (final Integer i : integers) { - final Uint16 uint = i == null ? null : Uint16.valueOf(i.intValue()); + final Uint16 uint = i == null ? null : Uint16.valueOf(i); canModifyFlowTest(false, originalBuilder, new UpdatedFlowBuilder(upd).setIdleTimeout(uint), ver); canModifyFlowTest(false, new OriginalFlowBuilder(org).setIdleTimeout(uint), updatedBuilder, ver); @@ -177,7 +176,7 @@ public class FlowCreatorUtilTest { canModifyFlowTest(false, originalBuilder, updatedBuilder, ver); updatedBuilder.setCookieMask(cookieMask); - final boolean expected = of13.equals(ver) && !Boolean.TRUE.equals(strict); + final boolean expected = OFConstants.OFP_VERSION_1_3.equals(ver) && !Boolean.TRUE.equals(strict); canModifyFlowTest(expected, originalBuilder, updatedBuilder, ver); } } @@ -256,15 +255,15 @@ public class FlowCreatorUtilTest { assertTrue(FlowCreatorUtil.equalsWithDefault(def, null, def)); assertTrue(FlowCreatorUtil.equalsWithDefault(null, def, def)); - final Boolean inv = Boolean.valueOf(!def.booleanValue()); + final Boolean inv = !def.booleanValue(); assertFalse(FlowCreatorUtil.equalsWithDefault(null, inv, def)); assertFalse(FlowCreatorUtil.equalsWithDefault(inv, null, def)); } // Integer - final Integer[] integers = {Integer.valueOf(-100), Integer.valueOf(0), Integer.valueOf(100),}; + final Integer[] integers = {-100, 0, 100,}; for (final Integer def : integers) { - final Integer same = new Integer(def.intValue()); + final Integer same = new Integer(def); assertTrue(FlowCreatorUtil.equalsWithDefault(null, null, def)); assertTrue(FlowCreatorUtil.equalsWithDefault(same, null, def)); assertTrue(FlowCreatorUtil.equalsWithDefault(null, same, def)); @@ -324,7 +323,7 @@ public class FlowCreatorUtilTest { * @param version OpenFlow protocol version. */ private static void canModifyFlowTest(final boolean expected, final OriginalFlowBuilder org, - final UpdatedFlowBuilder upd, final Short version) { + final UpdatedFlowBuilder upd, final Uint8 version) { final boolean result = FlowCreatorUtil.canModifyFlow(org.build(), upd.build(), version); assertEquals(expected, result); } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/FlowUtilTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/FlowUtilTest.java index 2dfcc076c4..abc4aab24c 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/FlowUtilTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/FlowUtilTest.java @@ -33,6 +33,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.opendaylight.yangtools.yang.binding.util.BindingMap; import org.opendaylight.yangtools.yang.common.RpcError; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; @@ -240,7 +241,7 @@ public class FlowUtilTest { final RpcResult> batchOutcomeWithError = createBatchOutcomeWithError(); return RpcResultBuilder.failed() .withResult(new AddFlowsBatchOutputBuilder() - .setBatchFailedFlowsOutput(batchOutcomeWithError.getResult()) + .setBatchFailedFlowsOutput(BindingMap.ordered(batchOutcomeWithError.getResult())) .build()) .withRpcErrors(batchOutcomeWithError.getErrors()) .build(); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/GroupUtilTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/GroupUtilTest.java index ed9d7f1d4b..ec1d6d7dea 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/GroupUtilTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/GroupUtilTest.java @@ -32,6 +32,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.N import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ActionType; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.opendaylight.yangtools.yang.binding.util.BindingMap; import org.opendaylight.yangtools.yang.common.RpcError; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; @@ -245,7 +246,7 @@ public class GroupUtilTest { final RpcResult> batchOutcomeWithError = createBatchOutcomeWithError(); return RpcResultBuilder.failed() .withResult(new AddGroupsBatchOutputBuilder() - .setBatchFailedGroupsOutput(batchOutcomeWithError.getResult()) + .setBatchFailedGroupsOutput(BindingMap.ordered(batchOutcomeWithError.getResult())) .build()) .withRpcErrors(batchOutcomeWithError.getErrors()) .build(); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/MatchNormalizationUtilTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/MatchNormalizationUtilTest.java index e100b66c65..f945d83ba8 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/MatchNormalizationUtilTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/MatchNormalizationUtilTest.java @@ -44,7 +44,7 @@ public class MatchNormalizationUtilTest { final long port = 10; final MatchBuilder matchBuilder = MatchNormalizationUtil.normalizeInPortMatch(new MatchBuilder() - .setInPort(new NodeConnectorId("openflow:1:" + port)), EncodeConstants.OF13_VERSION_ID); + .setInPort(new NodeConnectorId("openflow:1:" + port)), EncodeConstants.OF_VERSION_1_3); assertEquals(String.valueOf(port), matchBuilder.getInPort().getValue()); } @@ -54,7 +54,7 @@ public class MatchNormalizationUtilTest { final long port = 10; final MatchBuilder matchBuilder = MatchNormalizationUtil.normalizeInPhyPortMatch(new MatchBuilder() - .setInPhyPort(new NodeConnectorId("openflow:1:" + port)), EncodeConstants.OF13_VERSION_ID); + .setInPhyPort(new NodeConnectorId("openflow:1:" + port)), EncodeConstants.OF_VERSION_1_3); assertEquals(String.valueOf(port), matchBuilder.getInPhyPort().getValue()); } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/MdSalRegistrationUtilsTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/MdSalRegistrationUtilsTest.java index 1af13f4dc0..dcbdc5c4b6 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/MdSalRegistrationUtilsTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/MdSalRegistrationUtilsTest.java @@ -31,6 +31,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.O import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.FeaturesReply; import org.opendaylight.yangtools.yang.binding.RpcService; import org.opendaylight.yangtools.yang.common.Uint64; +import org.opendaylight.yangtools.yang.common.Uint8; @RunWith(MockitoJUnitRunner.class) public class MdSalRegistrationUtilsTest { @@ -66,6 +67,7 @@ public class MdSalRegistrationUtilsTest { convertorManager = ConvertorManagerFactory.createDefaultManager(); when(mockedDeviceContext.getDeviceInfo()).thenReturn(mockedDeviceInfo); when(mockedConnectionContext.getFeatures()).thenReturn(mockedFeatures); + when(mockedDeviceInfo.getVersion()).thenReturn(Uint8.ONE); when(mockedDeviceInfo.getDatapathId()).thenReturn(Uint64.valueOf(12345)); when(mockedDeviceContext.getPrimaryConnectionContext()).thenReturn(mockedConnectionContext); } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/MessageFactoryTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/MessageFactoryTest.java index a7604da279..81fcf7e3fd 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/MessageFactoryTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/MessageFactoryTest.java @@ -13,33 +13,33 @@ import org.opendaylight.openflowplugin.api.OFConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.HelloElementType; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.HelloInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.hello.Elements; +import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint8; public class MessageFactoryTest { - @Test public void testCreateHelloInputWoElements() { - short highestVersion = (short) 0x04; - long xid = 42L; + Uint8 highestVersion = Uint8.valueOf(4); + Uint32 xid = Uint32.valueOf(42); HelloInput helloMsg = MessageFactory.createHelloInput(highestVersion, xid); - Assert.assertEquals(highestVersion, helloMsg.getVersion().shortValue()); - Assert.assertEquals(xid, helloMsg.getXid().longValue()); + Assert.assertEquals(highestVersion, helloMsg.getVersion()); + Assert.assertEquals(xid, helloMsg.getXid()); Assert.assertNull(helloMsg.getElements()); } @Test public void testCreateHelloInputWithElements() { - short highestVersion = (short) 0x04; - long xid = 42L; + Uint8 highestVersion = Uint8.valueOf(4); + Uint32 xid = Uint32.valueOf(42); Boolean[] expectedVersionBitmap = new Boolean[]{false, true, false, false, true}; HelloInput helloMsg = MessageFactory.createHelloInput(highestVersion, xid, OFConstants.VERSION_ORDER); - Assert.assertEquals(highestVersion, helloMsg.getVersion().shortValue()); - Assert.assertEquals(xid, helloMsg.getXid().longValue()); + Assert.assertEquals(highestVersion, helloMsg.getVersion()); + Assert.assertEquals(xid, helloMsg.getXid()); Assert.assertEquals(1, helloMsg.getElements().size()); Elements actualElement = helloMsg.getElements().get(0); Assert.assertEquals(HelloElementType.VERSIONBITMAP, actualElement.getType()); Assert.assertArrayEquals(expectedVersionBitmap, actualElement.getVersionBitmap().toArray(new Boolean[0])); } - } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/MeterUtilTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/MeterUtilTest.java index 1bf84f1dc7..8adbad1e0c 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/MeterUtilTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/MeterUtilTest.java @@ -31,6 +31,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.meters.service.rev160316.ba import org.opendaylight.yang.gen.v1.urn.opendaylight.meters.service.rev160316.batch.meter.output.list.grouping.BatchFailedMetersOutputBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.meters.service.rev160316.batch.meter.output.list.grouping.BatchFailedMetersOutputKey; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.opendaylight.yangtools.yang.binding.util.BindingMap; import org.opendaylight.yangtools.yang.common.RpcError; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; @@ -230,7 +231,7 @@ public class MeterUtilTest { private static RpcResult createAddMetersBatchSuccessOutput() { return RpcResultBuilder .success(new AddMetersBatchOutputBuilder() - .setBatchFailedMetersOutput(Collections.emptyMap()) + .setBatchFailedMetersOutput(Map.of()) .build()) .build(); } @@ -239,7 +240,7 @@ public class MeterUtilTest { final RpcResult> batchOutcomeWithError = createBatchOutcomeWithError(); return RpcResultBuilder.failed() .withResult(new AddMetersBatchOutputBuilder() - .setBatchFailedMetersOutput(batchOutcomeWithError.getResult()) + .setBatchFailedMetersOutput(BindingMap.ordered(batchOutcomeWithError.getResult())) .build()) .withRpcErrors(batchOutcomeWithError.getErrors()) .build(); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/NodeConnectorRefToPortTranslatorTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/NodeConnectorRefToPortTranslatorTest.java index 72cec981fb..5c246f04eb 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/NodeConnectorRefToPortTranslatorTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/NodeConnectorRefToPortTranslatorTest.java @@ -28,6 +28,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PacketInMessageBuilder; import org.opendaylight.yangtools.yang.common.Uint32; import org.opendaylight.yangtools.yang.common.Uint64; +import org.opendaylight.yangtools.yang.common.Uint8; @RunWith(MockitoJUnitRunner.class) public class NodeConnectorRefToPortTranslatorTest extends TestCase { @@ -35,7 +36,7 @@ public class NodeConnectorRefToPortTranslatorTest extends TestCase { private static final String PACKET_DATA = "Test_Data"; private static final Uint32 PORT_NO = Uint32.valueOf(5L); private static final Uint64 DATA_PATH_ID = Uint64.TEN; - private static final short OF_VERSION = OFConstants.OFP_VERSION_1_3; + private static final Uint8 OF_VERSION = OFConstants.OFP_VERSION_1_3; private static final Uint32 TABLE_ID = Uint32.valueOf(42); private static PacketIn createPacketIn(final Uint32 portNo) { diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/PortTranslatorUtilTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/PortTranslatorUtilTest.java index afcd52eaf6..0d4d5ff110 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/PortTranslatorUtilTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/PortTranslatorUtilTest.java @@ -24,6 +24,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev13 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PortGrouping; import org.opendaylight.yangtools.yang.common.Uint32; import org.opendaylight.yangtools.yang.common.Uint64; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Created by Martin Bobak mbobak@cisco.com on 7/29/14. @@ -98,7 +99,7 @@ public class PortTranslatorUtilTest { @Test public void testTranslatePort() { - Short version = OpenflowVersion.OF10.getVersion(); + Uint8 version = OpenflowVersion.OF10.getVersion(); Uint64 dataPathId = Uint64.ONE; Uint32 portNumber = Uint32.MAX_VALUE; diff --git a/openflowplugin/pom.xml b/openflowplugin/pom.xml index 49825e4e12..851cf53e6c 100644 --- a/openflowplugin/pom.xml +++ b/openflowplugin/pom.xml @@ -46,7 +46,7 @@ model-flow-statistics - org.opendaylight.controller.model + org.opendaylight.openflowplugin.model model-inventory diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/extension/ActionExtensionHelper.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/extension/ActionExtensionHelper.java index 6e1c409dc0..db38639fbc 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/extension/ActionExtensionHelper.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/extension/ActionExtensionHelper.java @@ -15,7 +15,7 @@ import org.opendaylight.openflowplugin.extension.api.ConvertorActionFromOFJava; import org.opendaylight.openflowplugin.extension.api.core.extension.ExtensionConverterProvider; import org.opendaylight.openflowplugin.extension.api.path.ActionPath; import org.opendaylight.openflowplugin.openflow.md.core.session.OFSessionUtil; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.action.container.action.choice.ExperimenterIdCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.action.ExperimenterIdCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; public final class ActionExtensionHelper { @@ -54,7 +54,7 @@ public final class ActionExtensionHelper { actionCase.getExperimenter().getSubType()); convertor = extensionConvertorProvider.getActionConverter(key); } else if (action.getActionChoice() != null) { - ActionSerializerKey key = new ActionSerializerKey(EncodeConstants.OF13_VERSION_ID, + ActionSerializerKey key = new ActionSerializerKey(EncodeConstants.OF_VERSION_1_3, action.getActionChoice().implementedInterface(), null); convertor = extensionConvertorProvider.getActionConverter(key); } diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/extension/MatchExtensionHelper.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/extension/MatchExtensionHelper.java index 5f5e34e43a..efcb6e2ff3 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/extension/MatchExtensionHelper.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/extension/MatchExtensionHelper.java @@ -15,7 +15,7 @@ import org.opendaylight.openflowplugin.extension.api.AugmentTuple; import org.opendaylight.openflowplugin.extension.api.path.MatchPath; import org.opendaylight.openflowplugin.openflow.md.core.session.OFSessionUtil; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.MatchBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.ExperimenterClass; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.GeneralAugMatchNodesNodeTableFlow; @@ -37,6 +37,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.ge import org.opendaylight.yangtools.yang.binding.Augmentable; import org.opendaylight.yangtools.yang.binding.util.BindingMap; import org.opendaylight.yangtools.yang.binding.util.BindingMap.Builder; +import org.opendaylight.yangtools.yang.common.Uint8; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -55,7 +56,7 @@ public final class MatchExtensionHelper { * @param matchPath match path */ public static void injectExtension( - final short ofVersion, + final Uint8 ofVersion, final MatchEntry matchEntry, final MatchBuilder matchBuilder, final MatchPath matchPath) { @@ -141,7 +142,7 @@ public final class MatchExtensionHelper { * @param matchEntry match entry * @return an ExtensionListBuilder */ - private static ExtensionListBuilder processExtension(final MatchEntry matchEntry, final short ofVersion, + private static ExtensionListBuilder processExtension(final MatchEntry matchEntry, final Uint8 ofVersion, final MatchPath matchPath) { final var convertorProvider = OFSessionUtil.getExtensionConvertorProvider(); if (convertorProvider == null) { diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ConvertorManager.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ConvertorManager.java index 42c6af9f7b..61d55bc8e2 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ConvertorManager.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ConvertorManager.java @@ -7,10 +7,11 @@ */ package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor; +import static java.util.Objects.requireNonNull; + import com.google.common.annotations.VisibleForTesting; import java.util.Arrays; import java.util.Collection; -import java.util.Collections; import java.util.Map; import java.util.Map.Entry; import java.util.Optional; @@ -19,6 +20,7 @@ import java.util.stream.Stream; import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.Convertor; import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorData; import org.opendaylight.yangtools.yang.binding.DataContainer; +import org.opendaylight.yangtools.yang.common.Uint8; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,20 +32,19 @@ public class ConvertorManager implements ConvertorExecutor, ConvertorRegistrator // Cache, that holds all registered convertors, but they can have multiple keys, // based on instanceof checks in the convert method - private Map, Convertor>> convertors; + private Map, Convertor>> convertors; /** * Create new instance of Convertor Manager. * * @param supportedVersions supported versions */ - public ConvertorManager(final Short... supportedVersions) { - final Stream stream = Arrays.stream(supportedVersions); + public ConvertorManager(final Uint8... supportedVersions) { + final Stream stream = Arrays.stream(supportedVersions); if (supportedVersions.length == 1) { - final Optional versionOptional = stream.findFirst(); - versionOptional.ifPresent(version -> convertors = - Collections.singletonMap(version, new ConcurrentHashMap<>())); + final Optional versionOptional = stream.findFirst(); + versionOptional.ifPresent(version -> convertors = Map.of(version, new ConcurrentHashMap<>())); } else { convertors = new ConcurrentHashMap<>(); stream.forEach(version -> convertors.putIfAbsent(version, new ConcurrentHashMap<>())); @@ -51,10 +52,10 @@ public class ConvertorManager implements ConvertorExecutor, ConvertorRegistrator } @Override - public ConvertorManager registerConvertor(final short version, + public ConvertorManager registerConvertor(final Uint8 version, final Convertor convertor) { final Map, Convertor> convertorsForVersion = - convertors.get(version); + convertors.get(requireNonNull(version)); if (convertorsForVersion != null) { for (final Class type : convertor.getTypes()) { @@ -164,9 +165,9 @@ public class ConvertorManager implements ConvertorExecutor, ConvertorRegistrator * @return found convertor */ @VisibleForTesting - Optional findConvertor(final short version, final Class type) { + Optional findConvertor(final Uint8 version, final Class type) { final Map, Convertor> convertorsForVersion = - convertors.get(version); + convertors.get(requireNonNull(version)); Optional convertor = Optional.empty(); diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ConvertorRegistrator.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ConvertorRegistrator.java index cf270acb25..4a60a68e12 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ConvertorRegistrator.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ConvertorRegistrator.java @@ -5,11 +5,11 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor; import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.Convertor; import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorData; +import org.opendaylight.yangtools.yang.common.Uint8; public interface ConvertorRegistrator { /** @@ -17,5 +17,5 @@ public interface ConvertorRegistrator { * * @param convertor the convertor */ - ConvertorManager registerConvertor(short version, Convertor convertor); + ConvertorManager registerConvertor(Uint8 version, Convertor convertor); } diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupConvertor.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupConvertor.java index 8ce3afb263..d4de4e0740 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupConvertor.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupConvertor.java @@ -97,7 +97,7 @@ public class GroupConvertor extends Convertor salToOFBucketList(final List buckets, final short version, final int groupType, + private List salToOFBucketList(final List buckets, final Uint8 version, final int groupType, final Uint64 datapathid) { final List bucketLists = new ArrayList<>(); final ActionConvertorData data = new ActionConvertorData(version); diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupDescStatsResponseConvertor.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupDescStatsResponseConvertor.java index cc7ec2352e..13b6352a47 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupDescStatsResponseConvertor.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupDescStatsResponseConvertor.java @@ -5,13 +5,12 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.List; +import java.util.Map; import java.util.Optional; import java.util.Set; import org.opendaylight.openflowplugin.extension.api.path.ActionPath; @@ -32,6 +31,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.desc.stats.reply.GroupDescStatsKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.buckets.grouping.BucketsList; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.group.desc._case.multipart.reply.group.desc.GroupDesc; +import org.opendaylight.yangtools.yang.binding.util.BindingMap; +import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint8; /** * Converts GroupDesc message from library to MD SAL defined GroupDescStats. @@ -48,16 +50,14 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 public class GroupDescStatsResponseConvertor extends Convertor, List, VersionConvertorData> { - private static final Set> TYPES = Collections.singleton(GroupDesc.class); + private static final Set> TYPES = Set.of(GroupDesc.class); private org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.Buckets toSALBucketsDesc( - final List bucketDescStats, final short version) { + final List bucketDescStats, final Uint8 version) { final ActionResponseConvertorData data = new ActionResponseConvertorData(version); data.setActionPath(ActionPath.GROUP_DESC_STATS_UPDATED_BUCKET_ACTION); - org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.BucketsBuilder salBucketsDesc = - new org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.BucketsBuilder(); - List allBuckets = new ArrayList<>(); + BindingMap.Builder allBuckets = BindingMap.orderedBuilder(); int bucketKey = 0; for (BucketsList bucketDetails : bucketDescStats) { @@ -66,7 +66,7 @@ public class GroupDescStatsResponseConvertor extends Convertor, convertedSalActions = getConvertorExecutor().convert(bucketDetails.getAction(), data); if (convertedSalActions.isPresent()) { - List actions = new ArrayList<>(); + BindingMap.Builder actions = BindingMap.orderedBuilder(); int actionKey = 0; @@ -80,23 +80,24 @@ public class GroupDescStatsResponseConvertor extends Convertor, actionKey++; } - bucketDesc.setAction(actions); + bucketDesc.setAction(actions.build()); } else { - bucketDesc.setAction(Collections.emptyMap()); + bucketDesc.setAction(Map.of()); } bucketDesc.setWeight(bucketDetails.getWeight()); bucketDesc.setWatchPort(bucketDetails.getWatchPort().getValue()); bucketDesc.setWatchGroup(bucketDetails.getWatchGroup()); - BucketId bucketId = new BucketId((long) bucketKey); + BucketId bucketId = new BucketId(Uint32.valueOf(bucketKey)); bucketDesc.setBucketId(bucketId); bucketDesc.withKey(new BucketKey(bucketId)); bucketKey++; allBuckets.add(bucketDesc.build()); } - salBucketsDesc.setBucket(allBuckets); - return salBucketsDesc.build(); + return new org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.BucketsBuilder() + .setBucket(allBuckets.build()) + .build(); } @Override diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/MeterConfigStatsResponseConvertor.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/MeterConfigStatsResponseConvertor.java index d19caa2ecc..ac19f12f68 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/MeterConfigStatsResponseConvertor.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/MeterConfigStatsResponseConvertor.java @@ -37,6 +37,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.band.header.meter.band.meter.band.experimenter._case.MeterBandExperimenter; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.meter.config._case.multipart.reply.meter.config.MeterConfig; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.meter.config._case.multipart.reply.meter.config.meter.config.Bands; +import org.opendaylight.yangtools.yang.binding.util.BindingMap; import org.opendaylight.yangtools.yang.common.Uint32; /** @@ -76,7 +77,7 @@ public class MeterConfigStatsResponseConvertor extends Convertor listBandHeaders = new ArrayList<>(); + BindingMap.Builder listBandHeaders = BindingMap.builder(); int bandKey = 0; for (Bands band : meterConfig.nonnullBands()) { @@ -146,7 +147,7 @@ public class MeterConfigStatsResponseConvertor extends Convertor - org.opendaylight.controller.model + org.opendaylight.openflowplugin.model model-inventory diff --git a/samples/pom.xml b/samples/pom.xml index 48152d52a7..ad061a5b70 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent-lite - 8.1.1 + 9.0.2 diff --git a/samples/sample-bundles/pom.xml b/samples/sample-bundles/pom.xml index 8499316a8a..a5c234130e 100644 --- a/samples/sample-bundles/pom.xml +++ b/samples/sample-bundles/pom.xml @@ -43,7 +43,7 @@ model-flow-service - org.opendaylight.controller.model + org.opendaylight.openflowplugin.model model-inventory diff --git a/samples/sample-consumer/pom.xml b/samples/sample-consumer/pom.xml index 92bc17fbb9..aa433b99b1 100644 --- a/samples/sample-consumer/pom.xml +++ b/samples/sample-consumer/pom.xml @@ -34,8 +34,8 @@ model-flow-statistics + org.opendaylight.openflowplugin.model model-inventory - org.opendaylight.controller.model org.opendaylight.mdsal diff --git a/test-common/pom.xml b/test-common/pom.xml index 86fc6a8609..53b17a94f4 100644 --- a/test-common/pom.xml +++ b/test-common/pom.xml @@ -33,7 +33,7 @@ model-flow-base - org.opendaylight.controller.model + org.opendaylight.openflowplugin.model model-inventory diff --git a/test-provider/pom.xml b/test-provider/pom.xml index 37a5bf7df3..8b2633b602 100644 --- a/test-provider/pom.xml +++ b/test-provider/pom.xml @@ -31,7 +31,7 @@ model-flow-base - org.opendaylight.controller.model + org.opendaylight.openflowplugin.model model-inventory diff --git a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestCommandProvider.java b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestCommandProvider.java index 27f4fc7df0..eff31def55 100644 --- a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestCommandProvider.java +++ b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestCommandProvider.java @@ -2133,28 +2133,19 @@ public class OpenflowpluginTestCommandProvider implements CommandProvider { } private static MatchBuilder createICMPv6Match1() { - - final MatchBuilder match = new MatchBuilder(); - final EthernetMatchBuilder eth = new EthernetMatchBuilder(); - final EthernetTypeBuilder ethTypeBuilder = new EthernetTypeBuilder(); - ethTypeBuilder.setType(new EtherType(Uint32.valueOf(0x86dd))); - eth.setEthernetType(ethTypeBuilder.build()); - match.setEthernetMatch(eth.build()); - - // ipv4 version - final IpMatchBuilder ipmatch = new IpMatchBuilder(); - ipmatch.setIpProtocol((short) 256); - match.setIpMatch(ipmatch.build()); - - // icmpv6 - final Icmpv6MatchBuilder icmpv6match = new Icmpv6MatchBuilder(); - - // match - icmpv6match.setIcmpv6Type(Uint8.valueOf(135)); - icmpv6match.setIcmpv6Code(Uint8.ONE); - match.setIcmpv6Match(icmpv6match.build()); - - return match; + return new MatchBuilder() + .setEthernetMatch(new EthernetMatchBuilder() + .setEthernetType(new EthernetTypeBuilder() + .setType(new EtherType(Uint32.valueOf(0x86dd))) + .build()) + .build()) + // ipv4 version + .setIpMatch(new IpMatchBuilder().setIpProtocol(Uint8.MAX_VALUE).build()) + // icmpv6 + .setIcmpv6Match(new Icmpv6MatchBuilder() + .setIcmpv6Type(Uint8.valueOf(135)) + .setIcmpv6Code(Uint8.ONE) + .build()); } private static MatchBuilder createMatch33() { -- 2.36.6