From a0543340afd14d8ab4aac0f6c13ddcbf8ec1c761 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 5 Jul 2022 19:00:03 +0200 Subject: [PATCH] Bump upstreams for 2022.09 Chlorine Adopt the following versions: - odlparent-11.0.0 - infrautils-4.0.0 - yangtools-9.0.0 - mdsal-10.0.0 - controller-6.0.0 - aaa-0.16.0 - netconf-4.0.0 Change-Id: Iafb6b4012ed7cce7b3d621b2fc7bb12dc8c2aaf0 Signed-off-by: Robert Varga --- .../arbitratorreconciliation/impl/pom.xml | 4 +- applications/arbitratorreconciliation/pom.xml | 2 +- applications/device-ownership-service/pom.xml | 4 +- applications/forwardingrules-manager/pom.xml | 4 +- applications/of-switch-config-pusher/pom.xml | 4 +- applications/pom.xml | 2 +- applications/reconciliation-framework/pom.xml | 4 +- applications/southbound-cli/pom.xml | 4 +- applications/topology-lldp-discovery/pom.xml | 4 +- applications/topology-manager/pom.xml | 4 +- artifacts/pom.xml | 2 +- distribution/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 +- .../eric/codec/match/AbstractMatchCodec.java | 4 +- .../codec/match/Icmpv6NDOptionsTypeCodec.java | 12 +- .../codec/match/Icmpv6NDReservedCodec.java | 12 +- ...EricExtensionCodecRegistratorImplTest.java | 2 +- .../eric/EricExtensionsRegistratorTest.java | 16 +- .../match/Icmpv6NDOptionsTypeCodecTest.java | 10 +- .../match/Icmpv6NDReservedCodecTest.java | 10 +- .../nx/codec/action/RegLoad2Codec.java | 6 +- .../match/AbstractExperimenterMatchCodec.java | 8 +- .../nx/codec/match/AbstractMatchCodec.java | 4 +- .../nx/codec/match/AbstractRegCodec.java | 4 +- .../nx/codec/match/ArpOpCodec.java | 10 +- .../nx/codec/match/ArpShaCodec.java | 10 +- .../nx/codec/match/ArpSpaCodec.java | 10 +- .../nx/codec/match/ArpThaCodec.java | 10 +- .../nx/codec/match/ArpTpaCodec.java | 10 +- .../nx/codec/match/CtMarkCodec.java | 10 +- .../nx/codec/match/CtStateCodec.java | 10 +- .../nx/codec/match/CtTpDstCodec.java | 10 +- .../nx/codec/match/CtTpSrcCodec.java | 10 +- .../nx/codec/match/CtZoneCodec.java | 10 +- .../nx/codec/match/EthDstCodec.java | 10 +- .../nx/codec/match/EthSrcCodec.java | 10 +- .../nx/codec/match/EthTypeCodec.java | 10 +- .../nx/codec/match/IcmpTypeCodec.java | 10 +- .../nx/codec/match/InPortCodec.java | 10 +- .../nx/codec/match/IpDstCodec.java | 10 +- .../nx/codec/match/IpSrcCodec.java | 10 +- .../nx/codec/match/Ipv6DstCodec.java | 10 +- .../nx/codec/match/Ipv6SrcCodec.java | 10 +- .../nx/codec/match/MetadataCodec.java | 10 +- .../nx/codec/match/MplsLabelCodec.java | 10 +- .../nx/codec/match/NshFlagsCodec.java | 6 +- .../nx/codec/match/NshMdtypeCodec.java | 6 +- .../nx/codec/match/NshNpCodec.java | 6 +- .../nx/codec/match/NshTtlCodec.java | 6 +- .../nx/codec/match/Nshc1Codec.java | 6 +- .../nx/codec/match/Nshc2Codec.java | 6 +- .../nx/codec/match/Nshc3Codec.java | 6 +- .../nx/codec/match/Nshc4Codec.java | 6 +- .../openflowjava/nx/codec/match/NsiCodec.java | 6 +- .../openflowjava/nx/codec/match/NspCodec.java | 6 +- .../nx/codec/match/PktMarkCodec.java | 10 +- .../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 | 7 +- .../nx/codec/match/Reg7Codec.java | 6 +- .../nx/codec/match/TcpDstCodec.java | 10 +- .../nx/codec/match/TcpSrcCodec.java | 10 +- .../nx/codec/match/TunIdCodec.java | 10 +- .../nx/codec/match/TunIpv4DstCodec.java | 10 +- .../nx/codec/match/TunIpv4SrcCodec.java | 10 +- .../nx/codec/match/UdpDstCodec.java | 10 +- .../nx/codec/match/UdpSrcCodec.java | 10 +- ...ciraExtensionCodecRegistratorImplTest.java | 2 +- .../nx/NiciraExtensionsRegistratorTest.java | 202 ++++----- .../nx/codec/action/ConntrackCodecTest.java | 8 +- .../nx/codec/action/RegLoad2CodecTest.java | 13 +- .../AbstractExperimenterMatchCodecTest.java | 25 +- .../nx/codec/match/AbstractNshcCodecTest.java | 2 +- .../nx/codec/match/ArpOpCodecTest.java | 8 +- .../nx/codec/match/ArpShaCodecTest.java | 8 +- .../nx/codec/match/ArpSpaCodecTest.java | 8 +- .../nx/codec/match/ArpThaCodecTest.java | 8 +- .../nx/codec/match/ArpTpaCodecTest.java | 8 +- .../nx/codec/match/CtStateCodecTest.java | 8 +- .../nx/codec/match/CtTpDstCodecTest.java | 8 +- .../nx/codec/match/CtTpSrcCodecTest.java | 8 +- .../nx/codec/match/CtZoneCodecTest.java | 8 +- .../nx/codec/match/EthDstCodecTest.java | 8 +- .../nx/codec/match/EthSrcCodecTest.java | 8 +- .../nx/codec/match/EthTypeCodecTest.java | 8 +- .../nx/codec/match/IcmpTypeCodecTest.java | 8 +- .../nx/codec/match/IpDstCodecTest.java | 8 +- .../nx/codec/match/IpSrcCodecTest.java | 8 +- .../nx/codec/match/Ipv6DstCodecTest.java | 8 +- .../nx/codec/match/Ipv6SrcCodecTest.java | 8 +- .../nx/codec/match/MetadataCodecTest.java | 8 +- .../nx/codec/match/PktMarkCodecTest.java | 8 +- .../nx/codec/match/Reg0CodecTest.java | 8 +- .../nx/codec/match/Reg1CodecTest.java | 8 +- .../nx/codec/match/Reg2CodecTest.java | 8 +- .../nx/codec/match/Reg3CodecTest.java | 8 +- .../nx/codec/match/Reg4CodecTest.java | 8 +- .../nx/codec/match/Reg5CodecTest.java | 8 +- .../nx/codec/match/Reg6CodecTest.java | 8 +- .../nx/codec/match/Reg7CodecTest.java | 8 +- .../nx/codec/match/TcpDstCodecTest.java | 8 +- .../nx/codec/match/TcpSrcCodecTest.java | 8 +- .../nx/codec/match/TunIdCodecTest.java | 8 +- .../nx/codec/match/TunIpv4DstCodecTest.java | 8 +- .../nx/codec/match/TunIpv4SrcCodecTest.java | 8 +- .../nx/codec/match/UdpDstCodecTest.java | 8 +- .../nx/codec/match/UdpSrcCodecTest.java | 8 +- .../api/AugmentationGroupingResolver.java | 4 +- .../extension/api/ConverterExtensionKey.java | 5 +- .../extension/api/ExtensionAugment.java | 7 +- .../api/GroupingLooseResolverTest.java | 13 +- .../extension/api/GroupingResolverTest.java | 8 +- .../extension/api/SetFieldExtensionTest.java | 12 +- .../vendor/eric/EricExtensionProvider.java | 11 +- .../match/Icmpv6NDOptionsTypeConvertor.java | 6 +- .../match/Icmpv6NDReservedConvertor.java | 6 +- .../eric/convertor/match/MatchUtil.java | 4 +- .../Icmpv6NDOptionsTypeConvertorTest.java | 12 +- .../match/Icmpv6NDReservedConvertorTest.java | 12 +- .../nicira/NiciraExtensionProvider.java | 82 ++-- .../convertor/action/FieldChoiceResolver.java | 32 +- .../convertor/action/RegLoad2Convertor.java | 27 +- .../convertor/match/ArpOpConvertor.java | 6 +- .../convertor/match/ArpShaConvertor.java | 6 +- .../convertor/match/ArpSpaConvertor.java | 8 +- .../convertor/match/ArpThaConvertor.java | 6 +- .../convertor/match/ArpTpaConvertor.java | 8 +- .../convertor/match/CtMarkConvertor.java | 9 +- .../convertor/match/CtStateConvertor.java | 9 +- .../convertor/match/CtTpDstConvertor.java | 9 +- .../convertor/match/CtTpSrcConvertor.java | 9 +- .../convertor/match/CtZoneConvertor.java | 9 +- .../convertor/match/EthDstConvertor.java | 8 +- .../convertor/match/EthSrcConvertor.java | 8 +- .../convertor/match/EthTypeConvertor.java | 8 +- .../nicira/convertor/match/MatchUtil.java | 8 +- .../convertor/match/NshFlagsConvertor.java | 6 +- .../convertor/match/NshMdtypeConvertor.java | 6 +- .../convertor/match/NshNpConvertor.java | 7 +- .../convertor/match/NshTtlConvertor.java | 7 +- .../convertor/match/Nshc1Convertor.java | 6 +- .../convertor/match/Nshc2Convertor.java | 6 +- .../convertor/match/Nshc3Convertor.java | 6 +- .../convertor/match/Nshc4Convertor.java | 6 +- .../nicira/convertor/match/NsiConvertor.java | 6 +- .../nicira/convertor/match/NspConvertor.java | 6 +- .../convertor/match/NxmInPortConvertor.java | 8 +- .../convertor/match/PktMarkConvertor.java | 9 +- .../nicira/convertor/match/RegConvertor.java | 47 +- .../convertor/match/TcpDstConvertor.java | 9 +- .../convertor/match/TcpSrcConvertor.java | 8 +- .../convertor/match/TunIPv4DstConvertor.java | 8 +- .../convertor/match/TunIPv4SrcConvertor.java | 8 +- .../convertor/match/TunIdConvertor.java | 8 +- .../convertor/match/UdpDstConvertor.java | 9 +- .../convertor/match/UdpSrcConvertor.java | 9 +- .../action/ConntrackConvertorTest.java | 11 +- .../action/FieldChoiceResolverTest.java | 64 +-- .../convertor/match/ArpOpConvertorTest.java | 13 +- .../convertor/match/ArpShaConvertorTest.java | 15 +- .../convertor/match/ArpSpaConvertorTest.java | 8 +- .../convertor/match/ArpThaConvertorTest.java | 8 +- .../convertor/match/ArpTpaConvertorTest.java | 10 +- .../convertor/match/CtStateConvertorTest.java | 8 +- .../convertor/match/CtZoneConvertorTest.java | 8 +- .../convertor/match/EthDstConvertorTest.java | 8 +- .../convertor/match/EthSrcConvertorTest.java | 10 +- .../convertor/match/EthTypeConvertorTest.java | 8 +- .../match/NshFlagsConvertorTest.java | 9 +- .../match/NshMdtypeConvertorTest.java | 9 +- .../convertor/match/NshNpConvertorTest.java | 9 +- .../convertor/match/NshTtlConvertorTest.java | 9 +- .../convertor/match/Nshc1ConvertorTest.java | 8 +- .../convertor/match/Nshc2ConvertorTest.java | 8 +- .../convertor/match/Nshc3ConvertorTest.java | 8 +- .../convertor/match/Nshc4ConvertorTest.java | 8 +- .../convertor/match/NsiConvertorTest.java | 8 +- .../convertor/match/NspConvertorTest.java | 8 +- .../convertor/match/TcpDstConvertorTest.java | 8 +- .../convertor/match/TcpSrcConvertorTest.java | 8 +- .../match/TunIPv4DstConvertorTest.java | 8 +- .../match/TunIPv4SrcConvertorTest.java | 10 +- .../convertor/match/TunIdConvertorTest.java | 8 +- .../convertor/match/UdpDstConvertorTest.java | 16 +- .../convertor/match/UdpSrcConvertorTest.java | 18 +- extension/pom.xml | 2 +- .../openflowplugin/extension/test/Test.java | 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 +- .../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 | 4 +- .../odl-openflowplugin-nsf-model/pom.xml | 6 +- .../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/pom.xml | 2 +- .../features-openflowjava/pom.xml | 2 +- .../odl-openflowjava-protocol/pom.xml | 8 +- .../src/main/feature/feature.xml | 6 +- .../features-openflowjava-aggregator/pom.xml | 2 +- .../keys/ExperimenterActionSerializerKey.java | 5 +- ...perimenterIdMeterSubTypeSerializerKey.java | 4 +- .../api/keys/MatchEntrySerializerKey.java | 10 +- .../protocol/api/keys/KeysTest.java | 11 +- .../api/keys/MatchEntrySerializerKeyTest.java | 39 +- .../ExperimenterActionSerializerKeyTest.java | 25 +- openflowjava/openflow-protocol-impl/pom.xml | 4 +- .../SwitchConnectionProviderFactoryImpl.java | 2 +- .../AbstractOxmMatchEntryDeserializer.java | 12 +- .../match/OxmArpOpDeserializer.java | 2 +- .../match/OxmArpShaDeserializer.java | 2 +- .../match/OxmArpSpaDeserializer.java | 3 +- .../match/OxmArpThaDeserializer.java | 2 +- .../match/OxmArpTpaDeserializer.java | 2 +- .../match/OxmEthDstDeserializer.java | 2 +- .../match/OxmEthSrcDeserializer.java | 2 +- .../match/OxmEthTypeDeserializer.java | 2 +- .../match/OxmIcmpv4CodeDeserializer.java | 2 +- .../match/OxmIcmpv4TypeDeserializer.java | 2 +- .../match/OxmIcmpv6CodeDeserializer.java | 2 +- .../match/OxmIcmpv6TypeDeserializer.java | 2 +- .../match/OxmInPhyPortDeserializer.java | 2 +- .../match/OxmInPortDeserializer.java | 2 +- .../match/OxmIpDscpDeserializer.java | 2 +- .../match/OxmIpEcnDeserializer.java | 2 +- .../match/OxmIpProtoDeserializer.java | 2 +- .../match/OxmIpv4DstDeserializer.java | 2 +- .../match/OxmIpv4SrcDeserializer.java | 2 +- .../match/OxmIpv6DstDeserializer.java | 2 +- .../match/OxmIpv6ExtHdrDeserializer.java | 2 +- .../match/OxmIpv6FlabelDeserializer.java | 2 +- .../match/OxmIpv6NdSllDeserializer.java | 2 +- .../match/OxmIpv6NdTargetDeserializer.java | 2 +- .../match/OxmIpv6NdTllDeserializer.java | 2 +- .../match/OxmIpv6SrcDeserializer.java | 2 +- .../match/OxmMetadataDeserializer.java | 2 +- .../match/OxmMplsBosDeserializer.java | 2 +- .../match/OxmMplsLabelDeserializer.java | 2 +- .../match/OxmMplsTcDeserializer.java | 2 +- .../match/OxmPacketTypeDeserializer.java | 2 +- .../match/OxmPbbIsidDeserializer.java | 2 +- .../match/OxmSctpDstDeserializer.java | 2 +- .../match/OxmSctpSrcDeserializer.java | 2 +- .../match/OxmTcpDstDeserializer.java | 2 +- .../match/OxmTcpSrcDeserializer.java | 2 +- .../match/OxmTunnelIdDeserializer.java | 2 +- .../match/OxmUdpDstDeserializer.java | 2 +- .../match/OxmUdpSrcDeserializer.java | 2 +- .../match/OxmVlanPcpDeserializer.java | 2 +- .../match/OxmVlanVidDeserializer.java | 2 +- ...OxmExperimenterMatchEntryDeserializer.java | 4 +- .../match/ext/OnfOxmTcpFlagsDeserializer.java | 2 +- .../MatchEntriesInitializer.java | 86 ++-- .../action/OF13SetFieldActionSerializer.java | 2 +- .../MeterModInputMessageFactory.java | 2 +- .../protocol/impl/util/MatchDeserializer.java | 6 +- .../MatchEntrySerializerRegistryHelper.java | 10 +- .../impl/util/OF13MatchSerializer.java | 8 +- .../impl/util/TypeKeyMakerFactory.java | 2 +- .../SwitchConnectionProviderImpl02Test.java | 47 +- .../FlowModInputMessageFactoryTest.java | 11 +- .../MultipartReplyMessageFactoryTest.java | 4 +- ...tTableFeaturesInputMessageFactoryTest.java | 4 +- .../multipart/MultipartReplyFlowTest.java | 4 +- .../match/OxmIpv6ExtHdrDeserializerTest.java | 4 +- .../match/OxmIpv6FlabelDeserializerTest.java | 8 +- .../match/OxmMetadataDeserializerTest.java | 4 +- .../match/OxmMplsBosDeserializerTest.java | 4 +- .../match/OxmPacketTypeDeserializerTest.java | 6 +- .../match/OxmPbbIsidDeserializerTest.java | 6 +- .../match/OxmVlanVidDeserializerTest.java | 4 +- .../OF13SetFieldActionSerializerTest.java | 6 +- .../FlowModInputMessageFactoryTest.java | 10 +- .../FlowRemovedMessageFactoryTest.java | 10 +- .../MultipartReplyMessageFactoryTest.java | 26 +- .../factories/PacketInMessageFactoryTest.java | 10 +- .../MultipartRequestTableFeaturesTest.java | 16 +- .../match/OxmArpOpSerializerTest.java | 10 +- .../match/OxmArpShaSerializerTest.java | 10 +- .../match/OxmArpSpaSerializerTest.java | 10 +- .../match/OxmArpThaSerializerTest.java | 10 +- .../match/OxmArpTpaSerializerTest.java | 10 +- .../match/OxmEthDstSerializerTest.java | 10 +- .../match/OxmEthSrcSerializerTest.java | 10 +- .../match/OxmEthTypeSerializerTest.java | 10 +- .../match/OxmIcmpv4CodeSerializerTest.java | 10 +- .../match/OxmIcmpv4TypeSerializerTest.java | 10 +- .../match/OxmIcmpv6CodeSerializerTest.java | 10 +- .../match/OxmIcmpv6TypeSerializerTest.java | 10 +- .../match/OxmIpDscpSerializerTest.java | 10 +- .../match/OxmIpProtoSerializerTest.java | 10 +- .../match/OxmIpv4DstSerializerTest.java | 10 +- .../match/OxmIpv4SrcSerializerTest.java | 10 +- .../match/OxmIpv6ExtHdrSerializerTest.java | 10 +- .../match/OxmIpv6NdSllSerializerTest.java | 10 +- .../match/OxmIpv6NdTllSerializerTest.java | 10 +- .../match/OxmIpv6SrcSerializerTest.java | 10 +- .../match/OxmMetadataSerializerTest.java | 10 +- .../match/OxmMplsBosSerializerTest.java | 10 +- .../match/OxmMplsLabelSerializerTest.java | 10 +- .../match/OxmMplsTcSerializerTest.java | 10 +- .../match/OxmPacketTypeSerializerTest.java | 6 +- .../match/OxmPbbIsidSerializerTest.java | 10 +- .../match/OxmSctpDstSerializerTest.java | 10 +- .../match/OxmSctpSrcSerializerTest.java | 10 +- .../match/OxmTcpDstSerializerTest.java | 10 +- .../match/OxmTcpSrcSerializerTest.java | 10 +- .../match/OxmTunnelIdSerializerTest.java | 10 +- .../match/OxmUdpDstSerializerTest.java | 10 +- .../match/OxmUdpSrcSerializerTest.java | 10 +- .../match/OxmVlanPcpSerializerTest.java | 10 +- .../match/OxmVlanVidSerializerTest.java | 10 +- .../impl/util/ActionsDeserializerTest.java | 4 +- .../impl/util/MatchDeserializerTest.java | 172 ++++---- .../impl/util/OF13ActionsSerializerTest.java | 8 +- .../impl/util/OF13MatchSerializer02Test.java | 168 ++++---- .../impl/util/OF13MatchSerializerTest.java | 46 +- .../impl/util/TypeKeyMakerFactoryTest.java | 12 +- .../ExperimenterSerializerKeyFactory.java | 2 +- .../ExperimenterSerializerKeyFactoryTest.java | 10 +- openflowplugin-impl/pom.xml | 4 +- .../common/MultipartReplyTranslatorUtil.java | 36 +- .../common/MultipartRequestInputFactory.java | 2 +- .../SystemNotificationsListenerImpl.java | 29 +- .../device/BuildSwitchCapabilitiesOF10.java | 18 +- .../device/BuildSwitchCapabilitiesOF13.java | 16 +- .../impl/device/DeviceContextImpl.java | 38 +- ...ltipartReplyGroupFeaturesDeserializer.java | 24 +- ...ltipartReplyMeterFeaturesDeserializer.java | 20 +- .../TableFeaturesMatchFieldDeserializer.java | 88 ++-- ...MultipartMatchFieldSerializerInjector.java | 92 ++-- .../serialization/match/MatchSerializer.java | 2 +- ...lySetfieldMissTablePropertySerializer.java | 4 +- .../ApplySetfieldTablePropertySerializer.java | 4 +- .../MatchTablePropertySerializer.java | 4 +- .../WildcardsTablePropertySerializer.java | 4 +- ...teSetfieldMissTablePropertySerializer.java | 4 +- .../WriteSetfieldTablePropertySerializer.java | 4 +- .../services/GroupFeaturesService.java | 24 +- .../services/MeterFeaturesService.java | 20 +- .../impl/util/FlowCreatorUtil.java | 2 +- .../impl/util/PacketInUtil.java | 11 +- .../MultipartRequestInputFactoryTest.java | 2 +- ...artReplyGroupFeaturesDeserializerTest.java | 4 +- ...artReplyMeterFeaturesDeserializerTest.java | 20 +- ...bleFeaturesMatchFieldDeserializerTest.java | 78 ++-- ...tfieldMissTablePropertySerializerTest.java | 2 +- ...lySetfieldTablePropertySerializerTest.java | 2 +- .../MatchTablePropertySerializerTest.java | 2 +- .../WildcardsTablePropertySerializerTest.java | 2 +- ...tfieldMissTablePropertySerializerTest.java | 2 +- ...teSetfieldTablePropertySerializerTest.java | 2 +- .../matchfield/MatchFieldSerializerTest.java | 82 ++-- .../PacketReceivedTranslatorTest.java | 11 +- .../impl/util/FlowCreatorUtilTest.java | 2 +- .../NodeConnectorRefToPortTranslatorTest.java | 4 +- .../impl/util/PacketInUtilTest.java | 19 +- openflowplugin-it/pom.xml | 4 +- .../core/extension/MatchExtensionHelper.java | 2 +- .../sal/convertor/TableFeaturesConvertor.java | 152 ++++--- .../TableFeaturesResponseConvertor.java | 116 ++--- .../cases/SalToOfSetDlDstActionCase.java | 5 +- .../cases/SalToOfSetDlSrcActionCase.java | 5 +- .../cases/SalToOfSetNwDstActionCase.java | 9 +- .../cases/SalToOfSetNwSrcActionCase.java | 9 +- .../cases/SalToOfSetTpDstActionCase.java | 10 +- .../cases/SalToOfSetTpSrcActionCase.java | 11 +- .../cases/SalToOfSetVlanIdActionCase.java | 7 +- .../cases/SalToOfStripVlanActionCase.java | 4 +- .../sal/convertor/flow/FlowConvertor.java | 2 +- .../sal/convertor/match/MatchConvertor.java | 84 ++-- .../convertor/match/MatchConvertorUtil.java | 8 +- .../match/MatchResponseConvertor.java | 35 +- .../cases/OfToSalExperimenterIdCase.java | 2 +- .../match/cases/SalToOfArpMatchCase.java | 21 +- .../SalToOfIpv4MatchArbitraryBitMaskCase.java | 9 +- .../match/cases/SalToOfIpv4MatchCase.java | 9 +- .../SalToOfIpv6MatchArbitraryBitMaskCase.java | 9 +- .../match/cases/SalToOfIpv6MatchCase.java | 29 +- .../match/cases/SalToOfSctpMatchCase.java | 9 +- .../match/cases/SalToOfTcpMatchCase.java | 9 +- .../cases/SalToOfTunnelIpv4MatchCase.java | 9 +- .../match/cases/SalToOfUdpMatchCase.java | 9 +- .../data/MatchResponseConvertorData.java | 6 +- .../ExtensionConverterManagerImplTest.java | 2 +- .../extension/MatchExtensionHelperTest.java | 34 +- .../convertor/TableFeaturesConvertorTest.java | 86 ++-- .../TableFeaturesResponseConvertorTest.java | 106 +++-- .../action/ActionConvertorV13Test.java | 39 +- .../sal/convertor/flow/FlowConvertorTest.java | 4 +- .../convertor/match/MatchConvertorTest.java | 132 +++--- .../match/MatchResponseConvertor2Test.java | 403 +++++++++--------- .../match/MatchResponseConvertorTest.java | 21 +- parent/pom.xml | 6 +- pom.xml | 13 + samples/pom.xml | 2 +- .../SampleFlowCapableNodeListener.java | 2 +- test-provider/pom.xml | 4 +- ...penflowpluginStatsTestCommandProvider.java | 2 +- ...luginTableFeaturesTestCommandProvider.java | 31 +- 424 files changed, 2697 insertions(+), 2744 deletions(-) diff --git a/applications/arbitratorreconciliation/impl/pom.xml b/applications/arbitratorreconciliation/impl/pom.xml index 83c4d35719..f6d32aa2f4 100644 --- a/applications/arbitratorreconciliation/impl/pom.xml +++ b/applications/arbitratorreconciliation/impl/pom.xml @@ -35,8 +35,8 @@ true - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api true diff --git a/applications/arbitratorreconciliation/pom.xml b/applications/arbitratorreconciliation/pom.xml index 8b55691e37..ebf8582948 100644 --- a/applications/arbitratorreconciliation/pom.xml +++ b/applications/arbitratorreconciliation/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.2 + 11.0.0 diff --git a/applications/device-ownership-service/pom.xml b/applications/device-ownership-service/pom.xml index 87618997fe..fbe98d7b14 100644 --- a/applications/device-ownership-service/pom.xml +++ b/applications/device-ownership-service/pom.xml @@ -23,8 +23,8 @@ true - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api true diff --git a/applications/forwardingrules-manager/pom.xml b/applications/forwardingrules-manager/pom.xml index b11c691c9f..d0b4e983d6 100644 --- a/applications/forwardingrules-manager/pom.xml +++ b/applications/forwardingrules-manager/pom.xml @@ -19,8 +19,8 @@ true - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api true diff --git a/applications/of-switch-config-pusher/pom.xml b/applications/of-switch-config-pusher/pom.xml index da2e73af88..e5419863a1 100644 --- a/applications/of-switch-config-pusher/pom.xml +++ b/applications/of-switch-config-pusher/pom.xml @@ -48,8 +48,8 @@ true - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api true diff --git a/applications/pom.xml b/applications/pom.xml index 302744b37e..7b490de2e2 100644 --- a/applications/pom.xml +++ b/applications/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.2 + 11.0.0 diff --git a/applications/reconciliation-framework/pom.xml b/applications/reconciliation-framework/pom.xml index 69b06a5fd6..6b2d1afd9d 100644 --- a/applications/reconciliation-framework/pom.xml +++ b/applications/reconciliation-framework/pom.xml @@ -32,8 +32,8 @@ true - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api true diff --git a/applications/southbound-cli/pom.xml b/applications/southbound-cli/pom.xml index 3c2e3ca342..7ae9114092 100644 --- a/applications/southbound-cli/pom.xml +++ b/applications/southbound-cli/pom.xml @@ -48,8 +48,8 @@ true - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api true diff --git a/applications/topology-lldp-discovery/pom.xml b/applications/topology-lldp-discovery/pom.xml index 92723cffdd..6bf7f5e985 100644 --- a/applications/topology-lldp-discovery/pom.xml +++ b/applications/topology-lldp-discovery/pom.xml @@ -48,8 +48,8 @@ true - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api true diff --git a/applications/topology-manager/pom.xml b/applications/topology-manager/pom.xml index 8874d61340..da3b651b03 100644 --- a/applications/topology-manager/pom.xml +++ b/applications/topology-manager/pom.xml @@ -62,8 +62,8 @@ true - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api true diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 95cb5e3cbb..7931046268 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.2 + 11.0.0 diff --git a/distribution/karaf/pom.xml b/distribution/karaf/pom.xml index 7d503f9470..894fd80099 100644 --- a/distribution/karaf/pom.xml +++ b/distribution/karaf/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent karaf4-parent - 10.0.2 + 11.0.0 org.opendaylight.openflowplugin openflowplugin-karaf diff --git a/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml b/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml index a177d1214b..f7ad4ddb9b 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 - 10.0.2 + 11.0.0 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 0319d15d81..0cf21bd4db 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 - 10.0.2 + 11.0.0 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 72d9a244bd..66df9bf833 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 - 10.0.2 + 11.0.0 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 9123c66b58..267b8014ae 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 - 10.0.2 + 11.0.0 diff --git a/extension/features-extension-aggregator/pom.xml b/extension/features-extension-aggregator/pom.xml index 21033f533f..c60c2e075e 100644 --- a/extension/features-extension-aggregator/pom.xml +++ b/extension/features-extension-aggregator/pom.xml @@ -3,7 +3,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.2 + 11.0.0 4.0.0 diff --git a/extension/openflowjava-extension-eric/src/main/java/org/opendaylight/openflowjava/eric/codec/match/AbstractMatchCodec.java b/extension/openflowjava-extension-eric/src/main/java/org/opendaylight/openflowjava/eric/codec/match/AbstractMatchCodec.java index b6e645ff9e..954b42c6a7 100644 --- a/extension/openflowjava-extension-eric/src/main/java/org/opendaylight/openflowjava/eric/codec/match/AbstractMatchCodec.java +++ b/extension/openflowjava-extension-eric/src/main/java/org/opendaylight/openflowjava/eric/codec/match/AbstractMatchCodec.java @@ -102,10 +102,10 @@ public abstract class AbstractMatchCodec implements /** * Returns the eric_field class. */ - public abstract Class getEricField(); + public abstract MatchField getEricField(); /** * Returns the oxm_class class. */ - public abstract Class getOxmClass(); + public abstract OxmClassBase getOxmClass(); } 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 daa499534e..d26a11dae2 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 @@ -26,7 +26,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev public class Icmpv6NDOptionsTypeCodec extends AbstractMatchCodec { private static final int VALUE_LENGTH = 1; public static final MatchEntrySerializerKey SERIALIZER_KEY = new MatchEntrySerializerKey<>( - EncodeConstants.OF_VERSION_1_3, EricExpClass.class, Icmpv6NdOptionsType.class); + EncodeConstants.OF_VERSION_1_3, EricExpClass.VALUE, Icmpv6NdOptionsType.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, EricConstants.ERICOXM_OF_EXPERIMENTER_ID, EricConstants.ERICOXM_OF_ICMPV6_ND_OPTIONS_TYPE); @@ -66,12 +66,12 @@ public class Icmpv6NDOptionsTypeCodec extends AbstractMatchCodec { } @Override - public Class getEricField() { - return Icmpv6NdOptionsType.class; + public MatchField getEricField() { + return Icmpv6NdOptionsType.VALUE; } @Override - public Class getOxmClass() { - return EricExpClass.class; + public OxmClassBase getOxmClass() { + return EricExpClass.VALUE; } -} \ No newline at end of file +} 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 64aec791b4..b4945a85a1 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 @@ -28,7 +28,7 @@ public class Icmpv6NDReservedCodec extends AbstractMatchCodec { private static final int VALUE_LENGTH = 4; public static final MatchEntrySerializerKey SERIALIZER_KEY = new MatchEntrySerializerKey<>( - EncodeConstants.OF_VERSION_1_3, EricExpClass.class, Icmpv6NdReserved.class); + EncodeConstants.OF_VERSION_1_3, EricExpClass.VALUE, Icmpv6NdReserved.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, EricConstants.ERICOXM_OF_EXPERIMENTER_ID, EricConstants.ERICOXM_OF_ICMPV6_ND_RESERVED); @@ -67,12 +67,12 @@ public class Icmpv6NDReservedCodec extends AbstractMatchCodec { } @Override - public Class getEricField() { - return Icmpv6NdReserved.class; + public MatchField getEricField() { + return Icmpv6NdReserved.VALUE; } @Override - public Class getOxmClass() { - return EricExpClass.class; + public OxmClassBase getOxmClass() { + return EricExpClass.VALUE; } -} \ 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 668ce75ce2..9185148dce 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 @@ -48,7 +48,7 @@ public class EricExtensionCodecRegistratorImplTest { @Before public void setUp() { providers.add(provider); - matchSerializerKey = new MatchEntrySerializerKey<>(VERSION, EricExpClass.class, MatchField.class); + matchSerializerKey = new MatchEntrySerializerKey<>(VERSION, EricExpClass.VALUE, MatchField.VALUE); //OxmClass 1, OxmField 2 matchDeserializerKey = new MatchEntryDeserializerKey(VERSION, 1, 2); 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 058e21ec47..3a3b103356 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,16 +43,16 @@ public class EricExtensionsRegistratorTest { @Test public void registerEricExtensionsTest() { verify(registrator).registerMatchEntrySerializer( - eq(new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, EricExpClass.class, - Icmpv6NdReserved.class)), any(Icmpv6NDReservedCodec.class)); + eq(new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, EricExpClass.VALUE, + Icmpv6NdReserved.VALUE)), any(Icmpv6NDReservedCodec.class)); verify(registrator).registerMatchEntryDeserializer( 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.OF_VERSION_1_3, EricExpClass.class, - Icmpv6NdOptionsType.class)), any(Icmpv6NDOptionsTypeCodec.class)); + eq(new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, EricExpClass.VALUE, + Icmpv6NdOptionsType.VALUE)), any(Icmpv6NDOptionsTypeCodec.class)); verify(registrator).registerMatchEntryDeserializer( eq(new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, EricConstants.ERICOXM_OF_EXPERIMENTER_ID, @@ -65,15 +65,15 @@ public class EricExtensionsRegistratorTest { ericExtensionsRegistrator.close(); verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, EricExpClass.class, - Icmpv6NdReserved.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, EricExpClass.VALUE, + Icmpv6NdReserved.VALUE)); verify(registrator).unregisterMatchEntryDeserializer( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, EricConstants.ERICOXM_OF_EXPERIMENTER_ID, EricConstants.ERICOXM_OF_ICMPV6_ND_RESERVED)); verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, EricExpClass.class, - Icmpv6NdOptionsType.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, EricExpClass.VALUE, + Icmpv6NdOptionsType.VALUE)); verify(registrator).unregisterMatchEntryDeserializer( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, EricConstants.ERICOXM_OF_EXPERIMENTER_ID, EricConstants.ERICOXM_OF_ICMPV6_ND_OPTIONS_TYPE)); 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 592016754d..ec6f9f5b8e 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 @@ -53,8 +53,8 @@ public class Icmpv6NDOptionsTypeCodecTest { input = icmpv6NDOptionsTypeCodec.deserialize(buffer); final Icmpv6NdOptionsTypeCaseValue result = (Icmpv6NdOptionsTypeCaseValue) input.getMatchEntryValue(); - assertEquals(EricExpClass.class, input.getOxmClass()); - assertEquals(Icmpv6NdOptionsType.class, input.getOxmMatchField()); + assertEquals(EricExpClass.VALUE, input.getOxmClass()); + assertEquals(Icmpv6NdOptionsType.VALUE, input.getOxmMatchField()); assertEquals(false, input.getHasMask()); assertEquals(2, result.getIcmpv6NdOptionsTypeValues().getIcmpv6NdOptionsType().shortValue()); } @@ -64,8 +64,8 @@ public class Icmpv6NDOptionsTypeCodecTest { final Icmpv6NdOptionsTypeCaseValueBuilder caseBuilder = new Icmpv6NdOptionsTypeCaseValueBuilder(); final Icmpv6NdOptionsTypeValuesBuilder valuesBuilder = new Icmpv6NdOptionsTypeValuesBuilder(); - matchEntryBuilder.setOxmClass(EricExpClass.class); - matchEntryBuilder.setOxmMatchField(Icmpv6NdOptionsType.class); + matchEntryBuilder.setOxmClass(EricExpClass.VALUE); + matchEntryBuilder.setOxmMatchField(Icmpv6NdOptionsType.VALUE); matchEntryBuilder.setHasMask(false); valuesBuilder.setIcmpv6NdOptionsType(Uint8.ONE); @@ -83,4 +83,4 @@ public class Icmpv6NDOptionsTypeCodecTest { message.writeByte(VALUE_LENGTH); message.writeByte(2); } -} \ No newline at end of file +} 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 93a8ad8c43..138c242b42 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 @@ -52,8 +52,8 @@ public class Icmpv6NDReservedCodecTest { input = icmpv6NDReservedCodec.deserialize(buffer); final Icmpv6NdReservedCaseValue result = (Icmpv6NdReservedCaseValue) input.getMatchEntryValue(); - assertEquals(EricExpClass.class, input.getOxmClass()); - assertEquals(Icmpv6NdReserved.class, input.getOxmMatchField()); + assertEquals(EricExpClass.VALUE, input.getOxmClass()); + assertEquals(Icmpv6NdReserved.VALUE, input.getOxmMatchField()); assertEquals(false, input.getHasMask()); assertEquals(2, result.getIcmpv6NdReservedValues().getIcmpv6NdReserved().intValue()); } @@ -63,8 +63,8 @@ public class Icmpv6NDReservedCodecTest { final Icmpv6NdReservedCaseValueBuilder caseBuilder = new Icmpv6NdReservedCaseValueBuilder(); final Icmpv6NdReservedValuesBuilder valuesBuilder = new Icmpv6NdReservedValuesBuilder(); - matchEntryBuilder.setOxmClass(EricExpClass.class); - matchEntryBuilder.setOxmMatchField(Icmpv6NdReserved.class); + matchEntryBuilder.setOxmClass(EricExpClass.VALUE); + matchEntryBuilder.setOxmMatchField(Icmpv6NdReserved.VALUE); matchEntryBuilder.setHasMask(false); valuesBuilder.setIcmpv6NdReserved(Uint32.ONE); @@ -80,4 +80,4 @@ public class Icmpv6NDReservedCodecTest { message.writeByte(VALUE_LENGTH); message.writeInt(2); } -} \ No newline at end of file +} 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 03c31e1888..c61ff7585e 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 @@ -90,7 +90,7 @@ public class RegLoad2Codec EncodeConstants.OF_VERSION_1_3, matchEntry.getOxmClass(), matchEntry.getOxmMatchField()); - if (matchEntry.getOxmClass().equals(ExperimenterClass.class)) { + if (ExperimenterClass.VALUE.equals(matchEntry.getOxmClass())) { ExperimenterIdCase experimenterIdCase = (ExperimenterIdCase) matchEntry.getMatchEntryValue(); key.setExperimenterId(experimenterIdCase.getExperimenter().getExperimenter().getValue()); } @@ -102,11 +102,11 @@ public class RegLoad2Codec @Override public void injectSerializerRegistry(final SerializerRegistry registry) { - this.serializerRegistry = registry; + serializerRegistry = registry; } @Override public void injectDeserializerRegistry(final DeserializerRegistry registry) { - this.deserializerRegistry = registry; + deserializerRegistry = registry; } } 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 4632fa423e..0b6164ba04 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 @@ -30,9 +30,9 @@ import org.opendaylight.yangtools.yang.common.Uint8; public abstract class AbstractExperimenterMatchCodec extends AbstractMatchCodec { protected static MatchEntrySerializerKey createSerializerKey( - final Uint8 version, final Uint32 expId, final Class oxmField) { + final Uint8 version, final Uint32 expId, final F oxmField) { MatchEntrySerializerKey key = new MatchEntrySerializerKey<>( - version, ExperimenterClass.class, oxmField); + version, ExperimenterClass.VALUE, oxmField); key.setExperimenterId(expId); return key; } @@ -104,8 +104,8 @@ public abstract class AbstractExperimenterMatchCodec extends AbstractMatchCodec } @Override - public Class getOxmClass() { - return ExperimenterClass.class; + public OxmClassBase getOxmClass() { + return ExperimenterClass.VALUE; } @Override diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/AbstractMatchCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/AbstractMatchCodec.java index 723fc4b48a..1c108b24fe 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/AbstractMatchCodec.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/AbstractMatchCodec.java @@ -102,10 +102,10 @@ public abstract class AbstractMatchCodec implements /** * Returns the nxm_field class. */ - public abstract Class getNxmField(); + public abstract MatchField getNxmField(); /** * Returns the oxm_class class. */ - public abstract Class getOxmClass(); + public abstract OxmClassBase getOxmClass(); } 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 f592d51959..bf481003b2 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 @@ -61,7 +61,7 @@ public abstract class AbstractRegCodec extends AbstractMatchCodec { } @Override - public Class getOxmClass() { - return Nxm1Class.class; + public OxmClassBase getOxmClass() { + return Nxm1Class.VALUE; } } 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 5da1f64db0..e8a8a1040e 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 @@ -27,7 +27,7 @@ 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.OF_VERSION_1_3, Nxm0Class.class, NxmOfArpOp.class); + EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfArpOp.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); @@ -63,12 +63,12 @@ public class ArpOpCodec extends AbstractMatchCodec { } @Override - public Class getNxmField() { - return NxmOfArpOp.class; + public MatchField getNxmField() { + return NxmOfArpOp.VALUE; } @Override - public Class getOxmClass() { - return Nxm0Class.class; + public OxmClassBase getOxmClass() { + return Nxm0Class.VALUE; } } 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 be88d4ec7a..9321608145 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 @@ -27,7 +27,7 @@ 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.OF_VERSION_1_3, Nxm1Class.class, NxmNxArpSha.class); + EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxArpSha.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); @@ -67,12 +67,12 @@ public class ArpShaCodec extends AbstractMatchCodec { } @Override - public Class getNxmField() { - return NxmNxArpSha.class; + public MatchField getNxmField() { + return NxmNxArpSha.VALUE; } @Override - public Class getOxmClass() { - return Nxm1Class.class; + public OxmClassBase getOxmClass() { + return Nxm1Class.VALUE; } } 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 274012af17..5d6b2a7f6f 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 @@ -27,7 +27,7 @@ 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.OF_VERSION_1_3, Nxm0Class.class, NxmOfArpSpa.class); + EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfArpSpa.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); @@ -63,12 +63,12 @@ public class ArpSpaCodec extends AbstractMatchCodec { } @Override - public Class getNxmField() { - return NxmOfArpSpa.class; + public MatchField getNxmField() { + return NxmOfArpSpa.VALUE; } @Override - public Class getOxmClass() { - return Nxm0Class.class; + public OxmClassBase getOxmClass() { + return Nxm0Class.VALUE; } } 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 6fa5223780..11c6e1562d 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 @@ -27,7 +27,7 @@ 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.OF_VERSION_1_3, Nxm1Class.class, NxmNxArpTha.class); + EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxArpTha.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); @@ -67,12 +67,12 @@ public class ArpThaCodec extends AbstractMatchCodec { } @Override - public Class getNxmField() { - return NxmNxArpTha.class; + public MatchField getNxmField() { + return NxmNxArpTha.VALUE; } @Override - public Class getOxmClass() { - return Nxm1Class.class; + public OxmClassBase getOxmClass() { + return Nxm1Class.VALUE; } } 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 d25d49f995..9e565f30ad 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 @@ -27,7 +27,7 @@ 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.OF_VERSION_1_3, Nxm0Class.class, NxmOfArpTpa.class); + EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfArpTpa.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); @@ -63,12 +63,12 @@ public class ArpTpaCodec extends AbstractMatchCodec { } @Override - public Class getNxmField() { - return NxmOfArpTpa.class; + public MatchField getNxmField() { + return NxmOfArpTpa.VALUE; } @Override - public Class getOxmClass() { - return Nxm0Class.class; + public OxmClassBase getOxmClass() { + return Nxm0Class.VALUE; } } 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 83cf1fdc7e..a44095395a 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 @@ -34,7 +34,7 @@ public class CtMarkCodec extends AbstractMatchCodec { private static final int NXM_FIELD_CODE = 107; public static final MatchEntrySerializerKey SERIALIZER_KEY = new MatchEntrySerializerKey<>( - EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxCtMark.class); + EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxCtMark.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); @@ -76,12 +76,12 @@ public class CtMarkCodec extends AbstractMatchCodec { } @Override - public Class getNxmField() { - return NxmNxCtMark.class; + public MatchField getNxmField() { + return NxmNxCtMark.VALUE; } @Override - public Class getOxmClass() { - return Nxm1Class.class; + public OxmClassBase getOxmClass() { + return Nxm1Class.VALUE; } } 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 7ce1fc74bb..39ce19f3ea 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 @@ -33,7 +33,7 @@ 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.OF_VERSION_1_3, Nxm1Class.class, NxmNxCtState.class); + EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxCtState.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); @@ -74,12 +74,12 @@ public class CtStateCodec extends AbstractMatchCodec { } @Override - public Class getNxmField() { - return NxmNxCtState.class; + public MatchField getNxmField() { + return NxmNxCtState.VALUE; } @Override - public Class getOxmClass() { - return Nxm1Class.class; + public OxmClassBase getOxmClass() { + return Nxm1Class.VALUE; } } 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 986bbd9b6b..333201735b 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 @@ -28,7 +28,7 @@ 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.OF_VERSION_1_3, Nxm1Class.class, NxmNxCtTpDst.class); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxCtTpDst.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); @@ -64,12 +64,12 @@ public class CtTpDstCodec extends AbstractMatchCodec { } @Override - public Class getNxmField() { - return NxmNxCtTpDst.class; + public MatchField getNxmField() { + return NxmNxCtTpDst.VALUE; } @Override - public Class getOxmClass() { - return Nxm1Class.class; + public OxmClassBase getOxmClass() { + return Nxm1Class.VALUE; } } 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 06e0843fc3..b4a057709c 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 @@ -28,7 +28,7 @@ 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.OF_VERSION_1_3, Nxm1Class.class, NxmNxCtTpSrc.class); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxCtTpSrc.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); @@ -64,12 +64,12 @@ public class CtTpSrcCodec extends AbstractMatchCodec { } @Override - public Class getNxmField() { - return NxmNxCtTpSrc.class; + public MatchField getNxmField() { + return NxmNxCtTpSrc.VALUE; } @Override - public Class getOxmClass() { - return Nxm1Class.class; + public OxmClassBase getOxmClass() { + return Nxm1Class.VALUE; } } 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 1771dd95f7..d649586b1d 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 @@ -33,7 +33,7 @@ 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.OF_VERSION_1_3, Nxm1Class.class, NxmNxCtZone.class); + EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxCtZone.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); @@ -69,12 +69,12 @@ public class CtZoneCodec extends AbstractMatchCodec { } @Override - public Class getNxmField() { - return NxmNxCtZone.class; + public MatchField getNxmField() { + return NxmNxCtZone.VALUE; } @Override - public Class getOxmClass() { - return Nxm1Class.class; + public OxmClassBase getOxmClass() { + return Nxm1Class.VALUE; } } 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 1e1430d95b..2e677eba64 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 @@ -27,7 +27,7 @@ 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.OF_VERSION_1_3, Nxm0Class.class, NxmOfEthDst.class); + EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfEthDst.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); @@ -67,12 +67,12 @@ public class EthDstCodec extends AbstractMatchCodec { } @Override - public Class getNxmField() { - return NxmOfEthDst.class; + public MatchField getNxmField() { + return NxmOfEthDst.VALUE; } @Override - public Class getOxmClass() { - return Nxm0Class.class; + public OxmClassBase getOxmClass() { + return Nxm0Class.VALUE; } } 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 d04b22d5de..4489c69ab0 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 @@ -27,7 +27,7 @@ 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.OF_VERSION_1_3, Nxm0Class.class, NxmOfEthSrc.class); + EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfEthSrc.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); @@ -68,12 +68,12 @@ public class EthSrcCodec extends AbstractMatchCodec { } @Override - public Class getNxmField() { - return NxmOfEthSrc.class; + public MatchField getNxmField() { + return NxmOfEthSrc.VALUE; } @Override - public Class getOxmClass() { - return Nxm0Class.class; + public OxmClassBase getOxmClass() { + return Nxm0Class.VALUE; } } 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 297939f052..d6b2285fc8 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 @@ -27,7 +27,7 @@ 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.OF_VERSION_1_3, Nxm0Class.class, NxmOfEthType.class); + EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfEthType.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); @@ -63,12 +63,12 @@ public class EthTypeCodec extends AbstractMatchCodec { } @Override - public Class getNxmField() { - return NxmOfEthType.class; + public MatchField getNxmField() { + return NxmOfEthType.VALUE; } @Override - public Class getOxmClass() { - return Nxm0Class.class; + public OxmClassBase getOxmClass() { + return Nxm0Class.VALUE; } } 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 45a6ae91e1..0d4aa9f2d8 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 @@ -32,7 +32,7 @@ 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.OF_VERSION_1_3, Nxm0Class.class, NxmOfIcmpType.class); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfIcmpType.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); @@ -69,12 +69,12 @@ public class IcmpTypeCodec extends AbstractMatchCodec { } @Override - public Class getNxmField() { - return NxmOfIcmpType.class; + public MatchField getNxmField() { + return NxmOfIcmpType.VALUE; } @Override - public Class getOxmClass() { - return Nxm0Class.class; + public OxmClassBase getOxmClass() { + return Nxm0Class.VALUE; } } 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 e0ddb65951..7782488e4d 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 @@ -28,7 +28,7 @@ public class InPortCodec extends AbstractMatchCodec { private static final int NXM_FIELD_CODE = 0; public static final MatchEntrySerializerKey SERIALIZER_KEY = new MatchEntrySerializerKey<>( - EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfInPort.class); + EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfInPort.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); @@ -67,12 +67,12 @@ public class InPortCodec extends AbstractMatchCodec { } @Override - public Class getNxmField() { - return NxmOfInPort.class; + public MatchField getNxmField() { + return NxmOfInPort.VALUE; } @Override - public Class getOxmClass() { - return Nxm0Class.class; + public OxmClassBase getOxmClass() { + return Nxm0Class.VALUE; } } 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 d5d4c168ef..28ce73fbe9 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 @@ -33,7 +33,7 @@ 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.OF_VERSION_1_3, Nxm0Class.class, NxmOfIpDst.class); + EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfIpDst.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); @@ -69,12 +69,12 @@ public class IpDstCodec extends AbstractMatchCodec { } @Override - public Class getNxmField() { - return NxmOfIpDst.class; + public MatchField getNxmField() { + return NxmOfIpDst.VALUE; } @Override - public Class getOxmClass() { - return Nxm0Class.class; + public OxmClassBase getOxmClass() { + return Nxm0Class.VALUE; } } 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 809a5a41c0..044715b514 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 @@ -33,7 +33,7 @@ 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.OF_VERSION_1_3, Nxm0Class.class, NxmOfIpSrc.class); + EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfIpSrc.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); @@ -70,13 +70,13 @@ public class IpSrcCodec extends AbstractMatchCodec { } @Override - public Class getNxmField() { - return NxmOfIpSrc.class; + public MatchField getNxmField() { + return NxmOfIpSrc.VALUE; } @Override - public Class getOxmClass() { - return Nxm0Class.class; + public OxmClassBase getOxmClass() { + return Nxm0Class.VALUE; } } 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 f8b3591d3c..47756cc851 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 @@ -33,7 +33,7 @@ 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.OF_VERSION_1_3, Nxm1Class.class, NxmOfIpDst.class); + EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmOfIpDst.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); @@ -70,13 +70,13 @@ public class Ipv6DstCodec extends AbstractMatchCodec { } @Override - public Class getNxmField() { - return NxmOfIpDst.class; + public MatchField getNxmField() { + return NxmOfIpDst.VALUE; } @Override - public Class getOxmClass() { - return Nxm1Class.class; + public OxmClassBase getOxmClass() { + return Nxm1Class.VALUE; } } 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 aeeb9194bc..8bbfb87ccf 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 @@ -33,7 +33,7 @@ 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.OF_VERSION_1_3, Nxm1Class.class, NxmOfIpSrc.class); + EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmOfIpSrc.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); @@ -70,13 +70,13 @@ public class Ipv6SrcCodec extends AbstractMatchCodec { } @Override - public Class getNxmField() { - return NxmOfIpSrc.class; + public MatchField getNxmField() { + return NxmOfIpSrc.VALUE; } @Override - public Class getOxmClass() { - return Nxm1Class.class; + public OxmClassBase getOxmClass() { + return Nxm1Class.VALUE; } } 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 566c1c84ff..975d871671 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 @@ -24,7 +24,7 @@ public class MetadataCodec extends AbstractMatchCodec { private static final int NXM_FIELD_CODE = 2; public static final MatchEntrySerializerKey SERIALIZER_KEY = - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfMetadata.class); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfMetadata.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); @@ -56,12 +56,12 @@ public class MetadataCodec extends AbstractMatchCodec { } @Override - public Class getNxmField() { - return NxmOfMetadata.class; + public MatchField getNxmField() { + return NxmOfMetadata.VALUE; } @Override - public Class getOxmClass() { - return Nxm0Class.class; + public OxmClassBase getOxmClass() { + return Nxm0Class.VALUE; } } 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 b503bf7c2d..ed56da7649 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 @@ -28,7 +28,7 @@ public class MplsLabelCodec extends AbstractMatchCodec { private static final int NXM_FIELD_CODE = 34; public static final MatchEntrySerializerKey SERIALIZER_KEY = - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfMplsLabel.class); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfMplsLabel.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); @@ -67,12 +67,12 @@ public class MplsLabelCodec extends AbstractMatchCodec { } @Override - public Class getNxmField() { - return NxmOfMplsLabel.class; + public MatchField getNxmField() { + return NxmOfMplsLabel.VALUE; } @Override - public Class getOxmClass() { - return Nxm0Class.class; + public OxmClassBase getOxmClass() { + return Nxm0Class.VALUE; } } 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 1706be9525..cb9db0bf7d 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 @@ -33,7 +33,7 @@ public class NshFlagsCodec extends AbstractExperimenterMatchCodec { createSerializerKey( EncodeConstants.OF_VERSION_1_3, NiciraConstants.NX_NSH_VENDOR_ID, - NxmNxNshFlags.class); + NxmNxNshFlags.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = createDeserializerKey( EncodeConstants.OF_VERSION_1_3, @@ -46,8 +46,8 @@ public class NshFlagsCodec extends AbstractExperimenterMatchCodec { } @Override - public Class getNxmField() { - return NxmNxNshFlags.class; + public MatchField getNxmField() { + return NxmNxNshFlags.VALUE; } @Override 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 6d584e6310..2c896e010e 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 @@ -32,7 +32,7 @@ public class NshMdtypeCodec extends AbstractExperimenterMatchCodec { createSerializerKey( EncodeConstants.OF_VERSION_1_3, NiciraConstants.NX_NSH_VENDOR_ID, - NxmNxNshMdtype.class); + NxmNxNshMdtype.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = createDeserializerKey( EncodeConstants.OF_VERSION_1_3, @@ -69,8 +69,8 @@ public class NshMdtypeCodec extends AbstractExperimenterMatchCodec { } @Override - public Class getNxmField() { - return NxmNxNshMdtype.class; + public MatchField getNxmField() { + return NxmNxNshMdtype.VALUE; } } 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 c39914a692..8152fcd509 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 @@ -32,7 +32,7 @@ public class NshNpCodec extends AbstractExperimenterMatchCodec { createSerializerKey( EncodeConstants.OF_VERSION_1_3, NiciraConstants.NX_NSH_VENDOR_ID, - NxmNxNshNp.class); + NxmNxNshNp.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = createDeserializerKey( EncodeConstants.OF_VERSION_1_3, @@ -69,7 +69,7 @@ public class NshNpCodec extends AbstractExperimenterMatchCodec { } @Override - public Class getNxmField() { - return NxmNxNshNp.class; + public MatchField getNxmField() { + return NxmNxNshNp.VALUE; } } 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 7d7f37f277..b40a147dbd 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 @@ -28,7 +28,7 @@ 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.OF_VERSION_1_3, NiciraConstants.NX_NSH_VENDOR_ID, NxmNxNshTtl.class); + createSerializerKey(EncodeConstants.OF_VERSION_1_3, NiciraConstants.NX_NSH_VENDOR_ID, NxmNxNshTtl.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = createDeserializerKey(EncodeConstants.OF_VERSION_1_3, NiciraConstants.NX_NSH_VENDOR_ID, NXM_FIELD_CODE); @@ -67,7 +67,7 @@ public class NshTtlCodec extends AbstractExperimenterMatchCodec { } @Override - public Class getNxmField() { - return NxmNxNshTtl.class; + public MatchField getNxmField() { + return NxmNxNshTtl.VALUE; } } 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 05c923ff03..59ed225ca9 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 @@ -22,7 +22,7 @@ public class Nshc1Codec extends AbstractNshcCodec { createSerializerKey( EncodeConstants.OF_VERSION_1_3, NiciraConstants.NX_NSH_VENDOR_ID, - NxmNxNshc1.class); + NxmNxNshc1.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = createDeserializerKey( EncodeConstants.OF_VERSION_1_3, @@ -35,7 +35,7 @@ public class Nshc1Codec extends AbstractNshcCodec { } @Override - public Class getNxmField() { - return NxmNxNshc1.class; + public MatchField getNxmField() { + return NxmNxNshc1.VALUE; } } 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 7f8533b39e..c5911c1603 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 @@ -22,7 +22,7 @@ public class Nshc2Codec extends AbstractNshcCodec { createSerializerKey( EncodeConstants.OF_VERSION_1_3, NiciraConstants.NX_NSH_VENDOR_ID, - NxmNxNshc2.class); + NxmNxNshc2.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = createDeserializerKey( EncodeConstants.OF_VERSION_1_3, @@ -35,7 +35,7 @@ public class Nshc2Codec extends AbstractNshcCodec { } @Override - public Class getNxmField() { - return NxmNxNshc2.class; + public MatchField getNxmField() { + return NxmNxNshc2.VALUE; } } \ No newline at end of file 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 9450157226..a17c38daa9 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 @@ -22,7 +22,7 @@ public class Nshc3Codec extends AbstractNshcCodec { createSerializerKey( EncodeConstants.OF_VERSION_1_3, NiciraConstants.NX_NSH_VENDOR_ID, - NxmNxNshc3.class); + NxmNxNshc3.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = createDeserializerKey( EncodeConstants.OF_VERSION_1_3, @@ -35,7 +35,7 @@ public class Nshc3Codec extends AbstractNshcCodec { } @Override - public Class getNxmField() { - return NxmNxNshc3.class; + public MatchField getNxmField() { + return NxmNxNshc3.VALUE; } } 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 abd26d86e1..03c500c8b2 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 @@ -22,7 +22,7 @@ public class Nshc4Codec extends AbstractNshcCodec { createSerializerKey( EncodeConstants.OF_VERSION_1_3, NiciraConstants.NX_NSH_VENDOR_ID, - NxmNxNshc4.class); + NxmNxNshc4.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = createDeserializerKey( EncodeConstants.OF_VERSION_1_3, @@ -35,7 +35,7 @@ public class Nshc4Codec extends AbstractNshcCodec { } @Override - public Class getNxmField() { - return NxmNxNshc4.class; + public MatchField getNxmField() { + return NxmNxNshc4.VALUE; } } 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 b2eee1a348..0d63884ee2 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 @@ -33,7 +33,7 @@ public class NsiCodec extends AbstractExperimenterMatchCodec { createSerializerKey( EncodeConstants.OF_VERSION_1_3, NiciraConstants.NX_NSH_VENDOR_ID, - NxmNxNsi.class); + NxmNxNsi.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = createDeserializerKey( EncodeConstants.OF_VERSION_1_3, @@ -74,7 +74,7 @@ public class NsiCodec extends AbstractExperimenterMatchCodec { } @Override - public Class getNxmField() { - return NxmNxNsi.class; + public MatchField getNxmField() { + return NxmNxNsi.VALUE; } } 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 ec5ba3bdb9..92c0bfda8c 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 @@ -32,7 +32,7 @@ public class NspCodec extends AbstractExperimenterMatchCodec { createSerializerKey( EncodeConstants.OF_VERSION_1_3, NiciraConstants.NX_NSH_VENDOR_ID, - NxmNxNsp.class); + NxmNxNsp.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = createDeserializerKey( EncodeConstants.OF_VERSION_1_3, @@ -74,7 +74,7 @@ public class NspCodec extends AbstractExperimenterMatchCodec { } @Override - public Class getNxmField() { - return NxmNxNsp.class; + public MatchField getNxmField() { + return NxmNxNsp.VALUE; } } 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 6331618e3d..fd700be6e2 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 @@ -28,7 +28,7 @@ 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.OF_VERSION_1_3, Nxm1Class.class, NxmNxPktMark.class); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxPktMark.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); @@ -65,12 +65,12 @@ public class PktMarkCodec extends AbstractMatchCodec { } @Override - public Class getNxmField() { - return NxmNxPktMark.class; + public MatchField getNxmField() { + return NxmNxPktMark.VALUE; } @Override - public Class getOxmClass() { - return Nxm1Class.class; + public OxmClassBase getOxmClass() { + return Nxm1Class.VALUE; } } 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 c86b3f9c48..36264beebb 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 @@ -19,7 +19,7 @@ public class Reg0Codec extends AbstractRegCodec { private static final int NXM_FIELD_CODE = 0; public static final MatchEntrySerializerKey SERIALIZER_KEY = new MatchEntrySerializerKey<>( - EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg0.class); + EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg0.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); @@ -29,7 +29,7 @@ public class Reg0Codec extends AbstractRegCodec { } @Override - public Class getNxmField() { - return NxmNxReg0.class; + public MatchField getNxmField() { + return NxmNxReg0.VALUE; } } 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 85c963e71d..aa51e32dd8 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 @@ -19,7 +19,7 @@ public class Reg1Codec extends AbstractRegCodec { private static final int NXM_FIELD_CODE = 1; public static final MatchEntrySerializerKey SERIALIZER_KEY = new MatchEntrySerializerKey<>( - EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg1.class); + EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg1.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); @@ -29,7 +29,7 @@ public class Reg1Codec extends AbstractRegCodec { } @Override - public Class getNxmField() { - return NxmNxReg1.class; + public MatchField getNxmField() { + return NxmNxReg1.VALUE; } } 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 5375905715..9fc38004d0 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 @@ -19,7 +19,7 @@ public class Reg2Codec extends AbstractRegCodec { private static final int NXM_FIELD_CODE = 2; public static final MatchEntrySerializerKey SERIALIZER_KEY = new MatchEntrySerializerKey<>( - EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg2.class); + EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg2.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); @@ -29,7 +29,7 @@ public class Reg2Codec extends AbstractRegCodec { } @Override - public Class getNxmField() { - return NxmNxReg2.class; + public MatchField getNxmField() { + return NxmNxReg2.VALUE; } } 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 4ef2e150e0..34ea5ce239 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 @@ -19,7 +19,7 @@ public class Reg3Codec extends AbstractRegCodec { private static final int NXM_FIELD_CODE = 3; public static final MatchEntrySerializerKey SERIALIZER_KEY = new MatchEntrySerializerKey<>( - EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg3.class); + EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg3.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); @@ -29,7 +29,7 @@ public class Reg3Codec extends AbstractRegCodec { } @Override - public Class getNxmField() { - return NxmNxReg3.class; + public MatchField getNxmField() { + return NxmNxReg3.VALUE; } } 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 0972ad591d..836ef0142a 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 @@ -19,7 +19,7 @@ public class Reg4Codec extends AbstractRegCodec { private static final int NXM_FIELD_CODE = 4; public static final MatchEntrySerializerKey SERIALIZER_KEY = new MatchEntrySerializerKey<>( - EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg4.class); + EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg4.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); @@ -29,7 +29,7 @@ public class Reg4Codec extends AbstractRegCodec { } @Override - public Class getNxmField() { - return NxmNxReg4.class; + public MatchField getNxmField() { + return NxmNxReg4.VALUE; } } 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 e388c544e3..0dee68d3f2 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 @@ -19,7 +19,7 @@ public class Reg5Codec extends AbstractRegCodec { private static final int NXM_FIELD_CODE = 5; public static final MatchEntrySerializerKey SERIALIZER_KEY = new MatchEntrySerializerKey<>( - EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg5.class); + EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg5.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); @@ -29,7 +29,7 @@ public class Reg5Codec extends AbstractRegCodec { } @Override - public Class getNxmField() { - return NxmNxReg5.class; + public MatchField getNxmField() { + return NxmNxReg5.VALUE; } } 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 5620211a5a..f314d12021 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 @@ -19,7 +19,7 @@ public class Reg6Codec extends AbstractRegCodec { private static final int NXM_FIELD_CODE = 6; public static final MatchEntrySerializerKey SERIALIZER_KEY = new MatchEntrySerializerKey<>( - EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg6.class); + EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg6.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); @@ -29,8 +29,7 @@ public class Reg6Codec extends AbstractRegCodec { } @Override - public Class getNxmField() { - return NxmNxReg6.class; + public MatchField getNxmField() { + return NxmNxReg6.VALUE; } - } 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 b06e94a311..ad54020bcf 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 @@ -19,7 +19,7 @@ public class Reg7Codec extends AbstractRegCodec { private static final int NXM_FIELD_CODE = 7; public static final MatchEntrySerializerKey SERIALIZER_KEY = new MatchEntrySerializerKey<>( - EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg7.class); + EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg7.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); @@ -29,7 +29,7 @@ public class Reg7Codec extends AbstractRegCodec { } @Override - public Class getNxmField() { - return NxmNxReg7.class; + public MatchField getNxmField() { + return NxmNxReg7.VALUE; } } 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 e8aeed3577..d1b30eab6d 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 @@ -33,7 +33,7 @@ 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.OF_VERSION_1_3, Nxm0Class.class, NxmOfTcpDst.class); + EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfTcpDst.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); @@ -74,12 +74,12 @@ public class TcpDstCodec extends AbstractMatchCodec { } @Override - public Class getNxmField() { - return NxmOfTcpDst.class; + public MatchField getNxmField() { + return NxmOfTcpDst.VALUE; } @Override - public Class getOxmClass() { - return Nxm0Class.class; + public OxmClassBase getOxmClass() { + return Nxm0Class.VALUE; } } 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 bde3b8c63d..8a4dba8fa3 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 @@ -34,7 +34,7 @@ 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.OF_VERSION_1_3, Nxm0Class.class, NxmOfTcpSrc.class); + EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfTcpSrc.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); @@ -75,12 +75,12 @@ public class TcpSrcCodec extends AbstractMatchCodec { } @Override - public Class getNxmField() { - return NxmOfTcpSrc.class; + public MatchField getNxmField() { + return NxmOfTcpSrc.VALUE; } @Override - public Class getOxmClass() { - return Nxm0Class.class; + public OxmClassBase getOxmClass() { + return Nxm0Class.VALUE; } } 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 ac6f9e84d7..c4a1e80d32 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 @@ -27,7 +27,7 @@ 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.OF_VERSION_1_3, Nxm1Class.class, NxmNxTunId.class); + EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxTunId.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); @@ -62,12 +62,12 @@ public class TunIdCodec extends AbstractMatchCodec { } @Override - public Class getNxmField() { - return NxmNxTunId.class; + public MatchField getNxmField() { + return NxmNxTunId.VALUE; } @Override - public Class getOxmClass() { - return Nxm1Class.class; + public OxmClassBase getOxmClass() { + return Nxm1Class.VALUE; } } 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 35452f7c7e..0d797c6e05 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 @@ -28,7 +28,7 @@ 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.OF_VERSION_1_3, Nxm1Class.class, NxmNxTunIpv4Dst.class); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxTunIpv4Dst.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); @@ -64,12 +64,12 @@ public class TunIpv4DstCodec extends AbstractMatchCodec { } @Override - public Class getNxmField() { - return NxmNxTunIpv4Dst.class; + public MatchField getNxmField() { + return NxmNxTunIpv4Dst.VALUE; } @Override - public Class getOxmClass() { - return Nxm1Class.class; + public OxmClassBase getOxmClass() { + return Nxm1Class.VALUE; } } 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 7925b3fc37..9141b01f16 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 @@ -28,7 +28,7 @@ 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.OF_VERSION_1_3, Nxm1Class.class, NxmNxTunIpv4Src.class); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxTunIpv4Src.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE); @@ -64,12 +64,12 @@ public class TunIpv4SrcCodec extends AbstractMatchCodec { } @Override - public Class getNxmField() { - return NxmNxTunIpv4Src.class; + public MatchField getNxmField() { + return NxmNxTunIpv4Src.VALUE; } @Override - public Class getOxmClass() { - return Nxm1Class.class; + public OxmClassBase getOxmClass() { + return Nxm1Class.VALUE; } } 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 9f32dda23f..21fd2d3beb 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 @@ -34,7 +34,7 @@ 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.OF_VERSION_1_3, Nxm0Class.class, NxmOfUdpDst.class); + EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfUdpDst.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); @@ -75,12 +75,12 @@ public class UdpDstCodec extends AbstractMatchCodec { } @Override - public Class getNxmField() { - return NxmOfUdpDst.class; + public MatchField getNxmField() { + return NxmOfUdpDst.VALUE; } @Override - public Class getOxmClass() { - return Nxm0Class.class; + public OxmClassBase getOxmClass() { + return Nxm0Class.VALUE; } } 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 d3e917e7c0..00f2a2f6e9 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 @@ -34,7 +34,7 @@ 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.OF_VERSION_1_3, Nxm0Class.class, NxmOfUdpSrc.class); + EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfUdpSrc.VALUE); public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE); @@ -75,12 +75,12 @@ public class UdpSrcCodec extends AbstractMatchCodec { } @Override - public Class getNxmField() { - return NxmOfUdpSrc.class; + public MatchField getNxmField() { + return NxmOfUdpSrc.VALUE; } @Override - public Class getOxmClass() { - return Nxm0Class.class; + public OxmClassBase getOxmClass() { + return Nxm0Class.VALUE; } } 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 a93b7c80c7..c1e438d305 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 @@ -71,7 +71,7 @@ public class NiciraExtensionCodecRegistratorImplTest { actionSerializerKey = new NiciraActionSerializerKey(VERSION, PopVlanCase.class); //subtype = 10 actionDeserializerKey = new NiciraActionDeserializerKey(VERSION, 10); - matchSerializerKey = new MatchEntrySerializerKey<>(VERSION, Nxm0Class.class, MatchField.class); + matchSerializerKey = new MatchEntrySerializerKey<>(VERSION, Nxm0Class.VALUE, MatchField.VALUE); //OxmClass 1, OxmField 2 matchDeserializerKey = new MatchEntryDeserializerKey(VERSION, 1, 2); 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 e07032242d..632c747d6b 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 @@ -200,176 +200,176 @@ public class NiciraExtensionsRegistratorTest { eq(new NiciraActionSerializerKey(EncodeConstants.OF_VERSION_1_3, ActionDecap.class)), any(DecapCodec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg0.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg0.VALUE)), any(Reg0Codec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 0)), any(Reg0Codec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg1.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg1.VALUE)), any(Reg1Codec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 1)), any(Reg1Codec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg2.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg2.VALUE)), any(Reg2Codec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 2)), any(Reg2Codec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg3.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg3.VALUE)), any(Reg3Codec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 3)), any(Reg3Codec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg4.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg4.VALUE)), any(Reg4Codec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 4)), any(Reg4Codec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg5.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg5.VALUE)), any(Reg5Codec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 5)), any(Reg5Codec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg6.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg6.VALUE)), any(Reg6Codec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 6)), any(Reg6Codec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg7.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg7.VALUE)), any(Reg7Codec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 7)), any(Reg7Codec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxTunId.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxTunId.VALUE)), any(TunIdCodec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 16)), any(TunIdCodec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfArpOp.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfArpOp.VALUE)), any(ArpOpCodec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 15)), any(ArpOpCodec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxArpSha.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxArpSha.VALUE)), any(ArpShaCodec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 17)), any(ArpShaCodec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfArpSpa.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfArpSpa.VALUE)), any(ArpSpaCodec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 16)), any(ArpSpaCodec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxArpTha.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxArpTha.VALUE)), any(ArpThaCodec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 18)), any(ArpThaCodec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfArpTpa.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfArpTpa.VALUE)), any(ArpTpaCodec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 17)), any(ArpTpaCodec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfEthDst.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfEthDst.VALUE)), any(EthDstCodec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 1)), any(EthDstCodec.class)); Mockito.verify(registrator).registerMatchEntrySerializer( - eq(new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfEthSrc.class)), + eq(new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfEthSrc.VALUE)), any(EthSrcCodec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 2)), any(EthSrcCodec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfEthType.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfEthType.VALUE)), any(EthTypeCodec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 3)), any(EthTypeCodec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxTunIpv4Dst.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxTunIpv4Dst.VALUE)), any(TunIpv4DstCodec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 32)), any(TunIpv4DstCodec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxTunIpv4Src.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxTunIpv4Src.VALUE)), any(TunIpv4SrcCodec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 31)), any(TunIpv4SrcCodec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfTcpSrc.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfTcpSrc.VALUE)), any(TcpSrcCodec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 9)), any(TcpSrcCodec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfTcpDst.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfTcpDst.VALUE)), any(TcpDstCodec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 10)), any(TcpDstCodec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfUdpSrc.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfUdpSrc.VALUE)), any(UdpSrcCodec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 11)), any(UdpSrcCodec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfUdpDst.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfUdpDst.VALUE)), any(UdpDstCodec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 12)), any(UdpDstCodec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxCtState.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxCtState.VALUE)), any(CtStateCodec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 105)), any(CtStateCodec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxCtZone.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxCtZone.VALUE)), any(CtZoneCodec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 106)), any(CtZoneCodec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxCtMark.class)), + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxCtMark.VALUE)), any(CtMarkCodec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 107)), any(CtMarkCodec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, - NxmNxCtTpSrc.class)), any(CtTpSrcCodec.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, + NxmNxCtTpSrc.VALUE)), any(CtTpSrcCodec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 124)), any(CtTpSrcCodec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, - NxmNxCtTpDst.class)), any(CtTpDstCodec.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, + NxmNxCtTpDst.VALUE)), any(CtTpDstCodec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 125)), any(CtTpDstCodec.class)); Mockito.verify(registrator).registerMatchEntrySerializer(eq( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, - NxmNxPktMark.class)), any(PktMarkCodec.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, + NxmNxPktMark.VALUE)), any(PktMarkCodec.class)); Mockito.verify(registrator).registerMatchEntryDeserializer(eq( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 33)), any(PktMarkCodec.class)); @@ -383,8 +383,8 @@ public class NiciraExtensionsRegistratorTest { // experimenters MatchEntrySerializerKey nshFlagsSerializerKey = new MatchEntrySerializerKey<>( EncodeConstants.OF_VERSION_1_3, - ExperimenterClass.class, - NxmNxNshFlags.class); + ExperimenterClass.VALUE, + NxmNxNshFlags.VALUE); nshFlagsSerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); Mockito.verify(registrator).registerMatchEntrySerializer( eq(nshFlagsSerializerKey), @@ -399,8 +399,8 @@ public class NiciraExtensionsRegistratorTest { any(NshFlagsCodec.class)); MatchEntrySerializerKey mdtypeSerializerKey = new MatchEntrySerializerKey<>( EncodeConstants.OF_VERSION_1_3, - ExperimenterClass.class, - NxmNxNshMdtype.class); + ExperimenterClass.VALUE, + NxmNxNshMdtype.VALUE); mdtypeSerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); Mockito.verify(registrator).registerMatchEntrySerializer( eq(mdtypeSerializerKey), @@ -415,8 +415,8 @@ public class NiciraExtensionsRegistratorTest { any(NshMdtypeCodec.class)); MatchEntrySerializerKey nshNpSerializerKey = new MatchEntrySerializerKey<>( EncodeConstants.OF_VERSION_1_3, - ExperimenterClass.class, - NxmNxNshNp.class); + ExperimenterClass.VALUE, + NxmNxNshNp.VALUE); nshNpSerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); Mockito.verify(registrator).registerMatchEntrySerializer( eq(nshNpSerializerKey), @@ -431,8 +431,8 @@ public class NiciraExtensionsRegistratorTest { any(NshNpCodec.class)); MatchEntrySerializerKey nspSerializerKey = new MatchEntrySerializerKey<>( EncodeConstants.OF_VERSION_1_3, - ExperimenterClass.class, - NxmNxNsp.class); + ExperimenterClass.VALUE, + NxmNxNsp.VALUE); nspSerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); Mockito.verify(registrator).registerMatchEntrySerializer( eq(nspSerializerKey), @@ -447,8 +447,8 @@ public class NiciraExtensionsRegistratorTest { any(NspCodec.class)); MatchEntrySerializerKey nsiSerializerKey = new MatchEntrySerializerKey<>( EncodeConstants.OF_VERSION_1_3, - ExperimenterClass.class, - NxmNxNsi.class); + ExperimenterClass.VALUE, + NxmNxNsi.VALUE); nsiSerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); Mockito.verify(registrator).registerMatchEntrySerializer( eq(nsiSerializerKey), @@ -463,8 +463,8 @@ public class NiciraExtensionsRegistratorTest { any(NsiCodec.class)); MatchEntrySerializerKey nshc1SerializerKey = new MatchEntrySerializerKey<>( EncodeConstants.OF_VERSION_1_3, - ExperimenterClass.class, - NxmNxNshc1.class); + ExperimenterClass.VALUE, + NxmNxNshc1.VALUE); nshc1SerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); Mockito.verify(registrator).registerMatchEntrySerializer( eq(nshc1SerializerKey), @@ -479,8 +479,8 @@ public class NiciraExtensionsRegistratorTest { any(Nshc1Codec.class)); MatchEntrySerializerKey nshc2SerializerKey = new MatchEntrySerializerKey<>( EncodeConstants.OF_VERSION_1_3, - ExperimenterClass.class, - NxmNxNshc2.class); + ExperimenterClass.VALUE, + NxmNxNshc2.VALUE); nshc2SerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); Mockito.verify(registrator).registerMatchEntrySerializer( eq(nshc2SerializerKey), @@ -495,8 +495,8 @@ public class NiciraExtensionsRegistratorTest { any(Nshc2Codec.class)); MatchEntrySerializerKey nshc3SerializerKey = new MatchEntrySerializerKey<>( EncodeConstants.OF_VERSION_1_3, - ExperimenterClass.class, - NxmNxNshc3.class); + ExperimenterClass.VALUE, + NxmNxNshc3.VALUE); nshc3SerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); Mockito.verify(registrator).registerMatchEntrySerializer( eq(nshc3SerializerKey), @@ -511,8 +511,8 @@ public class NiciraExtensionsRegistratorTest { any(Nshc3Codec.class)); MatchEntrySerializerKey nshc4SerializerKey = new MatchEntrySerializerKey<>( EncodeConstants.OF_VERSION_1_3, - ExperimenterClass.class, - NxmNxNshc4.class); + ExperimenterClass.VALUE, + NxmNxNshc4.VALUE); nshc4SerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); Mockito.verify(registrator).registerMatchEntrySerializer( eq(nshc4SerializerKey), @@ -527,8 +527,8 @@ public class NiciraExtensionsRegistratorTest { any(Nshc4Codec.class)); MatchEntrySerializerKey nshTtlSerializerKey = new MatchEntrySerializerKey<>( EncodeConstants.OF_VERSION_1_3, - ExperimenterClass.class, - NxmNxNshTtl.class); + ExperimenterClass.VALUE, + NxmNxNshTtl.VALUE); nshTtlSerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); Mockito.verify(registrator).registerMatchEntrySerializer( eq(nshTtlSerializerKey), @@ -592,127 +592,127 @@ public class NiciraExtensionsRegistratorTest { Mockito.verify(registrator).unregisterActionSerializer( new NiciraActionSerializerKey(EncodeConstants.OF_VERSION_1_3, ActionDecNshTtl.class)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg0.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg0.VALUE)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 0)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg1.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg1.VALUE)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 1)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg2.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg2.VALUE)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 2)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg3.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg3.VALUE)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 3)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg4.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg4.VALUE)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 4)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg5.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg5.VALUE)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 5)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg6.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg6.VALUE)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 6)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg7.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg7.VALUE)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 7)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxTunId.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxTunId.VALUE)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 16)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfArpOp.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfArpOp.VALUE)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 15)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxArpSha.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxArpSha.VALUE)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 17)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfArpSpa.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfArpSpa.VALUE)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 16)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxArpTha.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxArpTha.VALUE)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 18)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfArpTpa.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfArpTpa.VALUE)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 17)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfEthDst.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfEthDst.VALUE)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 1)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfEthSrc.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfEthSrc.VALUE)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 2)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfEthType.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfEthType.VALUE)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 3)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxTunIpv4Dst.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxTunIpv4Dst.VALUE)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 32)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxTunIpv4Src.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxTunIpv4Src.VALUE)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 31)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfTcpSrc.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfTcpSrc.VALUE)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 9)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfTcpDst.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfTcpDst.VALUE)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 10)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfUdpSrc.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfUdpSrc.VALUE)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 11)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfUdpDst.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfUdpDst.VALUE)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 12)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxCtState.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxCtState.VALUE)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 105)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxCtZone.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxCtZone.VALUE)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 106)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxCtMark.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxCtMark.VALUE)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 107)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxCtTpSrc.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxCtTpSrc.VALUE)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 124)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxCtTpDst.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxCtTpDst.VALUE)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 125)); Mockito.verify(registrator).unregisterMatchEntrySerializer( - new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxPktMark.class)); + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxPktMark.VALUE)); Mockito.verify(registrator).unregisterMatchEntryDeserializer( new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 33)); // experimenters MatchEntrySerializerKey nshFlagsSerializerKey = new MatchEntrySerializerKey<>( EncodeConstants.OF_VERSION_1_3, - ExperimenterClass.class, - NxmNxNshFlags.class); + ExperimenterClass.VALUE, + NxmNxNshFlags.VALUE); nshFlagsSerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); Mockito.verify(registrator).unregisterMatchEntrySerializer(nshFlagsSerializerKey); MatchEntryDeserializerKey nshFlagsDeserializerKey = new MatchEntryDeserializerKey( @@ -723,8 +723,8 @@ public class NiciraExtensionsRegistratorTest { Mockito.verify(registrator).unregisterMatchEntryDeserializer(nshFlagsDeserializerKey); MatchEntrySerializerKey mdtypeSerializerKey = new MatchEntrySerializerKey<>( EncodeConstants.OF_VERSION_1_3, - ExperimenterClass.class, - NxmNxNshMdtype.class); + ExperimenterClass.VALUE, + NxmNxNshMdtype.VALUE); mdtypeSerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); Mockito.verify(registrator).unregisterMatchEntrySerializer(mdtypeSerializerKey); MatchEntryDeserializerKey mdtypeDeserializerKey = new MatchEntryDeserializerKey( @@ -735,8 +735,8 @@ public class NiciraExtensionsRegistratorTest { Mockito.verify(registrator).unregisterMatchEntryDeserializer(mdtypeDeserializerKey); MatchEntrySerializerKey nshNpSerializerKey = new MatchEntrySerializerKey<>( EncodeConstants.OF_VERSION_1_3, - ExperimenterClass.class, - NxmNxNshNp.class); + ExperimenterClass.VALUE, + NxmNxNshNp.VALUE); nshNpSerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); Mockito.verify(registrator).unregisterMatchEntrySerializer(nshNpSerializerKey); MatchEntryDeserializerKey nshNpDeserializerKey = new MatchEntryDeserializerKey( @@ -747,8 +747,8 @@ public class NiciraExtensionsRegistratorTest { Mockito.verify(registrator).unregisterMatchEntryDeserializer(nshNpDeserializerKey); MatchEntrySerializerKey nspSerializerKey = new MatchEntrySerializerKey<>( EncodeConstants.OF_VERSION_1_3, - ExperimenterClass.class, - NxmNxNsp.class); + ExperimenterClass.VALUE, + NxmNxNsp.VALUE); nspSerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); Mockito.verify(registrator).unregisterMatchEntrySerializer(nspSerializerKey); MatchEntryDeserializerKey nspDeserializerKey = new MatchEntryDeserializerKey( @@ -759,8 +759,8 @@ public class NiciraExtensionsRegistratorTest { Mockito.verify(registrator).unregisterMatchEntryDeserializer(nspDeserializerKey); MatchEntrySerializerKey nsiSerializerKey = new MatchEntrySerializerKey<>( EncodeConstants.OF_VERSION_1_3, - ExperimenterClass.class, - NxmNxNsi.class); + ExperimenterClass.VALUE, + NxmNxNsi.VALUE); nsiSerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); Mockito.verify(registrator).unregisterMatchEntrySerializer(nsiSerializerKey); MatchEntryDeserializerKey nsiDeserializerKey = new MatchEntryDeserializerKey( @@ -771,8 +771,8 @@ public class NiciraExtensionsRegistratorTest { Mockito.verify(registrator).unregisterMatchEntryDeserializer(nsiDeserializerKey); MatchEntrySerializerKey nshc1SerializerKey = new MatchEntrySerializerKey<>( EncodeConstants.OF_VERSION_1_3, - ExperimenterClass.class, - NxmNxNshc1.class); + ExperimenterClass.VALUE, + NxmNxNshc1.VALUE); nshc1SerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); Mockito.verify(registrator).unregisterMatchEntrySerializer(nshc1SerializerKey); MatchEntryDeserializerKey nshc1DeserializerKey = new MatchEntryDeserializerKey( @@ -783,8 +783,8 @@ public class NiciraExtensionsRegistratorTest { Mockito.verify(registrator).unregisterMatchEntryDeserializer(nshc1DeserializerKey); MatchEntrySerializerKey nshc2SerializerKey = new MatchEntrySerializerKey<>( EncodeConstants.OF_VERSION_1_3, - ExperimenterClass.class, - NxmNxNshc2.class); + ExperimenterClass.VALUE, + NxmNxNshc2.VALUE); nshc2SerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); Mockito.verify(registrator).unregisterMatchEntrySerializer(nshc2SerializerKey); MatchEntryDeserializerKey nshc2DeserializerKey = new MatchEntryDeserializerKey( @@ -795,8 +795,8 @@ public class NiciraExtensionsRegistratorTest { Mockito.verify(registrator).unregisterMatchEntryDeserializer(nshc2DeserializerKey); MatchEntrySerializerKey nshc3SerializerKey = new MatchEntrySerializerKey<>( EncodeConstants.OF_VERSION_1_3, - ExperimenterClass.class, - NxmNxNshc3.class); + ExperimenterClass.VALUE, + NxmNxNshc3.VALUE); nshc3SerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); Mockito.verify(registrator).unregisterMatchEntrySerializer(nshc3SerializerKey); MatchEntryDeserializerKey nshc3DeserializerKey = new MatchEntryDeserializerKey( @@ -807,8 +807,8 @@ public class NiciraExtensionsRegistratorTest { Mockito.verify(registrator).unregisterMatchEntryDeserializer(nshc3DeserializerKey); MatchEntrySerializerKey nshc4SerializerKey = new MatchEntrySerializerKey<>( EncodeConstants.OF_VERSION_1_3, - ExperimenterClass.class, - NxmNxNshc4.class); + ExperimenterClass.VALUE, + NxmNxNshc4.VALUE); nshc4SerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); Mockito.verify(registrator).unregisterMatchEntrySerializer(nshc1SerializerKey); MatchEntryDeserializerKey nshc4DeserializerKey = new MatchEntryDeserializerKey( @@ -819,8 +819,8 @@ public class NiciraExtensionsRegistratorTest { Mockito.verify(registrator).unregisterMatchEntryDeserializer(nshc4DeserializerKey); MatchEntrySerializerKey nshTtlSerializerKey = new MatchEntrySerializerKey<>( EncodeConstants.OF_VERSION_1_3, - ExperimenterClass.class, - NxmNxNshTtl.class); + ExperimenterClass.VALUE, + NxmNxNshTtl.VALUE); nshTtlSerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); Mockito.verify(registrator).unregisterMatchEntrySerializer(nshTtlSerializerKey); MatchEntryDeserializerKey nshTtlDeserializerKey = new MatchEntryDeserializerKey( 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 873380cee9..6a5fc1b7af 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 @@ -17,7 +17,7 @@ import org.junit.Test; import org.opendaylight.openflowjava.nx.api.NiciraConstants; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; 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.IpAddressBuilder; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; 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.common.action.rev150203.actions.grouping.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder; @@ -180,8 +180,8 @@ public class ConntrackCodecTest { NxActionNatBuilder nxActionNatBuilder = new NxActionNatBuilder(); nxActionNatBuilder.setFlags(Uint16.valueOf(5)); nxActionNatBuilder.setRangePresent(Uint16.valueOf(0x3F)); - nxActionNatBuilder.setIpAddressMin(IpAddressBuilder.getDefaultInstance("192.168.0.0")); - nxActionNatBuilder.setIpAddressMax(IpAddressBuilder.getDefaultInstance("192.168.10.0")); + nxActionNatBuilder.setIpAddressMin(new IpAddress(new Ipv4Address("192.168.0.0"))); + nxActionNatBuilder.setIpAddressMax(new IpAddress(new Ipv4Address("192.168.10.0"))); nxActionNatBuilder.setPortMin(Uint16.valueOf(3000)); nxActionNatBuilder.setPortMax(Uint16.valueOf(4000)); NxActionNatCaseBuilder nxActionNatCaseBuilder = new NxActionNatCaseBuilder(); @@ -193,7 +193,7 @@ public class ConntrackCodecTest { nxActionNatBuilder = new NxActionNatBuilder(); nxActionNatBuilder.setFlags(Uint16.valueOf(5)); nxActionNatBuilder.setRangePresent(Uint16.valueOf(0x21)); - nxActionNatBuilder.setIpAddressMin(IpAddressBuilder.getDefaultInstance("192.168.0.0")); + nxActionNatBuilder.setIpAddressMin(new IpAddress(new Ipv4Address("192.168.0.0"))); nxActionNatBuilder.setPortMax(Uint16.valueOf(4000)); nxActionNatCaseBuilder = new NxActionNatCaseBuilder(); nxActionNatCaseBuilder.setNxActionNat(nxActionNatBuilder.build()); 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 ae57b6176c..5ea649ec18 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 @@ -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; @@ -16,7 +15,7 @@ import static org.mockito.Mockito.when; import io.netty.buffer.ByteBuf; import io.netty.buffer.UnpooledByteBufAllocator; -import java.util.Collections; +import java.util.List; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -97,8 +96,8 @@ public class RegLoad2CodecTest { final Action action = createAction(); MatchEntrySerializerKey key = new MatchEntrySerializerKey<>( EncodeConstants.OF_VERSION_1_3, - ExperimenterClass.class, - OxmMatchFieldClass.class); + ExperimenterClass.VALUE, + OxmMatchFieldClass.VALUE); key.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID); when(serializerRegistry.getSerializer(key)).thenReturn(ofSerializer); doNothing().when(ofSerializer).serialize(any(), any()); @@ -117,11 +116,11 @@ public class RegLoad2CodecTest { ExperimenterIdCaseBuilder expCaseBuilder = new ExperimenterIdCaseBuilder(); expCaseBuilder.setExperimenter(experimenterBuilder.build()); MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder(); - matchEntryBuilder.setOxmMatchField(OxmMatchFieldClass.class); - matchEntryBuilder.setOxmClass(ExperimenterClass.class); + matchEntryBuilder.setOxmMatchField(OxmMatchFieldClass.VALUE); + matchEntryBuilder.setOxmClass(ExperimenterClass.VALUE); matchEntryBuilder.setMatchEntryValue(expCaseBuilder.build()); NxActionRegLoad2 nxActionRegLoad2 = new NxActionRegLoad2Builder() - .setMatchEntry(Collections.singletonList(matchEntryBuilder.build())) + .setMatchEntry(List.of(matchEntryBuilder.build())) .build(); ActionRegLoad2 actionRegLoad2 = new ActionRegLoad2Builder().setNxActionRegLoad2(nxActionRegLoad2).build(); return new ActionBuilder().setActionChoice(actionRegLoad2).build(); 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 13442c27d0..a2e0a8a65d 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 @@ -40,11 +40,16 @@ public class AbstractExperimenterMatchCodecTest { private ByteBuf buffer; private TestCodec testCodec; - private class TestNxmField implements MatchField { + private static class TestNxmField implements MatchField { // test class + + @Override + public Class implementedInterface() { + return TestNxmField.class; + } } - private class TestCodec extends AbstractExperimenterMatchCodec { + private static class TestCodec extends AbstractExperimenterMatchCodec { @Override protected void serializeValue(final NxExpMatchEntryValue value, final boolean hasMask, @@ -73,8 +78,8 @@ public class AbstractExperimenterMatchCodecTest { } @Override - public Class getNxmField() { - return TestNxmField.class; + public MatchField getNxmField() { + return TestNxmField.VALUE; } } @@ -118,8 +123,8 @@ public class AbstractExperimenterMatchCodecTest { MatchEntry matchEntry = testCodec.deserialize(buffer); - assertEquals(ExperimenterClass.class, matchEntry.getOxmClass()); - assertEquals(TestNxmField.class, matchEntry.getOxmMatchField()); + assertEquals(ExperimenterClass.VALUE, matchEntry.getOxmClass()); + assertEquals(TestNxmField.VALUE, matchEntry.getOxmMatchField()); assertEquals(false, matchEntry.getHasMask()); Experimenter experimenter = ((ExperimenterIdCase) matchEntry.getMatchEntryValue()).getExperimenter(); assertEquals(EXPERIMENTER_ID, experimenter.getExperimenter().getValue()); @@ -133,8 +138,8 @@ public class AbstractExperimenterMatchCodecTest { MatchEntry matchEntry = testCodec.deserialize(buffer); - assertEquals(ExperimenterClass.class, matchEntry.getOxmClass()); - assertEquals(TestNxmField.class, matchEntry.getOxmMatchField()); + assertEquals(ExperimenterClass.VALUE, matchEntry.getOxmClass()); + assertEquals(TestNxmField.VALUE, matchEntry.getOxmMatchField()); assertEquals(true, matchEntry.getHasMask()); Experimenter experimenter = ((ExperimenterIdCase) matchEntry.getMatchEntryValue()).getExperimenter(); assertEquals(EXPERIMENTER_ID, experimenter.getExperimenter().getValue()); @@ -144,8 +149,8 @@ public class AbstractExperimenterMatchCodecTest { static MatchEntry createMatchEntry(final NxExpMatchEntryValue value, final boolean hasMask) { return new MatchEntryBuilder() - .setOxmClass(ExperimenterClass.class) - .setOxmMatchField(TestNxmField.class) + .setOxmClass(ExperimenterClass.VALUE) + .setOxmMatchField(TestNxmField.VALUE) .setHasMask(hasMask) .setMatchEntryValue(new ExperimenterIdCaseBuilder() .setExperimenter(new ExperimenterBuilder() 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 56b5a6c7b3..47b76792ab 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 @@ -30,7 +30,7 @@ public class AbstractNshcCodecTest { } @Override - public Class getNxmField() { + public MatchField getNxmField() { return null; } } 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 a12f2ae141..d7fddc7608 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 @@ -60,8 +60,8 @@ public class ArpOpCodecTest { final ArpOpCaseValue result = (ArpOpCaseValue) input.getMatchEntryValue(); - assertEquals(Nxm0Class.class, input.getOxmClass()); - assertEquals(NxmOfArpOp.class, input.getOxmMatchField()); + assertEquals(Nxm0Class.VALUE, input.getOxmClass()); + assertEquals(NxmOfArpOp.VALUE, input.getOxmMatchField()); assertEquals(false, input.getHasMask()); assertEquals(2, result.getArpOpValues().getValue().shortValue()); } @@ -71,8 +71,8 @@ public class ArpOpCodecTest { final ArpOpCaseValueBuilder caseBuilder = new ArpOpCaseValueBuilder(); final ArpOpValuesBuilder valuesBuilder = new ArpOpValuesBuilder(); - matchEntryBuilder.setOxmClass(Nxm0Class.class); - matchEntryBuilder.setOxmMatchField(NxmOfArpOp.class); + matchEntryBuilder.setOxmClass(Nxm0Class.VALUE); + matchEntryBuilder.setOxmMatchField(NxmOfArpOp.VALUE); matchEntryBuilder.setHasMask(false); valuesBuilder.setValue(Uint16.ONE); 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 2df0c3e1d5..da50e47e86 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 @@ -64,8 +64,8 @@ public class ArpShaCodecTest { final ArpShaCaseValue result = (ArpShaCaseValue) input.getMatchEntryValue(); - assertEquals(Nxm1Class.class, input.getOxmClass()); - assertEquals(NxmNxArpSha.class, input.getOxmMatchField()); + assertEquals(Nxm1Class.VALUE, input.getOxmClass()); + assertEquals(NxmNxArpSha.VALUE, input.getOxmMatchField()); assertEquals(false, input.getHasMask()); assertEquals(RESULT_ADDRESS, result.getArpShaValues().getMacAddress()); } @@ -76,8 +76,8 @@ public class ArpShaCodecTest { final ArpShaCaseValueBuilder caseBuilder = new ArpShaCaseValueBuilder(); final ArpShaValuesBuilder valuesBuilder = new ArpShaValuesBuilder(); - matchEntryBuilder.setOxmClass(Nxm1Class.class); - matchEntryBuilder.setOxmMatchField(NxmNxArpSha.class); + matchEntryBuilder.setOxmClass(Nxm1Class.VALUE); + matchEntryBuilder.setOxmMatchField(NxmNxArpSha.VALUE); matchEntryBuilder.setHasMask(false); 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 7edbb1fa11..5531434381 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 @@ -51,8 +51,8 @@ public class ArpSpaCodecTest { final ArpSpaCaseValue result = (ArpSpaCaseValue) input.getMatchEntryValue(); - assertEquals(Nxm0Class.class, input.getOxmClass()); - assertEquals(NxmOfArpSpa.class, input.getOxmMatchField()); + assertEquals(Nxm0Class.VALUE, input.getOxmClass()); + assertEquals(NxmOfArpSpa.VALUE, input.getOxmMatchField()); assertEquals(false, input.getHasMask()); assertEquals(2, result.getArpSpaValues().getValue().shortValue()); } @@ -62,8 +62,8 @@ public class ArpSpaCodecTest { final ArpSpaCaseValueBuilder caseBuilder = new ArpSpaCaseValueBuilder(); final ArpSpaValuesBuilder valuesBuilder = new ArpSpaValuesBuilder(); - matchEntryBuilder.setOxmClass(Nxm0Class.class); - matchEntryBuilder.setOxmMatchField(NxmOfArpSpa.class); + matchEntryBuilder.setOxmClass(Nxm0Class.VALUE); + matchEntryBuilder.setOxmMatchField(NxmOfArpSpa.VALUE); matchEntryBuilder.setHasMask(false); valuesBuilder.setValue(Uint32.ONE); 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 4081007afb..7373492834 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 @@ -63,8 +63,8 @@ public class ArpThaCodecTest { final ArpThaCaseValue result = (ArpThaCaseValue) input.getMatchEntryValue(); - assertEquals(Nxm1Class.class, input.getOxmClass()); - assertEquals(NxmNxArpTha.class, input.getOxmMatchField()); + assertEquals(Nxm1Class.VALUE, input.getOxmClass()); + assertEquals(NxmNxArpTha.VALUE, input.getOxmMatchField()); assertEquals(false, input.getHasMask()); assertEquals(TEST_ADDRESS, result.getArpThaValues().getMacAddress()); } @@ -74,8 +74,8 @@ public class ArpThaCodecTest { final ArpThaCaseValueBuilder caseBuilder = new ArpThaCaseValueBuilder(); final ArpThaValuesBuilder valuesBuilder = new ArpThaValuesBuilder(); - matchEntryBuilder.setOxmClass(Nxm1Class.class); - matchEntryBuilder.setOxmMatchField(NxmNxArpTha.class); + matchEntryBuilder.setOxmClass(Nxm1Class.VALUE); + matchEntryBuilder.setOxmMatchField(NxmNxArpTha.VALUE); matchEntryBuilder.setHasMask(false); valuesBuilder.setMacAddress(IetfYangUtil.INSTANCE.macAddressFor(new byte[VALUE_LENGTH])); 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 bf9e05fec5..d18b4a0caf 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 @@ -51,8 +51,8 @@ public class ArpTpaCodecTest { final ArpTpaCaseValue result = (ArpTpaCaseValue) input.getMatchEntryValue(); - assertEquals(Nxm0Class.class, input.getOxmClass()); - assertEquals(NxmOfArpTpa.class, input.getOxmMatchField()); + assertEquals(Nxm0Class.VALUE, input.getOxmClass()); + assertEquals(NxmOfArpTpa.VALUE, input.getOxmMatchField()); assertEquals(false, input.getHasMask()); assertEquals(2, result.getArpTpaValues().getValue().intValue()); } @@ -62,8 +62,8 @@ public class ArpTpaCodecTest { final ArpTpaCaseValueBuilder caseBuilder = new ArpTpaCaseValueBuilder(); final ArpTpaValuesBuilder valuesBuilder = new ArpTpaValuesBuilder(); - matchEntryBuilder.setOxmClass(Nxm0Class.class); - matchEntryBuilder.setOxmMatchField(NxmOfArpTpa.class); + matchEntryBuilder.setOxmClass(Nxm0Class.VALUE); + matchEntryBuilder.setOxmMatchField(NxmOfArpTpa.VALUE); matchEntryBuilder.setHasMask(false); valuesBuilder.setValue(Uint32.ONE); 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 21fdc4127f..d22122c717 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 @@ -52,8 +52,8 @@ public class CtStateCodecTest { final CtStateCaseValue result = (CtStateCaseValue) input.getMatchEntryValue(); - assertEquals(Nxm1Class.class, input.getOxmClass()); - assertEquals(NxmNxCtState.class, input.getOxmMatchField()); + assertEquals(Nxm1Class.VALUE, input.getOxmClass()); + assertEquals(NxmNxCtState.VALUE, input.getOxmMatchField()); assertEquals(true, input.getHasMask()); assertEquals(1, result.getCtStateValues().getCtState().intValue()); assertEquals(2, result.getCtStateValues().getMask().intValue()); @@ -64,8 +64,8 @@ public class CtStateCodecTest { final CtStateCaseValueBuilder caseBuilder = new CtStateCaseValueBuilder(); final CtStateValuesBuilder valuesBuilder = new CtStateValuesBuilder(); - matchEntryBuilder.setOxmClass(Nxm1Class.class); - matchEntryBuilder.setOxmMatchField(NxmNxCtState.class); + matchEntryBuilder.setOxmClass(Nxm1Class.VALUE); + matchEntryBuilder.setOxmMatchField(NxmNxCtState.VALUE); matchEntryBuilder.setHasMask(true); valuesBuilder.setCtState(Uint32.ONE); 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 574ba3f74d..d187fb01ed 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 @@ -51,8 +51,8 @@ public class CtTpDstCodecTest { final CtTpDstCaseValue result = (CtTpDstCaseValue) input.getMatchEntryValue(); - assertEquals(Nxm1Class.class, input.getOxmClass()); - assertEquals(NxmNxCtTpDst.class, input.getOxmMatchField()); + assertEquals(Nxm1Class.VALUE, input.getOxmClass()); + assertEquals(NxmNxCtTpDst.VALUE, input.getOxmMatchField()); assertEquals(false, input.getHasMask()); assertEquals(2, result.getCtTpDstValues().getCtTpDst().shortValue()); } @@ -62,8 +62,8 @@ public class CtTpDstCodecTest { final CtTpDstCaseValueBuilder caseBuilder = new CtTpDstCaseValueBuilder(); final CtTpDstValuesBuilder valuesBuilder = new CtTpDstValuesBuilder(); - matchEntryBuilder.setOxmClass(Nxm1Class.class); - matchEntryBuilder.setOxmMatchField(NxmNxCtTpDst.class); + matchEntryBuilder.setOxmClass(Nxm1Class.VALUE); + matchEntryBuilder.setOxmMatchField(NxmNxCtTpDst.VALUE); matchEntryBuilder.setHasMask(false); valuesBuilder.setCtTpDst(Uint16.ONE); 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 3cb307904b..4f0228fa33 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 @@ -57,8 +57,8 @@ public class CtTpSrcCodecTest { final CtTpSrcCaseValue result = (CtTpSrcCaseValue) input.getMatchEntryValue(); - assertEquals(Nxm1Class.class, input.getOxmClass()); - assertEquals(NxmNxCtTpSrc.class, input.getOxmMatchField()); + assertEquals(Nxm1Class.VALUE, input.getOxmClass()); + assertEquals(NxmNxCtTpSrc.VALUE, input.getOxmMatchField()); assertEquals(false, input.getHasMask()); assertEquals(2, result.getCtTpSrcValues().getCtTpSrc().shortValue()); } @@ -68,8 +68,8 @@ public class CtTpSrcCodecTest { final CtTpSrcCaseValueBuilder caseBuilder = new CtTpSrcCaseValueBuilder(); final CtTpSrcValuesBuilder valuesBuilder = new CtTpSrcValuesBuilder(); - matchEntryBuilder.setOxmClass(Nxm1Class.class); - matchEntryBuilder.setOxmMatchField(NxmNxCtTpSrc.class); + matchEntryBuilder.setOxmClass(Nxm1Class.VALUE); + matchEntryBuilder.setOxmMatchField(NxmNxCtTpSrc.VALUE); matchEntryBuilder.setHasMask(false); valuesBuilder.setCtTpSrc(Uint16.ONE); 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 e9328ae618..f18ef9a99c 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 @@ -51,8 +51,8 @@ public class CtZoneCodecTest { final CtZoneCaseValue result = (CtZoneCaseValue) input.getMatchEntryValue(); - assertEquals(Nxm1Class.class, input.getOxmClass()); - assertEquals(NxmNxCtZone.class, input.getOxmMatchField()); + assertEquals(Nxm1Class.VALUE, input.getOxmClass()); + assertEquals(NxmNxCtZone.VALUE, input.getOxmMatchField()); assertEquals(false, input.getHasMask()); assertEquals(2, result.getCtZoneValues().getCtZone().shortValue()); } @@ -62,8 +62,8 @@ public class CtZoneCodecTest { final CtZoneCaseValueBuilder caseBuilder = new CtZoneCaseValueBuilder(); final CtZoneValuesBuilder valuesBuilder = new CtZoneValuesBuilder(); - matchEntryBuilder.setOxmClass(Nxm1Class.class); - matchEntryBuilder.setOxmMatchField(NxmNxCtZone.class); + matchEntryBuilder.setOxmClass(Nxm1Class.VALUE); + matchEntryBuilder.setOxmMatchField(NxmNxCtZone.VALUE); matchEntryBuilder.setHasMask(false); valuesBuilder.setCtZone(Uint16.ONE); 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 04a06aa15a..049c9c62fe 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 @@ -57,8 +57,8 @@ public class EthDstCodecTest { final EthDstCaseValue result = (EthDstCaseValue) input.getMatchEntryValue(); - assertEquals(Nxm0Class.class, input.getOxmClass()); - assertEquals(NxmOfEthDst.class, input.getOxmMatchField()); + assertEquals(Nxm0Class.VALUE, input.getOxmClass()); + assertEquals(NxmOfEthDst.VALUE, input.getOxmMatchField()); assertEquals(false, input.getHasMask()); assertEquals(TEST_ADDRESS, result.getEthDstValues().getMacAddress()); } @@ -68,8 +68,8 @@ public class EthDstCodecTest { final EthDstCaseValueBuilder caseBuilder = new EthDstCaseValueBuilder(); final EthDstValuesBuilder valuesBuilder = new EthDstValuesBuilder(); - matchEntryBuilder.setOxmClass(Nxm0Class.class); - matchEntryBuilder.setOxmMatchField(NxmOfEthDst.class); + matchEntryBuilder.setOxmClass(Nxm0Class.VALUE); + matchEntryBuilder.setOxmMatchField(NxmOfEthDst.VALUE); matchEntryBuilder.setHasMask(false); valuesBuilder.setMacAddress(IetfYangUtil.INSTANCE.macAddressFor(new byte[VALUE_LENGTH])); 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 52de35f74f..550659fef2 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 @@ -58,8 +58,8 @@ public class EthSrcCodecTest { final EthSrcCaseValue result = (EthSrcCaseValue) input.getMatchEntryValue(); - assertEquals(Nxm0Class.class, input.getOxmClass()); - assertEquals(NxmOfEthSrc.class, input.getOxmMatchField()); + assertEquals(Nxm0Class.VALUE, input.getOxmClass()); + assertEquals(NxmOfEthSrc.VALUE, input.getOxmMatchField()); assertEquals(false, input.getHasMask()); assertEquals(TEST_ADDRESS, result.getEthSrcValues().getMacAddress()); } @@ -69,8 +69,8 @@ public class EthSrcCodecTest { final EthSrcCaseValueBuilder caseBuilder = new EthSrcCaseValueBuilder(); final EthSrcValuesBuilder valuesBuilder = new EthSrcValuesBuilder(); - matchEntryBuilder.setOxmClass(Nxm0Class.class); - matchEntryBuilder.setOxmMatchField(NxmOfEthDst.class); + matchEntryBuilder.setOxmClass(Nxm0Class.VALUE); + matchEntryBuilder.setOxmMatchField(NxmOfEthDst.VALUE); matchEntryBuilder.setHasMask(false); 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 83a85ec055..4962d013ee 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 @@ -52,8 +52,8 @@ public class EthTypeCodecTest { final EthTypeCaseValue result = (EthTypeCaseValue) input.getMatchEntryValue(); - assertEquals(Nxm0Class.class, input.getOxmClass()); - assertEquals(NxmOfEthType.class, input.getOxmMatchField()); + assertEquals(Nxm0Class.VALUE, input.getOxmClass()); + assertEquals(NxmOfEthType.VALUE, input.getOxmMatchField()); assertEquals(false, input.getHasMask()); assertEquals(2, result.getEthTypeValues().getValue().shortValue()); } @@ -63,8 +63,8 @@ public class EthTypeCodecTest { final EthTypeCaseValueBuilder caseBuilder = new EthTypeCaseValueBuilder(); final EthTypeValuesBuilder valuesBuilder = new EthTypeValuesBuilder(); - matchEntryBuilder.setOxmClass(Nxm0Class.class); - matchEntryBuilder.setOxmMatchField(NxmOfEthType.class); + matchEntryBuilder.setOxmClass(Nxm0Class.VALUE); + matchEntryBuilder.setOxmMatchField(NxmOfEthType.VALUE); matchEntryBuilder.setHasMask(false); valuesBuilder.setValue(Uint16.ONE); 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 610dd5d7bf..9e22860f15 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 @@ -52,8 +52,8 @@ public class IcmpTypeCodecTest { final IcmpTypeCaseValue result = (IcmpTypeCaseValue) input.getMatchEntryValue(); - assertEquals(Nxm0Class.class, input.getOxmClass()); - assertEquals(NxmOfIcmpType.class, input.getOxmMatchField()); + assertEquals(Nxm0Class.VALUE, input.getOxmClass()); + assertEquals(NxmOfIcmpType.VALUE, input.getOxmMatchField()); assertEquals(false, input.getHasMask()); assertEquals(2, result.getIcmpTypeValues().getValue().shortValue()); } @@ -63,8 +63,8 @@ public class IcmpTypeCodecTest { final IcmpTypeCaseValueBuilder caseBuilder = new IcmpTypeCaseValueBuilder(); final IcmpTypeValuesBuilder valuesBuilder = new IcmpTypeValuesBuilder(); - matchEntryBuilder.setOxmClass(Nxm0Class.class); - matchEntryBuilder.setOxmMatchField(NxmOfIcmpType.class); + matchEntryBuilder.setOxmClass(Nxm0Class.VALUE); + matchEntryBuilder.setOxmMatchField(NxmOfIcmpType.VALUE); matchEntryBuilder.setHasMask(false); valuesBuilder.setValue(Uint8.ONE); 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 1e9c46550f..2d1474de83 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 @@ -52,8 +52,8 @@ public class IpDstCodecTest { final IpDstCaseValue result = (IpDstCaseValue) input.getMatchEntryValue(); - assertEquals(Nxm0Class.class, input.getOxmClass()); - assertEquals(NxmOfIpDst.class, input.getOxmMatchField()); + assertEquals(Nxm0Class.VALUE, input.getOxmClass()); + assertEquals(NxmOfIpDst.VALUE, input.getOxmMatchField()); assertEquals(false, input.getHasMask()); assertEquals(2, result.getIpDstValues().getValue().intValue()); } @@ -63,8 +63,8 @@ public class IpDstCodecTest { final IpDstCaseValueBuilder caseBuilder = new IpDstCaseValueBuilder(); final IpDstValuesBuilder valuesBuilder = new IpDstValuesBuilder(); - matchEntryBuilder.setOxmClass(Nxm0Class.class); - matchEntryBuilder.setOxmMatchField(NxmOfIpDst.class); + matchEntryBuilder.setOxmClass(Nxm0Class.VALUE); + matchEntryBuilder.setOxmMatchField(NxmOfIpDst.VALUE); matchEntryBuilder.setHasMask(false); valuesBuilder.setValue(Uint32.ONE); 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 d2805bd52f..68ff500c40 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 @@ -52,8 +52,8 @@ public class IpSrcCodecTest { final IpSrcCaseValue result = (IpSrcCaseValue) input.getMatchEntryValue(); - assertEquals(Nxm0Class.class, input.getOxmClass()); - assertEquals(NxmOfIpSrc.class, input.getOxmMatchField()); + assertEquals(Nxm0Class.VALUE, input.getOxmClass()); + assertEquals(NxmOfIpSrc.VALUE, input.getOxmMatchField()); assertEquals(false, input.getHasMask()); assertEquals(2, result.getIpSrcValues().getValue().intValue()); } @@ -63,8 +63,8 @@ public class IpSrcCodecTest { final IpSrcCaseValueBuilder caseBuilder = new IpSrcCaseValueBuilder(); final IpSrcValuesBuilder valuesBuilder = new IpSrcValuesBuilder(); - matchEntryBuilder.setOxmClass(Nxm0Class.class); - matchEntryBuilder.setOxmMatchField(NxmOfIpSrc.class); + matchEntryBuilder.setOxmClass(Nxm0Class.VALUE); + matchEntryBuilder.setOxmMatchField(NxmOfIpSrc.VALUE); matchEntryBuilder.setHasMask(false); valuesBuilder.setValue(Uint32.ONE); 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 757eb4921f..a0e71f219b 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 @@ -52,8 +52,8 @@ public class Ipv6DstCodecTest { final IpDstCaseValue result = (IpDstCaseValue) input.getMatchEntryValue(); - assertEquals(Nxm1Class.class, input.getOxmClass()); - assertEquals(NxmOfIpDst.class, input.getOxmMatchField()); + assertEquals(Nxm1Class.VALUE, input.getOxmClass()); + assertEquals(NxmOfIpDst.VALUE, input.getOxmMatchField()); assertEquals(false, input.getHasMask()); assertEquals(2, result.getIpDstValues().getValue().intValue()); } @@ -63,8 +63,8 @@ public class Ipv6DstCodecTest { final IpDstCaseValueBuilder caseBuilder = new IpDstCaseValueBuilder(); final IpDstValuesBuilder valuesBuilder = new IpDstValuesBuilder(); - matchEntryBuilder.setOxmClass(Nxm1Class.class); - matchEntryBuilder.setOxmMatchField(NxmOfIpDst.class); + matchEntryBuilder.setOxmClass(Nxm1Class.VALUE); + matchEntryBuilder.setOxmMatchField(NxmOfIpDst.VALUE); matchEntryBuilder.setHasMask(false); valuesBuilder.setValue(Uint32.ONE); 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 d11b4b2df4..5349d4f84b 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 @@ -52,8 +52,8 @@ public class Ipv6SrcCodecTest { final IpSrcCaseValue result = (IpSrcCaseValue) input.getMatchEntryValue(); - assertEquals(Nxm1Class.class, input.getOxmClass()); - assertEquals(NxmOfIpSrc.class, input.getOxmMatchField()); + assertEquals(Nxm1Class.VALUE, input.getOxmClass()); + assertEquals(NxmOfIpSrc.VALUE, input.getOxmMatchField()); assertEquals(false, input.getHasMask()); assertEquals(2, result.getIpSrcValues().getValue().intValue()); } @@ -63,8 +63,8 @@ public class Ipv6SrcCodecTest { final IpSrcCaseValueBuilder caseBuilder = new IpSrcCaseValueBuilder(); final IpSrcValuesBuilder valuesBuilder = new IpSrcValuesBuilder(); - matchEntryBuilder.setOxmClass(Nxm1Class.class); - matchEntryBuilder.setOxmMatchField(NxmOfIpSrc.class); + matchEntryBuilder.setOxmClass(Nxm1Class.VALUE); + matchEntryBuilder.setOxmMatchField(NxmOfIpSrc.VALUE); matchEntryBuilder.setHasMask(false); valuesBuilder.setValue(Uint32.ONE); 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 7090842423..099ab87844 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 @@ -45,15 +45,15 @@ public class MetadataCodecTest { public void deserializeTest() { createBuffer(buffer); input = metadataCodec.deserialize(buffer); - assertEquals(Nxm0Class.class, input.getOxmClass()); - assertEquals(NxmOfMetadata.class, input.getOxmMatchField()); + assertEquals(Nxm0Class.VALUE, input.getOxmClass()); + assertEquals(NxmOfMetadata.VALUE, input.getOxmMatchField()); assertEquals(false, input.getHasMask()); } private static MatchEntry createMatchEntry() { MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder(); - matchEntryBuilder.setOxmClass(Nxm0Class.class); - matchEntryBuilder.setOxmMatchField(NxmOfMetadata.class); + matchEntryBuilder.setOxmClass(Nxm0Class.VALUE); + matchEntryBuilder.setOxmMatchField(NxmOfMetadata.VALUE); matchEntryBuilder.setHasMask(false); OfMetadataCaseValueBuilder caseBuilder = new OfMetadataCaseValueBuilder(); 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 b213283516..4e54518b49 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 @@ -50,8 +50,8 @@ public class PktMarkCodecTest { final PktMarkCaseValue result = (PktMarkCaseValue) input.getMatchEntryValue(); - assertEquals(Nxm1Class.class, input.getOxmClass()); - assertEquals(NxmNxPktMark.class, input.getOxmMatchField()); + assertEquals(Nxm1Class.VALUE, input.getOxmClass()); + assertEquals(NxmNxPktMark.VALUE, input.getOxmMatchField()); assertEquals(false, input.getHasMask()); assertEquals(2, result.getPktMarkValues().getPktMark().intValue()); } @@ -61,8 +61,8 @@ public class PktMarkCodecTest { final PktMarkCaseValueBuilder caseBuilder = new PktMarkCaseValueBuilder(); final PktMarkValuesBuilder valuesBuilder = new PktMarkValuesBuilder(); - matchEntryBuilder.setOxmClass(Nxm1Class.class); - matchEntryBuilder.setOxmMatchField(NxmNxPktMark.class); + matchEntryBuilder.setOxmClass(Nxm1Class.VALUE); + matchEntryBuilder.setOxmMatchField(NxmNxPktMark.VALUE); matchEntryBuilder.setHasMask(false); valuesBuilder.setPktMark(Uint32.ONE); 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 e69eb1528e..da4725369f 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 @@ -52,8 +52,8 @@ public class Reg0CodecTest { final RegCaseValue result = (RegCaseValue) input.getMatchEntryValue(); - assertEquals(Nxm1Class.class, input.getOxmClass()); - assertEquals(NxmNxReg0.class, input.getOxmMatchField()); + assertEquals(Nxm1Class.VALUE, input.getOxmClass()); + assertEquals(NxmNxReg0.VALUE, input.getOxmMatchField()); assertEquals(false, input.getHasMask()); assertEquals(1, result.getRegValues().getValue().intValue()); } @@ -63,8 +63,8 @@ public class Reg0CodecTest { final RegCaseValueBuilder caseBuilder = new RegCaseValueBuilder(); final RegValuesBuilder valuesBuilder = new RegValuesBuilder(); - matchEntryBuilder.setOxmClass(Nxm1Class.class); - matchEntryBuilder.setOxmMatchField(NxmNxReg0.class); + matchEntryBuilder.setOxmClass(Nxm1Class.VALUE); + matchEntryBuilder.setOxmMatchField(NxmNxReg0.VALUE); matchEntryBuilder.setHasMask(false); valuesBuilder.setValue(Uint32.ONE); 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 6e077dfeac..2627ea6234 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 @@ -52,8 +52,8 @@ public class Reg1CodecTest { final RegCaseValue result = (RegCaseValue) input.getMatchEntryValue(); - assertEquals(Nxm1Class.class, input.getOxmClass()); - assertEquals(NxmNxReg1.class, input.getOxmMatchField()); + assertEquals(Nxm1Class.VALUE, input.getOxmClass()); + assertEquals(NxmNxReg1.VALUE, input.getOxmMatchField()); assertEquals(false, input.getHasMask()); assertEquals(1, result.getRegValues().getValue().intValue()); } @@ -63,8 +63,8 @@ public class Reg1CodecTest { final RegCaseValueBuilder caseBuilder = new RegCaseValueBuilder(); final RegValuesBuilder valuesBuilder = new RegValuesBuilder(); - matchEntryBuilder.setOxmClass(Nxm1Class.class); - matchEntryBuilder.setOxmMatchField(NxmNxReg1.class); + matchEntryBuilder.setOxmClass(Nxm1Class.VALUE); + matchEntryBuilder.setOxmMatchField(NxmNxReg1.VALUE); matchEntryBuilder.setHasMask(false); valuesBuilder.setValue(Uint32.ONE); 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 2b1bb576f3..3c4986bbb0 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 @@ -52,8 +52,8 @@ public class Reg2CodecTest { final RegCaseValue result = (RegCaseValue) input.getMatchEntryValue(); - assertEquals(Nxm1Class.class, input.getOxmClass()); - assertEquals(NxmNxReg2.class, input.getOxmMatchField()); + assertEquals(Nxm1Class.VALUE, input.getOxmClass()); + assertEquals(NxmNxReg2.VALUE, input.getOxmMatchField()); assertEquals(false, input.getHasMask()); assertEquals(1, result.getRegValues().getValue().intValue()); } @@ -63,8 +63,8 @@ public class Reg2CodecTest { final RegCaseValueBuilder caseBuilder = new RegCaseValueBuilder(); final RegValuesBuilder valuesBuilder = new RegValuesBuilder(); - matchEntryBuilder.setOxmClass(Nxm1Class.class); - matchEntryBuilder.setOxmMatchField(NxmNxReg2.class); + matchEntryBuilder.setOxmClass(Nxm1Class.VALUE); + matchEntryBuilder.setOxmMatchField(NxmNxReg2.VALUE); matchEntryBuilder.setHasMask(false); valuesBuilder.setValue(Uint32.ONE); 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 f7d29809c8..0356fac895 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 @@ -52,8 +52,8 @@ public class Reg3CodecTest { final RegCaseValue result = (RegCaseValue) input.getMatchEntryValue(); - assertEquals(Nxm1Class.class, input.getOxmClass()); - assertEquals(NxmNxReg3.class, input.getOxmMatchField()); + assertEquals(Nxm1Class.VALUE, input.getOxmClass()); + assertEquals(NxmNxReg3.VALUE, input.getOxmMatchField()); assertEquals(false, input.getHasMask()); assertEquals(1, result.getRegValues().getValue().intValue()); } @@ -63,8 +63,8 @@ public class Reg3CodecTest { final RegCaseValueBuilder caseBuilder = new RegCaseValueBuilder(); final RegValuesBuilder valuesBuilder = new RegValuesBuilder(); - matchEntryBuilder.setOxmClass(Nxm1Class.class); - matchEntryBuilder.setOxmMatchField(NxmNxReg3.class); + matchEntryBuilder.setOxmClass(Nxm1Class.VALUE); + matchEntryBuilder.setOxmMatchField(NxmNxReg3.VALUE); matchEntryBuilder.setHasMask(false); valuesBuilder.setValue(Uint32.ONE); 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 1b1c2e42e7..e7d9af2a75 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 @@ -52,8 +52,8 @@ public class Reg4CodecTest { final RegCaseValue result = (RegCaseValue) input.getMatchEntryValue(); - assertEquals(Nxm1Class.class, input.getOxmClass()); - assertEquals(NxmNxReg4.class, input.getOxmMatchField()); + assertEquals(Nxm1Class.VALUE, input.getOxmClass()); + assertEquals(NxmNxReg4.VALUE, input.getOxmMatchField()); assertEquals(false, input.getHasMask()); assertEquals(1, result.getRegValues().getValue().intValue()); } @@ -63,8 +63,8 @@ public class Reg4CodecTest { final RegCaseValueBuilder caseBuilder = new RegCaseValueBuilder(); final RegValuesBuilder valuesBuilder = new RegValuesBuilder(); - matchEntryBuilder.setOxmClass(Nxm1Class.class); - matchEntryBuilder.setOxmMatchField(NxmNxReg4.class); + matchEntryBuilder.setOxmClass(Nxm1Class.VALUE); + matchEntryBuilder.setOxmMatchField(NxmNxReg4.VALUE); matchEntryBuilder.setHasMask(false); valuesBuilder.setValue(Uint32.ONE); 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 7711bdda52..13a3f5f05a 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 @@ -52,8 +52,8 @@ public class Reg5CodecTest { final RegCaseValue result = (RegCaseValue) input.getMatchEntryValue(); - assertEquals(Nxm1Class.class, input.getOxmClass()); - assertEquals(NxmNxReg5.class, input.getOxmMatchField()); + assertEquals(Nxm1Class.VALUE, input.getOxmClass()); + assertEquals(NxmNxReg5.VALUE, input.getOxmMatchField()); assertEquals(false, input.getHasMask()); assertEquals(1, result.getRegValues().getValue().intValue()); } @@ -63,8 +63,8 @@ public class Reg5CodecTest { final RegCaseValueBuilder caseBuilder = new RegCaseValueBuilder(); final RegValuesBuilder valuesBuilder = new RegValuesBuilder(); - matchEntryBuilder.setOxmClass(Nxm1Class.class); - matchEntryBuilder.setOxmMatchField(NxmNxReg5.class); + matchEntryBuilder.setOxmClass(Nxm1Class.VALUE); + matchEntryBuilder.setOxmMatchField(NxmNxReg5.VALUE); matchEntryBuilder.setHasMask(false); valuesBuilder.setValue(Uint32.ONE); 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 651613b7eb..780c96daf1 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 @@ -52,8 +52,8 @@ public class Reg6CodecTest { final RegCaseValue result = (RegCaseValue) input.getMatchEntryValue(); - assertEquals(Nxm1Class.class, input.getOxmClass()); - assertEquals(NxmNxReg6.class, input.getOxmMatchField()); + assertEquals(Nxm1Class.VALUE, input.getOxmClass()); + assertEquals(NxmNxReg6.VALUE, input.getOxmMatchField()); assertEquals(false, input.getHasMask()); assertEquals(1, result.getRegValues().getValue().intValue()); } @@ -63,8 +63,8 @@ public class Reg6CodecTest { final RegCaseValueBuilder caseBuilder = new RegCaseValueBuilder(); final RegValuesBuilder valuesBuilder = new RegValuesBuilder(); - matchEntryBuilder.setOxmClass(Nxm1Class.class); - matchEntryBuilder.setOxmMatchField(NxmNxReg6.class); + matchEntryBuilder.setOxmClass(Nxm1Class.VALUE); + matchEntryBuilder.setOxmMatchField(NxmNxReg6.VALUE); matchEntryBuilder.setHasMask(false); valuesBuilder.setValue(Uint32.ONE); 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 174b3e1e76..62a92d98d0 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 @@ -52,8 +52,8 @@ public class Reg7CodecTest { final RegCaseValue result = (RegCaseValue) input.getMatchEntryValue(); - assertEquals(Nxm1Class.class, input.getOxmClass()); - assertEquals(NxmNxReg7.class, input.getOxmMatchField()); + assertEquals(Nxm1Class.VALUE, input.getOxmClass()); + assertEquals(NxmNxReg7.VALUE, input.getOxmMatchField()); assertEquals(false, input.getHasMask()); assertEquals(1, result.getRegValues().getValue().intValue()); } @@ -63,8 +63,8 @@ public class Reg7CodecTest { final RegCaseValueBuilder caseBuilder = new RegCaseValueBuilder(); final RegValuesBuilder valuesBuilder = new RegValuesBuilder(); - matchEntryBuilder.setOxmClass(Nxm1Class.class); - matchEntryBuilder.setOxmMatchField(NxmNxReg7.class); + matchEntryBuilder.setOxmClass(Nxm1Class.VALUE); + matchEntryBuilder.setOxmMatchField(NxmNxReg7.VALUE); matchEntryBuilder.setHasMask(false); valuesBuilder.setValue(Uint32.ONE); 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 6b0d753ab4..3ad15cb742 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 @@ -54,8 +54,8 @@ public class TcpDstCodecTest { final TcpDstCaseValue result = (TcpDstCaseValue) input.getMatchEntryValue(); - assertEquals(Nxm0Class.class, input.getOxmClass()); - assertEquals(NxmOfTcpDst.class, input.getOxmMatchField()); + assertEquals(Nxm0Class.VALUE, input.getOxmClass()); + assertEquals(NxmOfTcpDst.VALUE, input.getOxmMatchField()); assertEquals(true, input.getHasMask()); assertEquals(1, result.getTcpDstValues().getPort().getValue().shortValue()); assertEquals(0xffff, result.getTcpDstValues().getMask().shortValue() & 0xffff); @@ -66,8 +66,8 @@ public class TcpDstCodecTest { final TcpDstCaseValueBuilder caseBuilder = new TcpDstCaseValueBuilder(); final TcpDstValuesBuilder valuesBuilder = new TcpDstValuesBuilder(); - matchEntryBuilder.setOxmClass(Nxm0Class.class); - matchEntryBuilder.setOxmMatchField(NxmOfTcpDst.class); + matchEntryBuilder.setOxmClass(Nxm0Class.VALUE); + matchEntryBuilder.setOxmMatchField(NxmOfTcpDst.VALUE); matchEntryBuilder.setHasMask(true); valuesBuilder.setPort(new PortNumber(Uint16.ONE)); 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 1c74f0efa2..0a4e6f9234 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 @@ -54,8 +54,8 @@ public class TcpSrcCodecTest { final TcpSrcCaseValue result = (TcpSrcCaseValue) input.getMatchEntryValue(); - assertEquals(Nxm0Class.class, input.getOxmClass()); - assertEquals(NxmOfTcpSrc.class, input.getOxmMatchField()); + assertEquals(Nxm0Class.VALUE, input.getOxmClass()); + assertEquals(NxmOfTcpSrc.VALUE, input.getOxmMatchField()); assertEquals(true, input.getHasMask()); assertEquals(1, result.getTcpSrcValues().getPort().getValue().shortValue()); assertEquals(0xffff, result.getTcpSrcValues().getMask().shortValue() & 0xffff); @@ -66,8 +66,8 @@ public class TcpSrcCodecTest { final TcpSrcCaseValueBuilder caseBuilder = new TcpSrcCaseValueBuilder(); final TcpSrcValuesBuilder valuesBuilder = new TcpSrcValuesBuilder(); - matchEntryBuilder.setOxmClass(Nxm0Class.class); - matchEntryBuilder.setOxmMatchField(NxmOfTcpSrc.class); + matchEntryBuilder.setOxmClass(Nxm0Class.VALUE); + matchEntryBuilder.setOxmMatchField(NxmOfTcpSrc.VALUE); matchEntryBuilder.setHasMask(true); valuesBuilder.setPort(new PortNumber(Uint16.ONE)); 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 7479e54b94..973096dabe 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 @@ -53,8 +53,8 @@ public class TunIdCodecTest { final TunIdCaseValue result = (TunIdCaseValue) input.getMatchEntryValue(); - assertEquals(Nxm1Class.class, input.getOxmClass()); - assertEquals(NxmNxTunId.class, input.getOxmMatchField()); + assertEquals(Nxm1Class.VALUE, input.getOxmClass()); + assertEquals(NxmNxTunId.VALUE, input.getOxmMatchField()); assertEquals(false, input.getHasMask()); assertEquals(0, result.getTunIdValues().getValue().longValue()); } @@ -64,8 +64,8 @@ public class TunIdCodecTest { final TunIdCaseValueBuilder caseBuilder = new TunIdCaseValueBuilder(); final TunIdValuesBuilder valuesBuilder = new TunIdValuesBuilder(); - matchEntryBuilder.setOxmClass(Nxm1Class.class); - matchEntryBuilder.setOxmMatchField(NxmNxTunId.class); + matchEntryBuilder.setOxmClass(Nxm1Class.VALUE); + matchEntryBuilder.setOxmMatchField(NxmNxTunId.VALUE); matchEntryBuilder.setHasMask(false); valuesBuilder.setValue(Uint64.ZERO); 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 69c36e6eda..e1fd4c425b 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 @@ -52,8 +52,8 @@ public class TunIpv4DstCodecTest { final TunIpv4DstCaseValue result = (TunIpv4DstCaseValue) input.getMatchEntryValue(); - assertEquals(Nxm1Class.class, input.getOxmClass()); - assertEquals(NxmNxTunIpv4Dst.class, input.getOxmMatchField()); + assertEquals(Nxm1Class.VALUE, input.getOxmClass()); + assertEquals(NxmNxTunIpv4Dst.VALUE, input.getOxmMatchField()); assertEquals(false, input.getHasMask()); assertEquals(1, result.getTunIpv4DstValues().getValue().intValue()); } @@ -63,8 +63,8 @@ public class TunIpv4DstCodecTest { final TunIpv4DstCaseValueBuilder caseBuilder = new TunIpv4DstCaseValueBuilder(); final TunIpv4DstValuesBuilder valuesBuilder = new TunIpv4DstValuesBuilder(); - matchEntryBuilder.setOxmClass(Nxm1Class.class); - matchEntryBuilder.setOxmMatchField(NxmNxTunIpv4Dst.class); + matchEntryBuilder.setOxmClass(Nxm1Class.VALUE); + matchEntryBuilder.setOxmMatchField(NxmNxTunIpv4Dst.VALUE); matchEntryBuilder.setHasMask(false); valuesBuilder.setValue(Uint32.ONE); 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 c4494af62e..b39818238c 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 @@ -52,8 +52,8 @@ public class TunIpv4SrcCodecTest { final TunIpv4SrcCaseValue result = (TunIpv4SrcCaseValue) input.getMatchEntryValue(); - assertEquals(Nxm1Class.class, input.getOxmClass()); - assertEquals(NxmNxTunIpv4Src.class, input.getOxmMatchField()); + assertEquals(Nxm1Class.VALUE, input.getOxmClass()); + assertEquals(NxmNxTunIpv4Src.VALUE, input.getOxmMatchField()); assertEquals(false, input.getHasMask()); assertEquals(1, result.getTunIpv4SrcValues().getValue().intValue()); } @@ -63,8 +63,8 @@ public class TunIpv4SrcCodecTest { final TunIpv4SrcCaseValueBuilder caseBuilder = new TunIpv4SrcCaseValueBuilder(); final TunIpv4SrcValuesBuilder valuesBuilder = new TunIpv4SrcValuesBuilder(); - matchEntryBuilder.setOxmClass(Nxm1Class.class); - matchEntryBuilder.setOxmMatchField(NxmNxTunIpv4Src.class); + matchEntryBuilder.setOxmClass(Nxm1Class.VALUE); + matchEntryBuilder.setOxmMatchField(NxmNxTunIpv4Src.VALUE); matchEntryBuilder.setHasMask(false); valuesBuilder.setValue(Uint32.ONE); 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 5b8ec214b6..da2673ba81 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 @@ -54,8 +54,8 @@ public class UdpDstCodecTest { final UdpDstCaseValue result = (UdpDstCaseValue) input.getMatchEntryValue(); - assertEquals(Nxm0Class.class, input.getOxmClass()); - assertEquals(NxmOfUdpDst.class, input.getOxmMatchField()); + assertEquals(Nxm0Class.VALUE, input.getOxmClass()); + assertEquals(NxmOfUdpDst.VALUE, input.getOxmMatchField()); assertEquals(true, input.getHasMask()); assertEquals(1, result.getUdpDstValues().getPort().getValue().shortValue()); assertEquals(0xffff, result.getUdpDstValues().getMask().shortValue() & 0xffff); @@ -66,8 +66,8 @@ public class UdpDstCodecTest { final UdpDstCaseValueBuilder caseBuilder = new UdpDstCaseValueBuilder(); final UdpDstValuesBuilder valuesBuilder = new UdpDstValuesBuilder(); - matchEntryBuilder.setOxmClass(Nxm0Class.class); - matchEntryBuilder.setOxmMatchField(NxmOfUdpDst.class); + matchEntryBuilder.setOxmClass(Nxm0Class.VALUE); + matchEntryBuilder.setOxmMatchField(NxmOfUdpDst.VALUE); matchEntryBuilder.setHasMask(true); valuesBuilder.setPort(new PortNumber(Uint16.ONE)); 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 73af6a670b..0f955d4289 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 @@ -54,8 +54,8 @@ public class UdpSrcCodecTest { final UdpSrcCaseValue result = (UdpSrcCaseValue) input.getMatchEntryValue(); - assertEquals(Nxm0Class.class, input.getOxmClass()); - assertEquals(NxmOfUdpSrc.class, input.getOxmMatchField()); + assertEquals(Nxm0Class.VALUE, input.getOxmClass()); + assertEquals(NxmOfUdpSrc.VALUE, input.getOxmMatchField()); assertEquals(true, input.getHasMask()); assertEquals(1, result.getUdpSrcValues().getPort().getValue().shortValue()); assertEquals(0xffff, result.getUdpSrcValues().getMask().shortValue() & 0xffff); @@ -66,8 +66,8 @@ public class UdpSrcCodecTest { final UdpSrcCaseValueBuilder caseBuilder = new UdpSrcCaseValueBuilder(); final UdpSrcValuesBuilder valuesBuilder = new UdpSrcValuesBuilder(); - matchEntryBuilder.setOxmClass(Nxm0Class.class); - matchEntryBuilder.setOxmMatchField(NxmOfUdpSrc.class); + matchEntryBuilder.setOxmClass(Nxm0Class.VALUE); + matchEntryBuilder.setOxmMatchField(NxmOfUdpSrc.VALUE); matchEntryBuilder.setHasMask(true); valuesBuilder.setPort(new PortNumber(Uint16.ONE)); diff --git a/extension/openflowplugin-extension-api/src/main/java/org/opendaylight/openflowplugin/extension/api/AugmentationGroupingResolver.java b/extension/openflowplugin-extension-api/src/main/java/org/opendaylight/openflowplugin/extension/api/AugmentationGroupingResolver.java index 4bc991eee4..26fbfed8e0 100644 --- a/extension/openflowplugin-extension-api/src/main/java/org/opendaylight/openflowplugin/extension/api/AugmentationGroupingResolver.java +++ b/extension/openflowplugin-extension-api/src/main/java/org/opendaylight/openflowplugin/extension/api/AugmentationGroupingResolver.java @@ -123,8 +123,7 @@ public final class AugmentationGroupingResolver((Class>[]) array); } - public static final class Builder> - implements org.opendaylight.yangtools.concepts.Builder> { + public static final class Builder> { private final Set>> augmentations = new HashSet<>(); private final Class grouping; @@ -139,7 +138,6 @@ public final class AugmentationGroupingResolver build() { return new AugmentationGroupingResolver<>(grouping, 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 33cc8b2398..6c1b61ddca 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 @@ -17,7 +17,8 @@ import org.opendaylight.yangtools.yang.common.Uint8; * @param type of key */ public class ConverterExtensionKey extends TypeVersionKey { - public ConverterExtensionKey(final Class type, final Uint8 ofVersion) { - super(type, ofVersion); + @SuppressWarnings("unchecked") + public ConverterExtensionKey(final T type, final Uint8 ofVersion) { + super((Class) type.implementedInterface(), ofVersion); } } diff --git a/extension/openflowplugin-extension-api/src/main/java/org/opendaylight/openflowplugin/extension/api/ExtensionAugment.java b/extension/openflowplugin-extension-api/src/main/java/org/opendaylight/openflowplugin/extension/api/ExtensionAugment.java index 1b6a92636f..e62b9f7e48 100644 --- a/extension/openflowplugin-extension-api/src/main/java/org/opendaylight/openflowplugin/extension/api/ExtensionAugment.java +++ b/extension/openflowplugin-extension-api/src/main/java/org/opendaylight/openflowplugin/extension/api/ExtensionAugment.java @@ -18,10 +18,9 @@ import org.opendaylight.yangtools.yang.binding.Augmentation; * @param type of wrapped augmentation */ public class ExtensionAugment> extends AugmentTuple { + private final ExtensionKey key; - private final Class key; - - public ExtensionAugment(Class augmentationClass, T augmentationObject, Class key) { + public ExtensionAugment(final Class augmentationClass, final T augmentationObject, final ExtensionKey key) { super(augmentationClass, augmentationObject); this.key = key; } @@ -30,7 +29,7 @@ public class ExtensionAugment> extends Augment * Returns the key which represents an extension type. * @return key */ - public Class getKey() { + public ExtensionKey getKey() { return key; } } diff --git a/extension/openflowplugin-extension-api/src/test/java/org/opendaylight/openflowplugin/extension/api/GroupingLooseResolverTest.java b/extension/openflowplugin-extension-api/src/test/java/org/opendaylight/openflowplugin/extension/api/GroupingLooseResolverTest.java index 62b31f0dfb..1228d63eed 100644 --- a/extension/openflowplugin-extension-api/src/test/java/org/opendaylight/openflowplugin/extension/api/GroupingLooseResolverTest.java +++ b/extension/openflowplugin-extension-api/src/test/java/org/opendaylight/openflowplugin/extension/api/GroupingLooseResolverTest.java @@ -33,7 +33,7 @@ public class GroupingLooseResolverTest { eqGroup.add(GeneralAugMatchNodesNodeTableFlow.class); eqGroup.add(GeneralAugMatchNotifPacketIn.class); - ExtensionList extension1 = new ExtensionListBuilder().setExtensionKey(JoachimTheBig.class).build(); + ExtensionList extension1 = new ExtensionListBuilder().setExtensionKey(JoachimTheBig.VALUE).build(); Match match1 = new MatchBuilder() .addAugmentation(new GeneralAugMatchNodesNodeTableFlowBuilder() .setExtensionList(Collections.singletonMap(extension1.key(), extension1)) @@ -43,23 +43,22 @@ public class GroupingLooseResolverTest { org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.packet.received.MatchBuilder mb2 = new org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service .rev130709.packet.received.MatchBuilder(); - ExtensionList extension2 = new ExtensionListBuilder().setExtensionKey(JoachimTheTiny.class).build(); + ExtensionList extension2 = new ExtensionListBuilder().setExtensionKey(JoachimTheTiny.VALUE).build(); org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.packet.received.Match match2 = mb2.addAugmentation(new GeneralAugMatchNotifPacketInBuilder() .setExtensionList(Collections.singletonMap(extension2.key(), extension2)).build()).build(); - Assert.assertEquals(JoachimTheBig.class, + Assert.assertEquals(JoachimTheBig.VALUE, eqGroup.getExtension(match1).get().nonnullExtensionList().values().iterator().next().getExtensionKey()); - Assert.assertEquals(JoachimTheTiny.class, + Assert.assertEquals(JoachimTheTiny.VALUE, eqGroup.getExtension(match2).get().nonnullExtensionList().values().iterator().next().getExtensionKey()); } private interface JoachimTheBig extends ExtensionKey { - // nobody + JoachimTheBig VALUE = () -> JoachimTheBig.class; } private interface JoachimTheTiny extends ExtensionKey { - // nobody + JoachimTheTiny VALUE = () -> JoachimTheTiny.class; } - } diff --git a/extension/openflowplugin-extension-api/src/test/java/org/opendaylight/openflowplugin/extension/api/GroupingResolverTest.java b/extension/openflowplugin-extension-api/src/test/java/org/opendaylight/openflowplugin/extension/api/GroupingResolverTest.java index 868593eae5..bdee555be4 100644 --- a/extension/openflowplugin-extension-api/src/test/java/org/opendaylight/openflowplugin/extension/api/GroupingResolverTest.java +++ b/extension/openflowplugin-extension-api/src/test/java/org/opendaylight/openflowplugin/extension/api/GroupingResolverTest.java @@ -36,23 +36,23 @@ public class GroupingResolverTest { eqGroup.add(GeneralAugMatchNodesNodeTableFlow.class); eqGroup.add(GeneralAugMatchRpcAddFlow.class); - ExtensionList extension1 = new ExtensionListBuilder().setExtensionKey(JoachimTheBig.class).build(); + ExtensionList extension1 = new ExtensionListBuilder().setExtensionKey(JoachimTheBig.VALUE).build(); Match match1 = new MatchBuilder() .addAugmentation(new GeneralAugMatchNodesNodeTableFlowBuilder() .setExtensionList(Collections.singletonMap(extension1.key(), extension1)) .build()) .build(); - ExtensionList extension2 = new ExtensionListBuilder().setExtensionKey(JoachimTheTiny.class).build(); + ExtensionList extension2 = new ExtensionListBuilder().setExtensionKey(JoachimTheTiny.VALUE).build(); Match match2 = new MatchBuilder() .addAugmentation(new GeneralAugMatchNodesNodeTableFlowBuilder() .setExtensionList(Collections.singletonMap(extension2.key(), extension2)) .build()) .build(); - Assert.assertEquals(JoachimTheBig.class, + Assert.assertEquals(JoachimTheBig.VALUE, eqGroup.getExtension(match1).get().nonnullExtensionList().values().iterator().next().getExtensionKey()); - Assert.assertEquals(JoachimTheTiny.class, + Assert.assertEquals(JoachimTheTiny.VALUE, eqGroup.getExtension(match2).get().nonnullExtensionList().values().iterator().next().getExtensionKey()); } diff --git a/extension/openflowplugin-extension-api/src/test/java/org/opendaylight/openflowplugin/extension/api/SetFieldExtensionTest.java b/extension/openflowplugin-extension-api/src/test/java/org/opendaylight/openflowplugin/extension/api/SetFieldExtensionTest.java index 25213d20d9..9eb5b6a7e6 100755 --- a/extension/openflowplugin-extension-api/src/test/java/org/opendaylight/openflowplugin/extension/api/SetFieldExtensionTest.java +++ b/extension/openflowplugin-extension-api/src/test/java/org/opendaylight/openflowplugin/extension/api/SetFieldExtensionTest.java @@ -29,33 +29,33 @@ public class SetFieldExtensionTest { eqGroup.add(GeneralAugMatchRpcAddFlowWriteActionsSetField.class); eqGroup.add(GeneralAugMatchNodesNodeTableFlowWriteActionsSetField.class); - ExtensionList extension1 = new ExtensionListBuilder().setExtensionKey(ZVendorExt1.class).build(); + ExtensionList extension1 = new ExtensionListBuilder().setExtensionKey(ZVendorExt1.VALUE).build(); SetField setField1 = new SetFieldBuilder() .addAugmentation(new GeneralAugMatchRpcAddFlowWriteActionsSetFieldBuilder() .setExtensionList(Collections.singletonMap(extension1.key(), extension1)) .build()) .build(); - ExtensionList extension2 = new ExtensionListBuilder().setExtensionKey(ZVendorExt2.class).build(); + ExtensionList extension2 = new ExtensionListBuilder().setExtensionKey(ZVendorExt2.VALUE).build(); SetField setField2 = new SetFieldBuilder() .addAugmentation(new GeneralAugMatchNodesNodeTableFlowWriteActionsSetFieldBuilder() .setExtensionList(Collections.singletonMap(extension2.key(), extension2)) .build()) .build(); - Assert.assertEquals(ZVendorExt1.class, + Assert.assertEquals(ZVendorExt1.VALUE, eqGroup.getExtension(setField1).get().nonnullExtensionList().values().iterator().next() .getExtensionKey()); - Assert.assertEquals(ZVendorExt2.class, + Assert.assertEquals(ZVendorExt2.VALUE, eqGroup.getExtension(setField2).get().nonnullExtensionList().values().iterator().next() .getExtensionKey()); } private interface ZVendorExt1 extends ExtensionKey { - // nobody + ZVendorExt1 VALUE = () -> ZVendorExt1.class; } private interface ZVendorExt2 extends ExtensionKey { - // nobody + ZVendorExt2 VALUE = () -> ZVendorExt2.class; } } 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 64902e7137..c88b08db76 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 @@ -25,11 +25,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class EricExtensionProvider implements AutoCloseable { - private static final Logger LOG = LoggerFactory.getLogger(EricExtensionProvider.class); private static final Icmpv6NDReservedConvertor ICMPV6_ND_RESERVED_CONVERTOR = new Icmpv6NDReservedConvertor(); - private static final Icmpv6NDOptionsTypeConvertor ICMPV6_ND_OPTIONS_TYPE_CONVERTOR - = new Icmpv6NDOptionsTypeConvertor(); + private static final Icmpv6NDOptionsTypeConvertor ICMPV6_ND_OPTIONS_TYPE_CONVERTOR = + new Icmpv6NDOptionsTypeConvertor(); private final ExtensionConverterRegistrator extensionConverterRegistrator; private final List> registrations; @@ -38,14 +37,14 @@ public class EricExtensionProvider implements AutoCloseable { * Register appropriate converters. */ public EricExtensionProvider(final OpenFlowPluginExtensionRegistratorProvider provider) { - this.extensionConverterRegistrator = requireNonNull(provider.getExtensionConverterRegistrator()); + extensionConverterRegistrator = requireNonNull(provider.getExtensionConverterRegistrator()); registrations = List.of( extensionConverterRegistrator.registerMatchConvertor(new ConverterExtensionKey<>( - Icmpv6NdReservedKey.class, EncodeConstants.OF_VERSION_1_3), ICMPV6_ND_RESERVED_CONVERTOR), + Icmpv6NdReservedKey.VALUE, 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.OF_VERSION_1_3), ICMPV6_ND_OPTIONS_TYPE_CONVERTOR), + Icmpv6NdOptionsTypeKey.VALUE, EncodeConstants.OF_VERSION_1_3), ICMPV6_ND_OPTIONS_TYPE_CONVERTOR), extensionConverterRegistrator.registerMatchConvertor( Icmpv6NDOptionsTypeCodec.SERIALIZER_KEY, ICMPV6_ND_OPTIONS_TYPE_CONVERTOR)); } 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 99f51b6b25..4f17aef871 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 @@ -50,7 +50,7 @@ public class Icmpv6NDOptionsTypeConvertor implements ConvertorToOFJava> resolveAugmentation( - final EricOfIcmpv6NdOptionsType value, final MatchPath path, final Class key) { + final EricOfIcmpv6NdOptionsType value, final MatchPath path, final ExtensionKey key) { switch (path) { case FLOWS_STATISTICS_UPDATE_MATCH: return new ExtensionAugment<>(EricAugMatchNodesNodeTableFlow.class, diff --git a/extension/openflowplugin-extension-eric/src/main/java/org/opendaylight/openflowplugin/extension/vendor/eric/convertor/match/Icmpv6NDReservedConvertor.java b/extension/openflowplugin-extension-eric/src/main/java/org/opendaylight/openflowplugin/extension/vendor/eric/convertor/match/Icmpv6NDReservedConvertor.java index 64baab4f4e..fc49b8ba15 100644 --- a/extension/openflowplugin-extension-eric/src/main/java/org/opendaylight/openflowplugin/extension/vendor/eric/convertor/match/Icmpv6NDReservedConvertor.java +++ b/extension/openflowplugin-extension-eric/src/main/java/org/opendaylight/openflowplugin/extension/vendor/eric/convertor/match/Icmpv6NDReservedConvertor.java @@ -49,7 +49,7 @@ public class Icmpv6NDReservedConvertor implements ConvertorToOFJava, Icmpv6NdReservedCaseValue icmpv6NdReservedCaseValue = (Icmpv6NdReservedCaseValue) input.getMatchEntryValue(); return resolveAugmentation(new EricOfIcmpv6NdReservedBuilder().setIcmpv6NdReserved( icmpv6NdReservedCaseValue.getIcmpv6NdReservedValues().getIcmpv6NdReserved()).build(), path, - Icmpv6NdReservedKey.class); + Icmpv6NdReservedKey.VALUE); } @Override @@ -63,12 +63,12 @@ public class Icmpv6NDReservedConvertor implements ConvertorToOFJava, Icmpv6NdReservedCaseValueBuilder icmpv6NdReservedCaseValueBuilder = new Icmpv6NdReservedCaseValueBuilder(); icmpv6NdReservedCaseValueBuilder.setIcmpv6NdReservedValues(new Icmpv6NdReservedValuesBuilder() .setIcmpv6NdReserved(value).build()); - return MatchUtil.createDefaultMatchEntryBuilder(Icmpv6NdReserved.class, EricExpClass.class, + return MatchUtil.createDefaultMatchEntryBuilder(Icmpv6NdReserved.VALUE, EricExpClass.VALUE, icmpv6NdReservedCaseValueBuilder.build()).build(); } private static ExtensionAugment> resolveAugmentation( - final EricOfIcmpv6NdReserved value, final MatchPath path, final Class key) { + final EricOfIcmpv6NdReserved value, final MatchPath path, final ExtensionKey key) { switch (path) { case FLOWS_STATISTICS_UPDATE_MATCH: return new ExtensionAugment<>(EricAugMatchNodesNodeTableFlow.class, 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 9eff658d28..92aa7a7fa5 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 @@ -57,8 +57,8 @@ public final class MatchUtil { private MatchUtil() { } - public static MatchEntryBuilder createDefaultMatchEntryBuilder(final Class matchField, - final Class oxmClass, + public static MatchEntryBuilder createDefaultMatchEntryBuilder(final MatchField matchField, + final OxmClassBase oxmClass, final MatchEntryValue matchEntryValue) { MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder(); matchEntryBuilder.setHasMask(false); 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 95dfac1cc9..8cc4c6c37e 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 @@ -92,25 +92,25 @@ public class Icmpv6NDOptionsTypeConvertorTest { = icmpv6NDOptionsTypeConvertor.convert(matchEntry, MatchPath.PACKET_RECEIVED_MATCH); assertEquals(10, ((EricAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()) .getEricOfIcmpv6NdOptionsType().getIcmpv6NdOptionsType().intValue()); - assertEquals(extensionAugment.getKey(), Icmpv6NdOptionsTypeKey.class); + assertEquals(extensionAugment.getKey(), Icmpv6NdOptionsTypeKey.VALUE); final ExtensionAugment> extensionAugment1 = icmpv6NDOptionsTypeConvertor.convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH); assertEquals(10, ((EricAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject()) .getEricOfIcmpv6NdOptionsType() .getIcmpv6NdOptionsType().intValue()); - assertEquals(extensionAugment.getKey(), Icmpv6NdOptionsTypeKey.class); + assertEquals(extensionAugment.getKey(), Icmpv6NdOptionsTypeKey.VALUE); final ExtensionAugment> extensionAugment2 = icmpv6NDOptionsTypeConvertor.convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH); assertEquals(10, ((EricAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()) .getEricOfIcmpv6NdOptionsType().getIcmpv6NdOptionsType().intValue()); - assertEquals(extensionAugment.getKey(), Icmpv6NdOptionsTypeKey.class); + assertEquals(extensionAugment.getKey(), Icmpv6NdOptionsTypeKey.VALUE); final ExtensionAugment> extensionAugment3 = icmpv6NDOptionsTypeConvertor.convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH); assertEquals(10, ((EricAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()) .getEricOfIcmpv6NdOptionsType().getIcmpv6NdOptionsType().intValue()); - assertEquals(extensionAugment.getKey(), Icmpv6NdOptionsTypeKey.class); + assertEquals(extensionAugment.getKey(), Icmpv6NdOptionsTypeKey.VALUE); } @Test @@ -123,7 +123,7 @@ public class Icmpv6NDOptionsTypeConvertorTest { new ExtensionAugment<>(EricAugMatchNodesNodeTableFlow.class, new EricAugMatchNodesNodeTableFlowBuilder().setEricOfIcmpv6NdOptionsType( new EricOfIcmpv6NdOptionsTypeBuilder().setIcmpv6NdOptionsType(Uint8.ONE).build()).build(), - Icmpv6NdOptionsTypeKey.class); + Icmpv6NdOptionsTypeKey.VALUE); ExtensionListBuilder extListBld = null; ExtensionBuilder extBld = new ExtensionBuilder(); @@ -138,7 +138,7 @@ public class Icmpv6NDOptionsTypeConvertorTest { .setExtensionList(BindingMap.of(extListBld.build())).build()) .build(); - assertEquals(Icmpv6NdOptionsTypeKey.class, eqGroup.getExtension(setField).get().nonnullExtensionList() + assertEquals(Icmpv6NdOptionsTypeKey.VALUE, 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 37a872fe99..0918abbd4a 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 @@ -91,25 +91,25 @@ public class Icmpv6NDReservedConvertorTest { = icmpv6NDReservedConvertor.convert(matchEntry, MatchPath.PACKET_RECEIVED_MATCH); assertEquals(10, ((EricAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()) .getEricOfIcmpv6NdReserved().getIcmpv6NdReserved().intValue()); - assertEquals(extensionAugment.getKey(), Icmpv6NdReservedKey.class); + assertEquals(extensionAugment.getKey(), Icmpv6NdReservedKey.VALUE); final ExtensionAugment> extensionAugment1 = icmpv6NDReservedConvertor.convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH); assertEquals(10, ((EricAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject()) .getEricOfIcmpv6NdReserved().getIcmpv6NdReserved().intValue()); - assertEquals(extensionAugment.getKey(), Icmpv6NdReservedKey.class); + assertEquals(extensionAugment.getKey(), Icmpv6NdReservedKey.VALUE); final ExtensionAugment> extensionAugment2 = icmpv6NDReservedConvertor.convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH); assertEquals(10, ((EricAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()) .getEricOfIcmpv6NdReserved().getIcmpv6NdReserved().intValue()); - assertEquals(extensionAugment.getKey(), Icmpv6NdReservedKey.class); + assertEquals(extensionAugment.getKey(), Icmpv6NdReservedKey.VALUE); final ExtensionAugment> extensionAugment3 = icmpv6NDReservedConvertor.convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH); assertEquals(10, ((EricAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()) .getEricOfIcmpv6NdReserved().getIcmpv6NdReserved().intValue()); - assertEquals(extensionAugment.getKey(), Icmpv6NdReservedKey.class); + assertEquals(extensionAugment.getKey(), Icmpv6NdReservedKey.VALUE); } @Test @@ -122,7 +122,7 @@ public class Icmpv6NDReservedConvertorTest { new ExtensionAugment<>(EricAugMatchNodesNodeTableFlow.class, new EricAugMatchNodesNodeTableFlowBuilder().setEricOfIcmpv6NdReserved( new EricOfIcmpv6NdReservedBuilder().setIcmpv6NdReserved(Uint32.ONE).build()).build(), - Icmpv6NdReservedKey.class); + Icmpv6NdReservedKey.VALUE); ExtensionListBuilder extListBld = null; ExtensionBuilder extBld = new ExtensionBuilder(); @@ -138,7 +138,7 @@ public class Icmpv6NDReservedConvertorTest { .build()) .build(); - assertEquals(Icmpv6NdReservedKey.class, eqGroup.getExtension(setField).get().nonnullExtensionList() + assertEquals(Icmpv6NdReservedKey.VALUE, eqGroup.getExtension(setField).get().nonnullExtensionList() .values().iterator().next().getExtensionKey()); } 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 3382922836..922a26bcf1 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 @@ -363,7 +363,7 @@ public class NiciraExtensionProvider implements AutoCloseable { * Register appropriate converters. */ public NiciraExtensionProvider(final OpenFlowPluginExtensionRegistratorProvider provider) { - this.extensionConverterRegistrator = requireNonNull(provider.getExtensionConverterRegistrator()); + extensionConverterRegistrator = requireNonNull(provider.getExtensionConverterRegistrator()); registrations = new HashSet<>(); // src=dataStore/config registerAction13(NxActionRegLoadNodesNodeTableFlowApplyActionsCase.class, REG_LOAD_CONVERTOR_PROXY); @@ -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.OF_VERSION_1_3), REG_CONVERTOR)); + new ConverterExtensionKey<>(NxmNxReg0Key.VALUE, EncodeConstants.OF_VERSION_1_3), REG_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmNxReg1Key.class, EncodeConstants.OF_VERSION_1_3), REG_CONVERTOR)); + new ConverterExtensionKey<>(NxmNxReg1Key.VALUE, EncodeConstants.OF_VERSION_1_3), REG_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmNxReg2Key.class, EncodeConstants.OF_VERSION_1_3), REG_CONVERTOR)); + new ConverterExtensionKey<>(NxmNxReg2Key.VALUE, EncodeConstants.OF_VERSION_1_3), REG_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmNxReg3Key.class, EncodeConstants.OF_VERSION_1_3), REG_CONVERTOR)); + new ConverterExtensionKey<>(NxmNxReg3Key.VALUE, EncodeConstants.OF_VERSION_1_3), REG_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmNxReg4Key.class, EncodeConstants.OF_VERSION_1_3), REG_CONVERTOR)); + new ConverterExtensionKey<>(NxmNxReg4Key.VALUE, EncodeConstants.OF_VERSION_1_3), REG_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmNxReg5Key.class, EncodeConstants.OF_VERSION_1_3), REG_CONVERTOR)); + new ConverterExtensionKey<>(NxmNxReg5Key.VALUE, EncodeConstants.OF_VERSION_1_3), REG_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmNxReg6Key.class, EncodeConstants.OF_VERSION_1_3), REG_CONVERTOR)); + new ConverterExtensionKey<>(NxmNxReg6Key.VALUE, EncodeConstants.OF_VERSION_1_3), REG_CONVERTOR)); registrations.add(extensionConverterRegistrator.registerMatchConvertor( - new ConverterExtensionKey<>(NxmNxReg7Key.class, EncodeConstants.OF_VERSION_1_3), REG_CONVERTOR)); + new ConverterExtensionKey<>(NxmNxReg7Key.VALUE, 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.OF_VERSION_1_3), TUN_ID_CONVERTOR)); + new ConverterExtensionKey<>(NxmNxTunIdKey.VALUE, 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.OF_VERSION_1_3), ARP_SHA_CONVERTOR)); + new ConverterExtensionKey<>(NxmNxArpShaKey.VALUE, 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.OF_VERSION_1_3), ARP_THA_CONVERTOR)); + new ConverterExtensionKey<>(NxmNxArpThaKey.VALUE, 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.OF_VERSION_1_3), ARP_OP_CONVERTOR)); + new ConverterExtensionKey<>(NxmOfArpOpKey.VALUE, 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.OF_VERSION_1_3), ARP_SPA_CONVERTOR)); + new ConverterExtensionKey<>(NxmOfArpSpaKey.VALUE, 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.OF_VERSION_1_3), ARP_TPA_CONVERTOR)); + new ConverterExtensionKey<>(NxmOfArpTpaKey.VALUE, 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.OF_VERSION_1_3), + new ConverterExtensionKey<>(NxmOfInPortKey.VALUE, 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.OF_VERSION_1_3), ETH_SRC_CONVERTOR)); + new ConverterExtensionKey<>(NxmOfEthSrcKey.VALUE, 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.OF_VERSION_1_3), ETH_DST_CONVERTOR)); + new ConverterExtensionKey<>(NxmOfEthDstKey.VALUE, 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.OF_VERSION_1_3), + new ConverterExtensionKey<>(NxmOfEthTypeKey.VALUE, 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.OF_VERSION_1_3), NSP_CONVERTOR)); + new ConverterExtensionKey<>(NxmNxNspKey.VALUE, 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.OF_VERSION_1_3), NSI_CONVERTOR)); + new ConverterExtensionKey<>(NxmNxNsiKey.VALUE, 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.OF_VERSION_1_3), NSC1_CONVERTOR)); + new ConverterExtensionKey<>(NxmNxNshc1Key.VALUE, 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.OF_VERSION_1_3), NSC2_CONVERTOR)); + new ConverterExtensionKey<>(NxmNxNshc2Key.VALUE, 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.OF_VERSION_1_3), NSC3_CONVERTOR)); + new ConverterExtensionKey<>(NxmNxNshc3Key.VALUE, 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.OF_VERSION_1_3), NSC4_CONVERTOR)); + new ConverterExtensionKey<>(NxmNxNshc4Key.VALUE, 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.OF_VERSION_1_3), + new ConverterExtensionKey<>(NxmNxNshFlagsKey.VALUE, 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.OF_VERSION_1_3), + new ConverterExtensionKey<>(NxmNxNshTtlKey.VALUE, 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.OF_VERSION_1_3), + new ConverterExtensionKey<>(NxmNxTunIpv4SrcKey.VALUE, 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.OF_VERSION_1_3), + new ConverterExtensionKey<>(NxmNxTunIpv4DstKey.VALUE, 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.OF_VERSION_1_3), + new ConverterExtensionKey<>(NxmNxNshMdtypeKey.VALUE, 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.OF_VERSION_1_3), NSH_NP_CONVERTOR)); + new ConverterExtensionKey<>(NxmNxNshNpKey.VALUE, 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.OF_VERSION_1_3), TCP_SRC_CONVERTOR)); + new ConverterExtensionKey<>(NxmOfTcpSrcKey.VALUE, 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.OF_VERSION_1_3), TCP_DST_CONVERTOR)); + new ConverterExtensionKey<>(NxmOfTcpDstKey.VALUE, 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.OF_VERSION_1_3), UDP_SRC_CONVERTOR)); + new ConverterExtensionKey<>(NxmOfUdpSrcKey.VALUE, 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.OF_VERSION_1_3), UDP_DST_CONVERTOR)); + new ConverterExtensionKey<>(NxmOfUdpDstKey.VALUE, 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.OF_VERSION_1_3), + new ConverterExtensionKey<>(NxmNxCtStateKey.VALUE, 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.OF_VERSION_1_3), CT_ZONE_CONVERTOR)); + new ConverterExtensionKey<>(NxmNxCtZoneKey.VALUE, 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.OF_VERSION_1_3), CT_MARK_CONVERTOR)); + new ConverterExtensionKey<>(NxmNxCtMarkKey.VALUE, 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.OF_VERSION_1_3), + new ConverterExtensionKey<>(NxmNxCtTpSrcKey.VALUE, 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.OF_VERSION_1_3), + new ConverterExtensionKey<>(NxmNxCtTpDstKey.VALUE, 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.OF_VERSION_1_3), + new ConverterExtensionKey<>(NxmNxPktMarkKey.VALUE, EncodeConstants.OF_VERSION_1_3), PKT_MARK_CONVERTOR)); registrations.add( extensionConverterRegistrator.registerMatchConvertor(PktMarkCodec.SERIALIZER_KEY, PKT_MARK_CONVERTOR)); diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/FieldChoiceResolver.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/FieldChoiceResolver.java index e749d19efd..520c8186ec 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/FieldChoiceResolver.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/FieldChoiceResolver.java @@ -161,21 +161,21 @@ public final class FieldChoiceResolver { NiciraMatchCodecs.IPV6_DST_CODEC.getHeaderWithoutHasMask()) .put(new SrcNxOfMplsLabelCaseBuilder().setOfMplsLabel(Empty.value()).build(), NiciraMatchCodecs.OXM_OF_MPLS_LABEL.getHeaderWithoutHasMask()) - .put(new SrcNxRegCaseBuilder().setNxReg(NxmNxReg0.class).build(), + .put(new SrcNxRegCaseBuilder().setNxReg(NxmNxReg0.VALUE).build(), NiciraMatchCodecs.REG0_CODEC.getHeaderWithoutHasMask()) - .put(new SrcNxRegCaseBuilder().setNxReg(NxmNxReg1.class).build(), + .put(new SrcNxRegCaseBuilder().setNxReg(NxmNxReg1.VALUE).build(), NiciraMatchCodecs.REG1_CODEC.getHeaderWithoutHasMask()) - .put(new SrcNxRegCaseBuilder().setNxReg(NxmNxReg2.class).build(), + .put(new SrcNxRegCaseBuilder().setNxReg(NxmNxReg2.VALUE).build(), NiciraMatchCodecs.REG2_CODEC.getHeaderWithoutHasMask()) - .put(new SrcNxRegCaseBuilder().setNxReg(NxmNxReg3.class).build(), + .put(new SrcNxRegCaseBuilder().setNxReg(NxmNxReg3.VALUE).build(), NiciraMatchCodecs.REG3_CODEC.getHeaderWithoutHasMask()) - .put(new SrcNxRegCaseBuilder().setNxReg(NxmNxReg4.class).build(), + .put(new SrcNxRegCaseBuilder().setNxReg(NxmNxReg4.VALUE).build(), NiciraMatchCodecs.REG4_CODEC.getHeaderWithoutHasMask()) - .put(new SrcNxRegCaseBuilder().setNxReg(NxmNxReg5.class).build(), + .put(new SrcNxRegCaseBuilder().setNxReg(NxmNxReg5.VALUE).build(), NiciraMatchCodecs.REG5_CODEC.getHeaderWithoutHasMask()) - .put(new SrcNxRegCaseBuilder().setNxReg(NxmNxReg6.class).build(), + .put(new SrcNxRegCaseBuilder().setNxReg(NxmNxReg6.VALUE).build(), NiciraMatchCodecs.REG6_CODEC.getHeaderWithoutHasMask()) - .put(new SrcNxRegCaseBuilder().setNxReg(NxmNxReg7.class).build(), + .put(new SrcNxRegCaseBuilder().setNxReg(NxmNxReg7.VALUE).build(), NiciraMatchCodecs.REG7_CODEC.getHeaderWithoutHasMask()) .build(); @@ -233,21 +233,21 @@ public final class FieldChoiceResolver { NiciraMatchCodecs.OXM_OF_MPLS_LABEL.getHeaderWithoutHasMask()) .put(new DstOfIcmpTypeCaseBuilder().setOfIcmpType(Empty.value()).build(), NiciraMatchCodecs.ICMP_TYPE_CODEC.getHeaderWithoutHasMask()) - .put(new DstNxRegCaseBuilder().setNxReg(NxmNxReg0.class).build(), + .put(new DstNxRegCaseBuilder().setNxReg(NxmNxReg0.VALUE).build(), NiciraMatchCodecs.REG0_CODEC.getHeaderWithoutHasMask()) - .put(new DstNxRegCaseBuilder().setNxReg(NxmNxReg1.class).build(), + .put(new DstNxRegCaseBuilder().setNxReg(NxmNxReg1.VALUE).build(), NiciraMatchCodecs.REG1_CODEC.getHeaderWithoutHasMask()) - .put(new DstNxRegCaseBuilder().setNxReg(NxmNxReg2.class).build(), + .put(new DstNxRegCaseBuilder().setNxReg(NxmNxReg2.VALUE).build(), NiciraMatchCodecs.REG2_CODEC.getHeaderWithoutHasMask()) - .put(new DstNxRegCaseBuilder().setNxReg(NxmNxReg3.class).build(), + .put(new DstNxRegCaseBuilder().setNxReg(NxmNxReg3.VALUE).build(), NiciraMatchCodecs.REG3_CODEC.getHeaderWithoutHasMask()) - .put(new DstNxRegCaseBuilder().setNxReg(NxmNxReg4.class).build(), + .put(new DstNxRegCaseBuilder().setNxReg(NxmNxReg4.VALUE).build(), NiciraMatchCodecs.REG4_CODEC.getHeaderWithoutHasMask()) - .put(new DstNxRegCaseBuilder().setNxReg(NxmNxReg5.class).build(), + .put(new DstNxRegCaseBuilder().setNxReg(NxmNxReg5.VALUE).build(), NiciraMatchCodecs.REG5_CODEC.getHeaderWithoutHasMask()) - .put(new DstNxRegCaseBuilder().setNxReg(NxmNxReg6.class).build(), + .put(new DstNxRegCaseBuilder().setNxReg(NxmNxReg6.VALUE).build(), NiciraMatchCodecs.REG6_CODEC.getHeaderWithoutHasMask()) - .put(new DstNxRegCaseBuilder().setNxReg(NxmNxReg7.class).build(), + .put(new DstNxRegCaseBuilder().setNxReg(NxmNxReg7.VALUE).build(), NiciraMatchCodecs.REG7_CODEC.getHeaderWithoutHasMask()) .build(); 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 1cabb66eed..cf1dd2485b 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 @@ -158,7 +158,7 @@ public class RegLoad2Convertor implements } private static NxRegLoad resolveRegLoad(final MatchEntry matchEntry) { - Class oxmMatchField = matchEntry.getOxmMatchField(); + MatchField oxmMatchField = matchEntry.getOxmMatchField(); ExperimenterIdCase experimenterIdCase = (ExperimenterIdCase) matchEntry.getMatchEntryValue(); OfjAugNxExpMatch ofjAugNxExpMatch = experimenterIdCase.augmentation(OfjAugNxExpMatch.class); NxExpMatchEntryValue nxExpMatchEntryValue = ofjAugNxExpMatch.getNxExpMatchEntryValue(); @@ -167,53 +167,46 @@ public class RegLoad2Convertor implements } private static NxRegLoad resolveRegLoad( - final Class oxmMatchField, + final MatchField oxmMatchField, final NxExpMatchEntryValue value, final DstBuilder dstBuilder) { - if (NxmNxNshFlags.class.equals(oxmMatchField)) { + if (NxmNxNshFlags.VALUE.equals(oxmMatchField)) { int valueLength = NiciraMatchCodecs.NSH_FLAGS_CODEC.getValueLength(); dstBuilder.setDstChoice(new DstNxNshFlagsCaseBuilder().setNxNshFlags(Empty.value()).build()); NshFlagsValues nshFlagsValues = ((NshFlagsCaseValue) value).getNshFlagsValues(); return resolveRegLoad(nshFlagsValues.getNshFlags(), nshFlagsValues.getMask(), valueLength, dstBuilder); - } - if (NxmNxNsp.class.equals(oxmMatchField)) { + } else if (NxmNxNsp.VALUE.equals(oxmMatchField)) { int valueLength = NiciraMatchCodecs.NSP_CODEC.getValueLength(); dstBuilder.setDstChoice(new DstNxNspCaseBuilder().setNxNspDst(Empty.value()).build()); NspValues nspValues = ((NspCaseValue) value).getNspValues(); return resolveRegLoad(nspValues.getNsp(), nspValues.getMask(), valueLength, dstBuilder); - } - if (NxmNxNsi.class.equals(oxmMatchField)) { + } else if (NxmNxNsi.VALUE.equals(oxmMatchField)) { int valueLength = NiciraMatchCodecs.NSI_CODEC.getValueLength(); dstBuilder.setDstChoice(new DstNxNsiCaseBuilder().setNxNsiDst(Empty.value()).build()); NsiValues nsiValues = ((NsiCaseValue) value).getNsiValues(); return resolveRegLoad(nsiValues.getNsi(), nsiValues.getMask(), valueLength, dstBuilder); - } - if (NxmNxNshc1.class.equals(oxmMatchField)) { + } else if (NxmNxNshc1.VALUE.equals(oxmMatchField)) { int valueLength = NiciraMatchCodecs.NSC1_CODEC.getValueLength(); dstBuilder.setDstChoice(new DstNxNshc1CaseBuilder().setNxNshc1Dst(Empty.value()).build()); NshcCaseValue nshcCaseValue = (NshcCaseValue) value; return resolveRegLoad(nshcCaseValue.getNshc(), nshcCaseValue.getMask(), valueLength, dstBuilder); - } - if (NxmNxNshc2.class.equals(oxmMatchField)) { + } else if (NxmNxNshc2.VALUE.equals(oxmMatchField)) { int valueLength = NiciraMatchCodecs.NSC2_CODEC.getValueLength(); dstBuilder.setDstChoice(new DstNxNshc2CaseBuilder().setNxNshc2Dst(Empty.value()).build()); NshcCaseValue nshcCaseValue = (NshcCaseValue) value; return resolveRegLoad(nshcCaseValue.getNshc(), nshcCaseValue.getMask(), valueLength, dstBuilder); - } - if (NxmNxNshc3.class.equals(oxmMatchField)) { + } else if (NxmNxNshc3.VALUE.equals(oxmMatchField)) { int valueLength = NiciraMatchCodecs.NSC3_CODEC.getValueLength(); dstBuilder.setDstChoice(new DstNxNshc3CaseBuilder().setNxNshc3Dst(Empty.value()).build()); NshcCaseValue nshcCaseValue = (NshcCaseValue) value; return resolveRegLoad(nshcCaseValue.getNshc(), nshcCaseValue.getMask(), valueLength, dstBuilder); - } - if (NxmNxNshc4.class.equals(oxmMatchField)) { + } else if (NxmNxNshc4.VALUE.equals(oxmMatchField)) { int valueLength = NiciraMatchCodecs.NSC4_CODEC.getValueLength(); dstBuilder.setDstChoice(new DstNxNshc4CaseBuilder().setNxNshc4Dst(Empty.value()).build()); NshcCaseValue nshcCaseValue = (NshcCaseValue) value; return resolveRegLoad(nshcCaseValue.getNshc(), nshcCaseValue.getMask(), valueLength, dstBuilder); - } - if (NxmNxNshTtl.class.equals(oxmMatchField)) { + } else if (NxmNxNshTtl.VALUE.equals(oxmMatchField)) { int valueLength = NiciraMatchCodecs.NSH_TTL_CODEC.getValueLength(); dstBuilder.setDstChoice(new DstNxNshTtlCaseBuilder().setNxNshTtl(Empty.value()).build()); NshTtlValues nshTtlValues = ((NshTtlCaseValue) value).getNshTtlValues(); 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 da56f5feb3..7a634e8c53 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 @@ -48,7 +48,7 @@ public class ArpOpConvertor implements ConvertorToOFJava, ConvertorF 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); + NxmOfArpOpKey.VALUE); } @Override @@ -62,11 +62,11 @@ public class ArpOpConvertor implements ConvertorToOFJava, ConvertorF arpOpCaseValueBuilder.setArpOpValues(new ArpOpValuesBuilder() .setValue(value).build()); return MatchUtil.createDefaultMatchEntryBuilder(org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx - .match.rev140421.NxmOfArpOp.class, Nxm0Class.class, arpOpCaseValueBuilder.build()).build(); + .match.rev140421.NxmOfArpOp.VALUE, Nxm0Class.VALUE, arpOpCaseValueBuilder.build()).build(); } private static ExtensionAugment> resolveAugmentation(final NxmOfArpOp value, - final MatchPath path, final Class key) { + final MatchPath path, final ExtensionKey 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 fbbee7a2ff..b32641ff57 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 @@ -48,7 +48,7 @@ public class ArpShaConvertor implements ConvertorToOFJava, Convertor 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); + .getMacAddress()).build(), path, NxmNxArpShaKey.VALUE); } @Override @@ -62,11 +62,11 @@ public class ArpShaConvertor implements ConvertorToOFJava, Convertor arpShaCaseValueBuilder.setArpShaValues(new ArpShaValuesBuilder() .setMacAddress(macAddress).build()); return MatchUtil.createDefaultMatchEntryBuilder(org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx - .match.rev140421.NxmNxArpSha.class, Nxm1Class.class, arpShaCaseValueBuilder.build()).build(); + .match.rev140421.NxmNxArpSha.VALUE, Nxm1Class.VALUE, arpShaCaseValueBuilder.build()).build(); } private static ExtensionAugment> resolveAugmentation(final NxmNxArpSha value, - final MatchPath path, final Class key) { + final MatchPath path, final ExtensionKey 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 0d6502b9fc..43ba8363e6 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 @@ -51,7 +51,7 @@ public class ArpSpaConvertor implements ConvertorToOFJava, Convertor ArpSpaCaseValue arpSpaCaseValue = (ArpSpaCaseValue) input.getMatchEntryValue(); Ipv4Address ipv4Address = IpConverter.longToIpv4Address(arpSpaCaseValue.getArpSpaValues().getValue().toJava()); return resolveAugmentation(new NxmOfArpSpaBuilder().setIpv4Address(ipv4Address).build(), path, - NxmOfArpSpaKey.class); + NxmOfArpSpaKey.VALUE); } @Override @@ -61,8 +61,8 @@ public class ArpSpaConvertor implements ConvertorToOFJava, Convertor throw new CodecPreconditionException(extension); } return MatchUtil.createDefaultMatchEntryBuilder( - org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfArpSpa.class, - Nxm0Class.class, new ArpSpaCaseValueBuilder() + org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfArpSpa.VALUE, + Nxm0Class.VALUE, new ArpSpaCaseValueBuilder() .setArpSpaValues(new ArpSpaValuesBuilder() .setValue(Uint32.valueOf(IpConverter.ipv4AddressToLong(matchGrouping.get().getNxmOfArpSpa() .getIpv4Address()))) @@ -72,7 +72,7 @@ public class ArpSpaConvertor implements ConvertorToOFJava, Convertor } private static ExtensionAugment> resolveAugmentation(final NxmOfArpSpa value, - final MatchPath path, final Class key) { + final MatchPath path, final ExtensionKey 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/ArpThaConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpThaConvertor.java index e7eee47996..c73b2d57de 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 @@ -49,7 +49,7 @@ public class ArpThaConvertor implements ConvertorToOFJava, Convertor ArpThaCaseValue arpThaCaseValue = (ArpThaCaseValue) input.getMatchEntryValue(); return resolveAugmentation( new NxmNxArpThaBuilder().setMacAddress(arpThaCaseValue.getArpThaValues().getMacAddress()).build(), path, - NxmNxArpThaKey.class); + NxmNxArpThaKey.VALUE); } @Override @@ -63,12 +63,12 @@ public class ArpThaConvertor implements ConvertorToOFJava, Convertor arpThaCaseValueBuilder.setArpThaValues(new ArpThaValuesBuilder() .setMacAddress(macAddress).build()); return MatchUtil.createDefaultMatchEntryBuilder(org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx - .match.rev140421.NxmNxArpTha.class, Nxm1Class.class, arpThaCaseValueBuilder.build()).build(); + .match.rev140421.NxmNxArpTha.VALUE, Nxm1Class.VALUE, arpThaCaseValueBuilder.build()).build(); } private static ExtensionAugment> resolveAugmentation(final NxmNxArpTha value, - final MatchPath path, final Class key) { + final MatchPath path, final ExtensionKey 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 b74084d5b3..61fb8d5340 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 @@ -51,7 +51,7 @@ public class ArpTpaConvertor implements ConvertorToOFJava, Convertor ArpTpaCaseValue arpTpaCaseValue = (ArpTpaCaseValue) input.getMatchEntryValue(); Ipv4Address ipv4Address = IpConverter.longToIpv4Address(arpTpaCaseValue.getArpTpaValues().getValue()); return resolveAugmentation(new NxmOfArpTpaBuilder().setIpv4Address(ipv4Address).build(), path, - NxmOfArpTpaKey.class); + NxmOfArpTpaKey.VALUE); } @Override @@ -61,8 +61,8 @@ public class ArpTpaConvertor implements ConvertorToOFJava, Convertor throw new CodecPreconditionException(extension); } return MatchUtil.createDefaultMatchEntryBuilder( - org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfArpTpa.class, - Nxm0Class.class, new ArpTpaCaseValueBuilder() + org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfArpTpa.VALUE, + Nxm0Class.VALUE, new ArpTpaCaseValueBuilder() .setArpTpaValues(new ArpTpaValuesBuilder() .setValue(Uint32.valueOf( IpConverter.ipv4AddressToLong(matchGrouping.get().getNxmOfArpTpa().getIpv4Address()))).build()) @@ -71,7 +71,7 @@ public class ArpTpaConvertor implements ConvertorToOFJava, Convertor } private static ExtensionAugment> resolveAugmentation(final NxmOfArpTpa value, - final MatchPath path, final Class key) { + final MatchPath path, final ExtensionKey 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/CtMarkConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/CtMarkConvertor.java index 13d3b38d9d..f4a779b9bf 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 @@ -53,8 +53,7 @@ public class CtMarkConvertor implements ConvertorToOFJava, Convertor NxmNxCtMarkBuilder ctMarkBuilder = new NxmNxCtMarkBuilder(); ctMarkBuilder.setCtMark(ctMarkCaseValue.getCtMarkValues().getCtMark()); ctMarkBuilder.setMask(ctMarkCaseValue.getCtMarkValues().getMask()); - return resolveAugmentation(ctMarkBuilder.build(), path, - NxmNxCtMarkKey.class); + return resolveAugmentation(ctMarkBuilder.build(), path, NxmNxCtMarkKey.VALUE); } /* @@ -79,14 +78,14 @@ public class CtMarkConvertor implements ConvertorToOFJava, Convertor ctMarkCaseValueBuilder.setCtMarkValues(ctMarkValuesBuilder.build()); MatchEntryBuilder ofMatch = MatchUtil .createDefaultMatchEntryBuilder(org.opendaylight.yang.gen.v1.urn - .opendaylight.openflowjava.nx.match.rev140421.NxmNxCtMark.class, - Nxm1Class.class, ctMarkCaseValueBuilder.build()); + .opendaylight.openflowjava.nx.match.rev140421.NxmNxCtMark.VALUE, + Nxm1Class.VALUE, ctMarkCaseValueBuilder.build()); ofMatch.setHasMask(true); return ofMatch.build(); } private static ExtensionAugment> resolveAugmentation(final NxmNxCtMark value, - final MatchPath path, final Class key) { + final MatchPath path, final ExtensionKey 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 cf0537b616..fe463b47b0 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 @@ -50,8 +50,7 @@ public class CtStateConvertor implements ConvertorToOFJava, Converto NxmNxCtStateBuilder ctStateBuilder = new NxmNxCtStateBuilder(); ctStateBuilder.setCtState(ctStateCaseValue.getCtStateValues().getCtState()); ctStateBuilder.setMask(ctStateCaseValue.getCtStateValues().getMask()); - return resolveAugmentation(ctStateBuilder.build(), path, - NxmNxCtStateKey.class); + return resolveAugmentation(ctStateBuilder.build(), path, NxmNxCtStateKey.VALUE); } @Override @@ -66,14 +65,14 @@ public class CtStateConvertor implements ConvertorToOFJava, Converto 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()); + org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxCtState.VALUE, + Nxm1Class.VALUE, ctStateCaseValueBuilder.build()); ofMatch.setHasMask(true); return ofMatch.build(); } private static ExtensionAugment> resolveAugmentation(final NxmNxCtState value, - final MatchPath path, final Class key) { + final MatchPath path, final ExtensionKey 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 5893957039..72af5f1a1d 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 @@ -51,8 +51,8 @@ public class CtTpDstConvertor implements ConvertorToOFJava, Converto ctTpDstCaseValueBuilder.setCtTpDstValues(ctTpDstValuesBuilder.build()); MatchEntryBuilder ofMatch = MatchUtil .createDefaultMatchEntryBuilder(org.opendaylight.yang.gen.v1.urn - .opendaylight.openflowjava.nx.match.rev140421.NxmNxCtTpSrc.class, - Nxm1Class.class, ctTpDstCaseValueBuilder.build()); + .opendaylight.openflowjava.nx.match.rev140421.NxmNxCtTpSrc.VALUE, + Nxm1Class.VALUE, ctTpDstCaseValueBuilder.build()); return ofMatch.build(); } @@ -61,12 +61,11 @@ public class CtTpDstConvertor implements ConvertorToOFJava, Converto CtTpDstCaseValue ctTpSrcCaseValue = (CtTpDstCaseValue) input.getMatchEntryValue(); NxmNxCtTpDstBuilder ctTpSrcBuilder = new NxmNxCtTpDstBuilder(); ctTpSrcBuilder.setCtTpDst(ctTpSrcCaseValue.getCtTpDstValues().getCtTpDst()); - return resolveAugmentation(ctTpSrcBuilder.build(), path, - NxmNxCtTpDstKey.class); + return resolveAugmentation(ctTpSrcBuilder.build(), path, NxmNxCtTpDstKey.VALUE); } private static ExtensionAugment> resolveAugmentation(final NxmNxCtTpDst value, - final MatchPath path, final Class key) { + final MatchPath path, final ExtensionKey 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 54336df588..edb5d8cdd5 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 @@ -51,8 +51,8 @@ public class CtTpSrcConvertor implements ConvertorToOFJava, Converto ctTpSrcCaseValueBuilder.setCtTpSrcValues(ctTpSrcValuesBuilder.build()); MatchEntryBuilder ofMatch = MatchUtil .createDefaultMatchEntryBuilder(org.opendaylight.yang.gen.v1.urn - .opendaylight.openflowjava.nx.match.rev140421.NxmNxCtTpSrc.class, - Nxm1Class.class, ctTpSrcCaseValueBuilder.build()); + .opendaylight.openflowjava.nx.match.rev140421.NxmNxCtTpSrc.VALUE, + Nxm1Class.VALUE, ctTpSrcCaseValueBuilder.build()); return ofMatch.build(); } @@ -61,12 +61,11 @@ public class CtTpSrcConvertor implements ConvertorToOFJava, Converto CtTpSrcCaseValue ctTpSrcCaseValue = (CtTpSrcCaseValue) input.getMatchEntryValue(); NxmNxCtTpSrcBuilder ctTpSrcBuilder = new NxmNxCtTpSrcBuilder(); ctTpSrcBuilder.setCtTpSrc(ctTpSrcCaseValue.getCtTpSrcValues().getCtTpSrc()); - return resolveAugmentation(ctTpSrcBuilder.build(), path, - NxmNxCtTpSrcKey.class); + return resolveAugmentation(ctTpSrcBuilder.build(), path, NxmNxCtTpSrcKey.VALUE); } private static ExtensionAugment> resolveAugmentation(final NxmNxCtTpSrc value, - final MatchPath path, final Class key) { + final MatchPath path, final ExtensionKey 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 7784dfd2f6..357903b22d 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 @@ -49,8 +49,7 @@ public class CtZoneConvertor implements ConvertorToOFJava, Convertor CtZoneCaseValue ctZoneCaseValue = (CtZoneCaseValue) input.getMatchEntryValue(); NxmNxCtZoneBuilder ctZoneBuilder = new NxmNxCtZoneBuilder(); ctZoneBuilder.setCtZone(ctZoneCaseValue.getCtZoneValues().getCtZone()); - return resolveAugmentation(ctZoneBuilder.build(), path, - NxmNxCtZoneKey.class); + return resolveAugmentation(ctZoneBuilder.build(), path, NxmNxCtZoneKey.VALUE); } @Override @@ -65,13 +64,13 @@ public class CtZoneConvertor implements ConvertorToOFJava, Convertor ctZoneCaseValueBuilder.setCtZoneValues(ctZoneValuesBuilder.build()); MatchEntryBuilder ofMatch = MatchUtil .createDefaultMatchEntryBuilder(org.opendaylight.yang.gen.v1.urn - .opendaylight.openflowjava.nx.match.rev140421.NxmNxCtZone.class, - Nxm1Class.class, ctZoneCaseValueBuilder.build()); + .opendaylight.openflowjava.nx.match.rev140421.NxmNxCtZone.VALUE, + Nxm1Class.VALUE, ctZoneCaseValueBuilder.build()); return ofMatch.build(); } private static ExtensionAugment> resolveAugmentation(final NxmNxCtZone value, - final MatchPath path, final Class key) { + final MatchPath path, final ExtensionKey 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 6860f80314..eab29f8360 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 @@ -49,7 +49,7 @@ public class EthDstConvertor implements ConvertorToOFJava, Convertor EthDstCaseValue ethDstCaseValue = (EthDstCaseValue) input.getMatchEntryValue(); return resolveAugmentation( new NxmOfEthDstBuilder().setMacAddress(ethDstCaseValue.getEthDstValues().getMacAddress()).build(), path, - NxmOfEthDstKey.class); + NxmOfEthDstKey.VALUE); } @Override @@ -63,12 +63,12 @@ public class EthDstConvertor implements ConvertorToOFJava, Convertor ethDstCaseValueBuilder.setEthDstValues(new EthDstValuesBuilder() .setMacAddress(macAddress).build()); return MatchUtil.createDefaultMatchEntryBuilder( - org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfEthDst.class, - Nxm0Class.class, ethDstCaseValueBuilder.build()).build(); + org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfEthDst.VALUE, + Nxm0Class.VALUE, ethDstCaseValueBuilder.build()).build(); } private static ExtensionAugment> resolveAugmentation(final NxmOfEthDst value, - final MatchPath path, final Class key) { + final MatchPath path, final ExtensionKey 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 4d6b7c0385..f293088d34 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 @@ -49,7 +49,7 @@ public class EthSrcConvertor implements ConvertorToOFJava, Convertor EthSrcCaseValue ethSrcCaseValue = (EthSrcCaseValue) input.getMatchEntryValue(); return resolveAugmentation( new NxmOfEthSrcBuilder().setMacAddress(ethSrcCaseValue.getEthSrcValues().getMacAddress()).build(), path, - NxmOfEthSrcKey.class); + NxmOfEthSrcKey.VALUE); } @Override @@ -63,12 +63,12 @@ public class EthSrcConvertor implements ConvertorToOFJava, Convertor ethSrcCaseValueBuilder.setEthSrcValues(new EthSrcValuesBuilder() .setMacAddress(macAddress).build()); return MatchUtil.createDefaultMatchEntryBuilder( - org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfEthSrc.class, - Nxm0Class.class, ethSrcCaseValueBuilder.build()).build(); + org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfEthSrc.VALUE, + Nxm0Class.VALUE, ethSrcCaseValueBuilder.build()).build(); } private static ExtensionAugment> resolveAugmentation(final NxmOfEthSrc value, - final MatchPath path, final Class key) { + final MatchPath path, final ExtensionKey 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 1917e0d273..6c77fdf0b1 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 @@ -49,7 +49,7 @@ public class EthTypeConvertor implements ConvertorToOFJava, Converto EthTypeCaseValue ethTypeCaseValue = (EthTypeCaseValue) input.getMatchEntryValue(); return resolveAugmentation( new NxmOfEthTypeBuilder().setValue(ethTypeCaseValue.getEthTypeValues().getValue()).build(), path, - NxmOfEthTypeKey.class); + NxmOfEthTypeKey.VALUE); } @Override @@ -63,13 +63,13 @@ public class EthTypeConvertor implements ConvertorToOFJava, Converto ethTypeCaseValueBuilder.setEthTypeValues(new EthTypeValuesBuilder() .setValue(value).build()); return MatchUtil.createDefaultMatchEntryBuilder( - org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfEthType.class, - Nxm0Class.class, ethTypeCaseValueBuilder.build()).build(); + org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfEthType.VALUE, + Nxm0Class.VALUE, ethTypeCaseValueBuilder.build()).build(); } private static ExtensionAugment> resolveAugmentation(final NxmOfEthType value, - final MatchPath path, final Class key) { + final MatchPath path, final ExtensionKey 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 304d12ba1a..68f0aa4c15 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 @@ -160,8 +160,8 @@ public final class MatchUtil { // Hidden on purpose } - public static MatchEntryBuilder createDefaultMatchEntryBuilder(final Class matchField, - final Class oxmClass, + public static MatchEntryBuilder createDefaultMatchEntryBuilder(final MatchField matchField, + final OxmClassBase oxmClass, final MatchEntryValue matchEntryValue) { return new MatchEntryBuilder() .setHasMask(false) @@ -171,10 +171,10 @@ public final class MatchUtil { } public static > MatchEntryBuilder createExperimenterMatchEntryBuilder( - final Class matchField, + final MatchField matchField, final Uint32 experimenterId, final NxExpMatchEntryValue value) { - return createDefaultMatchEntryBuilder(matchField, ExperimenterClass.class, new ExperimenterIdCaseBuilder() + return createDefaultMatchEntryBuilder(matchField, ExperimenterClass.VALUE, new ExperimenterIdCaseBuilder() .setExperimenter(new ExperimenterBuilder().setExperimenter(new ExperimenterId(experimenterId)).build()) .addAugmentation(new OfjAugNxExpMatchBuilder().setNxExpMatchEntryValue(value).build()) .build()); 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 be3cb23525..8527d8781d 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 @@ -56,7 +56,7 @@ public class NshFlagsConvertor implements ConvertorToOFJava, Convert return resolveAugmentation( nxmNxNshFlags, path, - NxmNxNshFlagsKey.class); + NxmNxNshFlagsKey.VALUE); } @Override @@ -74,14 +74,14 @@ public class NshFlagsConvertor implements ConvertorToOFJava, Convert NshFlagsValues nshFlagsValues = new NshFlagsValuesBuilder().setNshFlags(flags).setMask(mask).build(); NxExpMatchEntryValue value = new NshFlagsCaseValueBuilder().setNshFlagsValues(nshFlagsValues).build(); return MatchUtil.createExperimenterMatchEntryBuilder( - org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNshFlags.class, + org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNshFlags.VALUE, NiciraConstants.NX_NSH_VENDOR_ID, value).setHasMask(mask != null).build(); } private static ExtensionAugment> resolveAugmentation( final NxmNxNshFlags value, - final MatchPath path, final Class key) { + final MatchPath path, final ExtensionKey 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 f0bc5f7d94..3d8654e9a6 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 @@ -55,7 +55,7 @@ public class NshMdtypeConvertor implements ConvertorToOFJava, Conver return resolveAugmentation( nxmNxNshMdtype, path, - NxmNxNshMdtypeKey.class); + NxmNxNshMdtypeKey.VALUE); } @Override @@ -72,14 +72,14 @@ public class NshMdtypeConvertor implements ConvertorToOFJava, Conver NshMdtypeValues nshMdtypeValues = new NshMdtypeValuesBuilder().setValue(value).build(); NxExpMatchEntryValue entryValue = new NshMdtypeCaseValueBuilder().setNshMdtypeValues(nshMdtypeValues).build(); return MatchUtil.createExperimenterMatchEntryBuilder( - org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNshMdtype.class, + org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNshMdtype.VALUE, NiciraConstants.NX_NSH_VENDOR_ID, entryValue).setHasMask(mask != null).build(); } private static ExtensionAugment> resolveAugmentation( final NxmNxNshMdtype value, - final MatchPath path, final Class key) { + final MatchPath path, final ExtensionKey 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 5ddf171ee2..01ec5f2b8e 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 @@ -55,7 +55,7 @@ public class NshNpConvertor implements ConvertorToOFJava, ConvertorF return resolveAugmentation( nxmNxNshNp, path, - NxmNxNshNpKey.class); + NxmNxNshNpKey.VALUE); } @Override @@ -72,14 +72,13 @@ public class NshNpConvertor implements ConvertorToOFJava, ConvertorF NshNpValues nshNpValues = new NshNpValuesBuilder().setValue(value).build(); NxExpMatchEntryValue entryValue = new NshNpCaseValueBuilder().setNshNpValues(nshNpValues).build(); return MatchUtil.createExperimenterMatchEntryBuilder( - org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNshNp.class, + org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNshNp.VALUE, NiciraConstants.NX_NSH_VENDOR_ID, entryValue).setHasMask(mask != null).build(); } private static ExtensionAugment> resolveAugmentation( - final NxmNxNshNp value, - final MatchPath path, final Class key) { + final NxmNxNshNp value, final MatchPath path, final ExtensionKey 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 e12ca21cb1..8eaa285a4a 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 @@ -53,7 +53,7 @@ public class NshTtlConvertor implements ConvertorToOFJava, Convertor return resolveAugmentation( nxmNxNshTtl, path, - NxmNxNshTtlKey.class); + NxmNxNshTtlKey.VALUE); } @Override @@ -69,14 +69,13 @@ public class NshTtlConvertor implements ConvertorToOFJava, Convertor NshTtlValues nshTtlValues = new NshTtlValuesBuilder().setNshTtl(flags).setMask(mask).build(); NxExpMatchEntryValue value = new NshTtlCaseValueBuilder().setNshTtlValues(nshTtlValues).build(); return MatchUtil.createExperimenterMatchEntryBuilder( - org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNshTtl.class, + org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNshTtl.VALUE, NiciraConstants.NX_NSH_VENDOR_ID, value).setHasMask(mask != null).build(); } private static ExtensionAugment> resolveAugmentation( - final NxmNxNshTtl value, - final MatchPath path, final Class key) { + final NxmNxNshTtl value, final MatchPath path, final ExtensionKey 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 26d676a84d..208e1d640f 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 @@ -49,7 +49,7 @@ public class Nshc1Convertor implements ConvertorToOFJava, ConvertorF .setValue(nshcCaseValue.getNshc()) .setMask(nshcCaseValue.getMask()) .build(); - return resolveAugmentation(nxmNxNshc1, path, NxmNxNshc1Key.class); + return resolveAugmentation(nxmNxNshc1, path, NxmNxNshc1Key.VALUE); } @Override @@ -67,13 +67,13 @@ public class Nshc1Convertor implements ConvertorToOFJava, ConvertorF 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.NxmNxNshc1.class, + org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNshc1.VALUE, NiciraConstants.NX_NSH_VENDOR_ID, nshcCaseValue).setHasMask(mask != null).build(); } private static ExtensionAugment> resolveAugmentation( - final NxmNxNshc1 value, final MatchPath path, final Class key) { + final NxmNxNshc1 value, final MatchPath path, final ExtensionKey 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 fc05d8a2c4..39c1f2d2f7 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 @@ -49,7 +49,7 @@ public class Nshc2Convertor implements ConvertorToOFJava, ConvertorF .setValue(nshcCaseValue.getNshc()) .setMask(nshcCaseValue.getMask()) .build(); - return resolveAugmentation(nxmNxNshc2, path, NxmNxNshc2Key.class); + return resolveAugmentation(nxmNxNshc2, path, NxmNxNshc2Key.VALUE); } @Override @@ -67,13 +67,13 @@ public class Nshc2Convertor implements ConvertorToOFJava, ConvertorF 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, + org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNshc2.VALUE, NiciraConstants.NX_NSH_VENDOR_ID, nshcCaseValue).setHasMask(mask != null).build(); } private static ExtensionAugment> resolveAugmentation( - final NxmNxNshc2 value, final MatchPath path, final Class key) { + final NxmNxNshc2 value, final MatchPath path, final ExtensionKey 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 8c571fa40c..a1f74b0b7a 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 @@ -49,7 +49,7 @@ public class Nshc3Convertor implements ConvertorToOFJava, ConvertorF .setValue(nshcCaseValue.getNshc()) .setMask(nshcCaseValue.getMask()) .build(); - return resolveAugmentation(nxmNxNshc3, path, NxmNxNshc3Key.class); + return resolveAugmentation(nxmNxNshc3, path, NxmNxNshc3Key.VALUE); } @Override @@ -67,14 +67,14 @@ public class Nshc3Convertor implements ConvertorToOFJava, ConvertorF 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, + org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNshc3.VALUE, NiciraConstants.NX_NSH_VENDOR_ID, nshcCaseValue).setHasMask(mask != null).build(); } private static ExtensionAugment> resolveAugmentation( final NxmNxNshc3 value, - final MatchPath path, final Class key) { + final MatchPath path, final ExtensionKey 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 aa2e528ce3..131dd8155f 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 @@ -49,7 +49,7 @@ public class Nshc4Convertor implements ConvertorToOFJava, ConvertorF .setValue(nshcCaseValue.getNshc()) .setMask(nshcCaseValue.getMask()) .build(); - return resolveAugmentation(nxmNxNshc4, path, NxmNxNshc4Key.class); + return resolveAugmentation(nxmNxNshc4, path, NxmNxNshc4Key.VALUE); } @Override @@ -67,14 +67,14 @@ public class Nshc4Convertor implements ConvertorToOFJava, ConvertorF 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, + org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNshc4.VALUE, NiciraConstants.NX_NSH_VENDOR_ID, nshcCaseValue).setHasMask(mask != null).build(); } private static ExtensionAugment> resolveAugmentation( final NxmNxNshc4 value, - final MatchPath path, final Class key) { + final MatchPath path, final ExtensionKey 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 52ed1ff84f..54c107e9cf 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 @@ -50,7 +50,7 @@ public class NsiConvertor implements ConvertorToOFJava, ConvertorFro return resolveAugmentation( new NxmNxNsiBuilder().setNsi(nshNsiCaseValue.getNsiValues().getNsi()).build(), path, - NxmNxNsiKey.class); + NxmNxNsiKey.VALUE); } @Override @@ -68,13 +68,13 @@ public class NsiConvertor implements ConvertorToOFJava, ConvertorFro NsiValues nsiValues = new NsiValuesBuilder().setNsi(nsi).setMask(mask).build(); NsiCaseValue nsiCaseValue = new NsiCaseValueBuilder().setNsiValues(nsiValues).build(); return MatchUtil.createExperimenterMatchEntryBuilder( - org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNsi.class, + org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNsi.VALUE, NiciraConstants.NX_NSH_VENDOR_ID, nsiCaseValue).setHasMask(mask != null).build(); } private static ExtensionAugment> resolveAugmentation(final NxmNxNsi value, - final MatchPath path, final Class key) { + final MatchPath path, final ExtensionKey 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 85a154388b..a685ccbce8 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 @@ -51,7 +51,7 @@ public class NspConvertor implements ConvertorToOFJava, ConvertorFro return resolveAugmentation( new NxmNxNspBuilder().setValue(nshNspCaseValue.getNspValues().getNsp()).build(), path, - NxmNxNspKey.class); + NxmNxNspKey.VALUE); } @Override @@ -69,13 +69,13 @@ public class NspConvertor implements ConvertorToOFJava, ConvertorFro NspValues nspValues = new NspValuesBuilder().setNsp(nsp).setMask(mask).build(); NspCaseValue nspCaseValue = new NspCaseValueBuilder().setNspValues(nspValues).build(); return MatchUtil.createExperimenterMatchEntryBuilder( - org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNsp.class, + org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNsp.VALUE, NiciraConstants.NX_NSH_VENDOR_ID, nspCaseValue).setHasMask(mask != null).build(); } private static ExtensionAugment> resolveAugmentation(final NxmNxNsp value, - final MatchPath path, final Class key) { + final MatchPath path, final ExtensionKey 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 a0ef810dab..d0714014c7 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 @@ -46,7 +46,7 @@ public class NxmInPortConvertor implements ConvertorToOFJava, .getMatchEntryValue(); return NxmInPortConvertor.resolveAugmentation(new OfInPortBuilder() .setValue(inPortCaseValue.getNxmOfInPortValues().getValue()) - .build(), path, NxmOfInPortKey.class); + .build(), path, NxmOfInPortKey.VALUE); } @Override @@ -60,14 +60,14 @@ public class NxmInPortConvertor implements ConvertorToOFJava, 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()) + org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfInPort.VALUE, + Nxm0Class.VALUE, inPortCaseValueBuilder.build()) .build(); } private static ExtensionAugment> resolveAugmentation( 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) { + .in.port.grouping.OfInPort value, final MatchPath path, final ExtensionKey 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 09cc00d92c..9a74cbac8f 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 @@ -52,8 +52,8 @@ public class PktMarkConvertor implements ConvertorToOFJava, Converto pktMarkCaseValueBuilder.setPktMarkValues(pktMarkValuesBuilder.build()); MatchEntryBuilder ofMatch = MatchUtil .createDefaultMatchEntryBuilder(org.opendaylight.yang.gen.v1.urn - .opendaylight.openflowjava.nx.match.rev140421.NxmNxPktMark.class, - Nxm1Class.class, pktMarkCaseValueBuilder.build()); + .opendaylight.openflowjava.nx.match.rev140421.NxmNxPktMark.VALUE, + Nxm1Class.VALUE, pktMarkCaseValueBuilder.build()); return ofMatch.build(); } @@ -63,12 +63,11 @@ public class PktMarkConvertor implements ConvertorToOFJava, Converto NxmNxPktMarkBuilder pktMarkBuilder = new NxmNxPktMarkBuilder(); pktMarkBuilder.setPktMark(pktMarkCaseValue.getPktMarkValues().getPktMark()); pktMarkBuilder.setMask(pktMarkCaseValue.getPktMarkValues().getMask()); - return resolveAugmentation(pktMarkBuilder.build(), path, - NxmNxPktMarkKey.class); + return resolveAugmentation(pktMarkBuilder.build(), path, NxmNxPktMarkKey.VALUE); } private static ExtensionAugment> resolveAugmentation(final NxmNxPktMark value, - final MatchPath path, final Class key) { + final MatchPath path, final ExtensionKey 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 0cc4f64c2f..42bb027d1e 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 @@ -60,16 +60,16 @@ public class RegConvertor implements ConvertorToOFJava, ConvertorFro @Override public ExtensionAugment> convert(final MatchEntry input, final MatchPath path) { NxmNxRegBuilder nxRegBuilder = new NxmNxRegBuilder(); - if (!org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxReg.class - .isAssignableFrom(input.getOxmMatchField())) { + if (!(input.getOxmMatchField() + instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxReg)) { String msg = input.getOxmMatchField() + " does not implement " + org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxReg.class; LOG.warn("Warning {}",msg); throw new IllegalStateException(msg); } - nxRegBuilder.setReg((Class) input.getOxmMatchField()); + nxRegBuilder.setReg((org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxReg) + input.getOxmMatchField()); RegCaseValue regCaseValue = (RegCaseValue) input.getMatchEntryValue(); nxRegBuilder.setValue(regCaseValue.getRegValues().getValue()); @@ -94,42 +94,43 @@ public class RegConvertor implements ConvertorToOFJava, ConvertorFro RegCaseValueBuilder regCaseValueBuilder = new RegCaseValueBuilder(); regCaseValueBuilder.setRegValues(regValuesBuilder.build()); return MatchUtil.createDefaultMatchEntryBuilder(nxmNxReg.getReg(), - Nxm1Class.class, + Nxm1Class.VALUE, regCaseValueBuilder.build()) .setHasMask(nxmNxReg.getMask() != null) .build(); } - private static Class resolveRegKey(final Class oxmMatchField) { - if (NiciraMatchCodecs.REG0_CODEC.getNxmField().isAssignableFrom(oxmMatchField)) { - return NxmNxReg0Key.class; + private static ExtensionKey resolveRegKey(final MatchField oxmMatchField) { + // FIXME: Use direct field value equalitity + if (NiciraMatchCodecs.REG0_CODEC.getNxmField().equals(oxmMatchField)) { + return NxmNxReg0Key.VALUE; } - if (NiciraMatchCodecs.REG1_CODEC.getNxmField().isAssignableFrom(oxmMatchField)) { - return NxmNxReg1Key.class; + if (NiciraMatchCodecs.REG1_CODEC.getNxmField().equals(oxmMatchField)) { + return NxmNxReg1Key.VALUE; } - if (NiciraMatchCodecs.REG2_CODEC.getNxmField().isAssignableFrom(oxmMatchField)) { - return NxmNxReg2Key.class; + if (NiciraMatchCodecs.REG2_CODEC.getNxmField().equals(oxmMatchField)) { + return NxmNxReg2Key.VALUE; } - if (NiciraMatchCodecs.REG3_CODEC.getNxmField().isAssignableFrom(oxmMatchField)) { - return NxmNxReg3Key.class; + if (NiciraMatchCodecs.REG3_CODEC.getNxmField().equals(oxmMatchField)) { + return NxmNxReg3Key.VALUE; } - if (NiciraMatchCodecs.REG4_CODEC.getNxmField().isAssignableFrom(oxmMatchField)) { - return NxmNxReg4Key.class; + if (NiciraMatchCodecs.REG4_CODEC.getNxmField().equals(oxmMatchField)) { + return NxmNxReg4Key.VALUE; } - if (NiciraMatchCodecs.REG5_CODEC.getNxmField().isAssignableFrom(oxmMatchField)) { - return NxmNxReg5Key.class; + if (NiciraMatchCodecs.REG5_CODEC.getNxmField().equals(oxmMatchField)) { + return NxmNxReg5Key.VALUE; } - if (NiciraMatchCodecs.REG6_CODEC.getNxmField().isAssignableFrom(oxmMatchField)) { - return NxmNxReg6Key.class; + if (NiciraMatchCodecs.REG6_CODEC.getNxmField().equals(oxmMatchField)) { + return NxmNxReg6Key.VALUE; } - if (NiciraMatchCodecs.REG7_CODEC.getNxmField().isAssignableFrom(oxmMatchField)) { - return NxmNxReg7Key.class; + if (NiciraMatchCodecs.REG7_CODEC.getNxmField().equals(oxmMatchField)) { + return NxmNxReg7Key.VALUE; } throw new CodecPreconditionException("There is no key for " + oxmMatchField); } private static ExtensionAugment> resolveAugmentation(final NxmNxReg nxmNxReg, - final MatchPath path, final Class key) { + final MatchPath path, final ExtensionKey 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/TcpDstConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TcpDstConvertor.java index 005903f118..fa7cb6fc43 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 @@ -50,8 +50,7 @@ public class TcpDstConvertor implements ConvertorToOFJava, Convertor NxmOfTcpDstBuilder tcpDstBuilder = new NxmOfTcpDstBuilder(); tcpDstBuilder.setPort(tcpDstCaseValue.getTcpDstValues().getPort()); tcpDstBuilder.setMask(tcpDstCaseValue.getTcpDstValues().getMask()); - return resolveAugmentation(tcpDstBuilder.build(), path, - NxmOfTcpDstKey.class); + return resolveAugmentation(tcpDstBuilder.build(), path, NxmOfTcpDstKey.VALUE); } @Override @@ -67,14 +66,14 @@ public class TcpDstConvertor implements ConvertorToOFJava, Convertor tcpDstCaseValueBuilder.setTcpDstValues(tcpDstValuesBuilder.build()); MatchEntryBuilder ofMatch = MatchUtil .createDefaultMatchEntryBuilder(org.opendaylight.yang.gen.v1.urn - .opendaylight.openflowjava.nx.match.rev140421.NxmOfTcpDst.class, - Nxm0Class.class, tcpDstCaseValueBuilder.build()); + .opendaylight.openflowjava.nx.match.rev140421.NxmOfTcpDst.VALUE, + Nxm0Class.VALUE, tcpDstCaseValueBuilder.build()); ofMatch.setHasMask(true); return ofMatch.build(); } private static ExtensionAugment> resolveAugmentation(final NxmOfTcpDst value, - final MatchPath path, final Class key) { + final MatchPath path, final ExtensionKey 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 534eaaa17e..6e8c0f4e96 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 @@ -49,7 +49,7 @@ public class TcpSrcConvertor implements ConvertorToOFJava, Convertor 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.VALUE); } @Override @@ -65,14 +65,14 @@ public class TcpSrcConvertor implements ConvertorToOFJava, Convertor tcpSrcCaseValueBuilder.setTcpSrcValues(tcpSrcValuesBuilder.build()); MatchEntryBuilder ofMatch = MatchUtil .createDefaultMatchEntryBuilder(org.opendaylight.yang.gen.v1.urn - .opendaylight.openflowjava.nx.match.rev140421.NxmOfTcpSrc.class, - Nxm0Class.class, tcpSrcCaseValueBuilder.build()); + .opendaylight.openflowjava.nx.match.rev140421.NxmOfTcpSrc.VALUE, + Nxm0Class.VALUE, tcpSrcCaseValueBuilder.build()); ofMatch.setHasMask(true); return ofMatch.build(); } private static ExtensionAugment> resolveAugmentation(final NxmOfTcpSrc value, - final MatchPath path, final Class key) { + final MatchPath path, final ExtensionKey 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 93c88624bc..38cad0cb97 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 @@ -37,7 +37,7 @@ import org.opendaylight.yangtools.yang.binding.Augmentation; public class TunIPv4DstConvertor implements ConvertorToOFJava, ConvertorFromOFJava { private static ExtensionAugment> resolveAugmentation(final NxmNxTunIpv4Dst value, - final MatchPath path, final Class key) { + final MatchPath path, final ExtensionKey key) { switch (path) { case FLOWS_STATISTICS_UPDATE_MATCH: return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class, @@ -65,7 +65,7 @@ public class TunIPv4DstConvertor implements ConvertorToOFJava, Conve TunIpv4DstCaseValue tunIpv4DstCaseValue = (TunIpv4DstCaseValue) input.getMatchEntryValue(); return resolveAugmentation(new NxmNxTunIpv4DstBuilder() .setIpv4Address(MatchUtil.uint32ToIpv4Address(tunIpv4DstCaseValue.getTunIpv4DstValues().getValue())) - .build(), path, NxmNxTunIpv4DstKey.class); + .build(), path, NxmNxTunIpv4DstKey.VALUE); } @Override @@ -75,8 +75,8 @@ public class TunIPv4DstConvertor implements ConvertorToOFJava, Conve .getNxmNxTunIpv4Dst().getIpv4Address(); return MatchUtil.createDefaultMatchEntryBuilder( - org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxTunIpv4Dst.class, - Nxm1Class.class, new TunIpv4DstCaseValueBuilder() + org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxTunIpv4Dst.VALUE, + Nxm1Class.VALUE, new TunIpv4DstCaseValueBuilder() .setTunIpv4DstValues(new TunIpv4DstValuesBuilder() .setValue(MatchUtil.ipv4ToUint32(value)) .build()) 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 cc8f834d1d..14198ec1ba 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 @@ -37,7 +37,7 @@ import org.opendaylight.yangtools.yang.binding.Augmentation; public class TunIPv4SrcConvertor implements ConvertorToOFJava, ConvertorFromOFJava { private static ExtensionAugment> resolveAugmentation(final NxmNxTunIpv4Src value, - final MatchPath path, final Class key) { + final MatchPath path, final ExtensionKey key) { switch (path) { case FLOWS_STATISTICS_UPDATE_MATCH: return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class, @@ -65,7 +65,7 @@ public class TunIPv4SrcConvertor implements ConvertorToOFJava, Conve TunIpv4SrcCaseValue tunIpv4SrcCaseValue = (TunIpv4SrcCaseValue) input.getMatchEntryValue(); return resolveAugmentation(new NxmNxTunIpv4SrcBuilder() .setIpv4Address(MatchUtil.uint32ToIpv4Address(tunIpv4SrcCaseValue.getTunIpv4SrcValues().getValue())) - .build(), path, NxmNxTunIpv4SrcKey.class); + .build(), path, NxmNxTunIpv4SrcKey.VALUE); } @Override @@ -75,8 +75,8 @@ public class TunIPv4SrcConvertor implements ConvertorToOFJava, Conve .getNxmNxTunIpv4Src().getIpv4Address(); return MatchUtil.createDefaultMatchEntryBuilder( - org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxTunIpv4Src.class, - Nxm1Class.class, new TunIpv4SrcCaseValueBuilder() + org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxTunIpv4Src.VALUE, + Nxm1Class.VALUE, new TunIpv4SrcCaseValueBuilder() .setTunIpv4SrcValues(new TunIpv4SrcValuesBuilder() .setValue(MatchUtil.ipv4ToUint32(value)) .build()) 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 2fca2b78c1..5c31948d1b 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 @@ -47,7 +47,7 @@ public class TunIdConvertor implements ConvertorToOFJava, ConvertorF public ExtensionAugment> convert(final MatchEntry input, final MatchPath path) { TunIdCaseValue tunnelIdCase = (TunIdCaseValue) input.getMatchEntryValue(); return resolveAugmentation(new NxmNxTunIdBuilder().setValue(tunnelIdCase.getTunIdValues().getValue()).build(), - path, NxmNxTunIdKey.class); + path, NxmNxTunIdKey.VALUE); } @Override @@ -65,13 +65,13 @@ public class TunIdConvertor implements ConvertorToOFJava, ConvertorF tunnelIdCaseBuilder.setTunIdValues(tunnelIdBuilder.build()); return MatchUtil.createDefaultMatchEntryBuilder( - org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxTunId.class, - Nxm1Class.class, tunnelIdCaseBuilder.build()).build(); + org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxTunId.VALUE, + Nxm1Class.VALUE, tunnelIdCaseBuilder.build()).build(); } private static ExtensionAugment> resolveAugmentation(final NxmNxTunId value, - final MatchPath path, final Class key) { + final MatchPath path, final ExtensionKey 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/UdpDstConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/UdpDstConvertor.java index f5b814ebf4..47b7dd4ef0 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 @@ -50,8 +50,7 @@ public class UdpDstConvertor implements ConvertorToOFJava, Convertor NxmOfUdpDstBuilder udpDstBuilder = new NxmOfUdpDstBuilder(); udpDstBuilder.setPort(udpDstCaseValue.getUdpDstValues().getPort()); udpDstBuilder.setMask(udpDstCaseValue.getUdpDstValues().getMask()); - return resolveAugmentation(udpDstBuilder.build(), path, - NxmOfUdpDstKey.class); + return resolveAugmentation(udpDstBuilder.build(), path, NxmOfUdpDstKey.VALUE); } @Override @@ -67,14 +66,14 @@ public class UdpDstConvertor implements ConvertorToOFJava, Convertor udpDstCaseValueBuilder.setUdpDstValues(udpDstValuesBuilder.build()); MatchEntryBuilder ofMatch = MatchUtil .createDefaultMatchEntryBuilder(org.opendaylight.yang.gen.v1.urn.opendaylight - .openflowjava.nx.match.rev140421.NxmOfUdpDst.class, - Nxm0Class.class,udpDstCaseValueBuilder.build()); + .openflowjava.nx.match.rev140421.NxmOfUdpDst.VALUE, + Nxm0Class.VALUE, udpDstCaseValueBuilder.build()); ofMatch.setHasMask(true); return ofMatch.build(); } private static ExtensionAugment> resolveAugmentation(final NxmOfUdpDst value, - final MatchPath path, final Class key) { + final MatchPath path, final ExtensionKey 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 9da402ae2c..139805c50e 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 @@ -50,8 +50,7 @@ public class UdpSrcConvertor implements ConvertorToOFJava, Convertor NxmOfUdpSrcBuilder udpSrcBuilder = new NxmOfUdpSrcBuilder(); udpSrcBuilder.setPort(udpSrcCaseValue.getUdpSrcValues().getPort()); udpSrcBuilder.setMask(udpSrcCaseValue.getUdpSrcValues().getMask()); - return resolveAugmentation(udpSrcBuilder.build(), path, - NxmOfUdpSrcKey.class); + return resolveAugmentation(udpSrcBuilder.build(), path, NxmOfUdpSrcKey.VALUE); } @Override @@ -67,14 +66,14 @@ public class UdpSrcConvertor implements ConvertorToOFJava, Convertor udpSrcCaseValueBuilder.setUdpSrcValues(udpSrcValuesBuilder.build()); MatchEntryBuilder ofMatch = MatchUtil .createDefaultMatchEntryBuilder(org.opendaylight.yang.gen.v1.urn.opendaylight - .openflowjava.nx.match.rev140421.NxmOfUdpSrc.class, - Nxm0Class.class, udpSrcCaseValueBuilder.build()); + .openflowjava.nx.match.rev140421.NxmOfUdpSrc.VALUE, + Nxm0Class.VALUE, udpSrcCaseValueBuilder.build()); ofMatch.setHasMask(true); return ofMatch.build(); } private static ExtensionAugment> resolveAugmentation(final NxmOfUdpSrc value, - final MatchPath path, final Class key) { + final MatchPath path, final ExtensionKey key) { switch (path) { case FLOWS_STATISTICS_UPDATE_MATCH: return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class, 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 eb0edce2e0..7264ed86c9 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 @@ -13,7 +13,8 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; 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.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; +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.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.ofj.aug.nx.action.ActionConntrack; @@ -55,8 +56,8 @@ public class ConntrackConvertorTest { final NxActionNatBuilder nxActionNatBuilder = new NxActionNatBuilder() .setFlags(Uint16.ONE) .setRangePresent(Uint16.TWO) - .setIpAddressMin(IpAddressBuilder.getDefaultInstance("192.168.0.0")) - .setIpAddressMin(IpAddressBuilder.getDefaultInstance("192.168.10.0")) + .setIpAddressMin(new IpAddress(new Ipv4Address("192.168.0.0"))) + .setIpAddressMin(new IpAddress(new Ipv4Address("192.168.10.0"))) .setPortMin(Uint16.valueOf(3000)) .setPortMax(Uint16.valueOf(4000)); final CtActionsBuilder ctActionsBuilder = new CtActionsBuilder().setOfpactActions(new NxActionNatCaseBuilder() @@ -113,8 +114,8 @@ public class ConntrackConvertorTest { .NxActionNatBuilder() .setFlags(Uint16.ONE) .setRangePresent(Uint16.TWO) - .setIpAddressMin(IpAddressBuilder.getDefaultInstance("192.168.0.0")) - .setIpAddressMax(IpAddressBuilder.getDefaultInstance("192.168.10.0")) + .setIpAddressMin(new IpAddress(new Ipv4Address("192.168.0.0"))) + .setIpAddressMax(new IpAddress(new Ipv4Address("192.168.10.0"))) .setPortMin(Uint16.valueOf(3000)) .setPortMax(Uint16.valueOf(4000)); org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.conntrack.grouping diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/FieldChoiceResolverTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/FieldChoiceResolverTest.java index d0a623a5d9..439214a7ab 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/FieldChoiceResolverTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/FieldChoiceResolverTest.java @@ -353,59 +353,59 @@ public class FieldChoiceResolverTest { }, { NiciraMatchCodecs.REG0_CODEC.getHeaderWithoutHasMask(), - new DstNxRegCaseBuilder().setNxReg(NxmNxReg0.class).build(), - new DstNxRegCaseBuilder().setNxReg(NxmNxReg0.class).build(), - new SrcNxRegCaseBuilder().setNxReg(NxmNxReg0.class).build(), - new SrcNxRegCaseBuilder().setNxReg(NxmNxReg0.class).build() + new DstNxRegCaseBuilder().setNxReg(NxmNxReg0.VALUE).build(), + new DstNxRegCaseBuilder().setNxReg(NxmNxReg0.VALUE).build(), + new SrcNxRegCaseBuilder().setNxReg(NxmNxReg0.VALUE).build(), + new SrcNxRegCaseBuilder().setNxReg(NxmNxReg0.VALUE).build() }, { NiciraMatchCodecs.REG1_CODEC.getHeaderWithoutHasMask(), - new DstNxRegCaseBuilder().setNxReg(NxmNxReg1.class).build(), - new DstNxRegCaseBuilder().setNxReg(NxmNxReg1.class).build(), - new SrcNxRegCaseBuilder().setNxReg(NxmNxReg1.class).build(), - new SrcNxRegCaseBuilder().setNxReg(NxmNxReg1.class).build() + new DstNxRegCaseBuilder().setNxReg(NxmNxReg1.VALUE).build(), + new DstNxRegCaseBuilder().setNxReg(NxmNxReg1.VALUE).build(), + new SrcNxRegCaseBuilder().setNxReg(NxmNxReg1.VALUE).build(), + new SrcNxRegCaseBuilder().setNxReg(NxmNxReg1.VALUE).build() }, { NiciraMatchCodecs.REG2_CODEC.getHeaderWithoutHasMask(), - new DstNxRegCaseBuilder().setNxReg(NxmNxReg2.class).build(), - new DstNxRegCaseBuilder().setNxReg(NxmNxReg2.class).build(), - new SrcNxRegCaseBuilder().setNxReg(NxmNxReg2.class).build(), - new SrcNxRegCaseBuilder().setNxReg(NxmNxReg2.class).build() + new DstNxRegCaseBuilder().setNxReg(NxmNxReg2.VALUE).build(), + new DstNxRegCaseBuilder().setNxReg(NxmNxReg2.VALUE).build(), + new SrcNxRegCaseBuilder().setNxReg(NxmNxReg2.VALUE).build(), + new SrcNxRegCaseBuilder().setNxReg(NxmNxReg2.VALUE).build() }, { NiciraMatchCodecs.REG3_CODEC.getHeaderWithoutHasMask(), - new DstNxRegCaseBuilder().setNxReg(NxmNxReg3.class).build(), - new DstNxRegCaseBuilder().setNxReg(NxmNxReg3.class).build(), - new SrcNxRegCaseBuilder().setNxReg(NxmNxReg3.class).build(), - new SrcNxRegCaseBuilder().setNxReg(NxmNxReg3.class).build() + new DstNxRegCaseBuilder().setNxReg(NxmNxReg3.VALUE).build(), + new DstNxRegCaseBuilder().setNxReg(NxmNxReg3.VALUE).build(), + new SrcNxRegCaseBuilder().setNxReg(NxmNxReg3.VALUE).build(), + new SrcNxRegCaseBuilder().setNxReg(NxmNxReg3.VALUE).build() }, { NiciraMatchCodecs.REG4_CODEC.getHeaderWithoutHasMask(), - new DstNxRegCaseBuilder().setNxReg(NxmNxReg4.class).build(), - new DstNxRegCaseBuilder().setNxReg(NxmNxReg4.class).build(), - new SrcNxRegCaseBuilder().setNxReg(NxmNxReg4.class).build(), - new SrcNxRegCaseBuilder().setNxReg(NxmNxReg4.class).build() + new DstNxRegCaseBuilder().setNxReg(NxmNxReg4.VALUE).build(), + new DstNxRegCaseBuilder().setNxReg(NxmNxReg4.VALUE).build(), + new SrcNxRegCaseBuilder().setNxReg(NxmNxReg4.VALUE).build(), + new SrcNxRegCaseBuilder().setNxReg(NxmNxReg4.VALUE).build() }, { NiciraMatchCodecs.REG5_CODEC.getHeaderWithoutHasMask(), - new DstNxRegCaseBuilder().setNxReg(NxmNxReg5.class).build(), - new DstNxRegCaseBuilder().setNxReg(NxmNxReg5.class).build(), - new SrcNxRegCaseBuilder().setNxReg(NxmNxReg5.class).build(), - new SrcNxRegCaseBuilder().setNxReg(NxmNxReg5.class).build() + new DstNxRegCaseBuilder().setNxReg(NxmNxReg5.VALUE).build(), + new DstNxRegCaseBuilder().setNxReg(NxmNxReg5.VALUE).build(), + new SrcNxRegCaseBuilder().setNxReg(NxmNxReg5.VALUE).build(), + new SrcNxRegCaseBuilder().setNxReg(NxmNxReg5.VALUE).build() }, { NiciraMatchCodecs.REG6_CODEC.getHeaderWithoutHasMask(), - new DstNxRegCaseBuilder().setNxReg(NxmNxReg6.class).build(), - new DstNxRegCaseBuilder().setNxReg(NxmNxReg6.class).build(), - new SrcNxRegCaseBuilder().setNxReg(NxmNxReg6.class).build(), - new SrcNxRegCaseBuilder().setNxReg(NxmNxReg6.class).build() + new DstNxRegCaseBuilder().setNxReg(NxmNxReg6.VALUE).build(), + new DstNxRegCaseBuilder().setNxReg(NxmNxReg6.VALUE).build(), + new SrcNxRegCaseBuilder().setNxReg(NxmNxReg6.VALUE).build(), + new SrcNxRegCaseBuilder().setNxReg(NxmNxReg6.VALUE).build() }, { NiciraMatchCodecs.REG7_CODEC.getHeaderWithoutHasMask(), - new DstNxRegCaseBuilder().setNxReg(NxmNxReg7.class).build(), - new DstNxRegCaseBuilder().setNxReg(NxmNxReg7.class).build(), - new SrcNxRegCaseBuilder().setNxReg(NxmNxReg7.class).build(), - new SrcNxRegCaseBuilder().setNxReg(NxmNxReg7.class).build() + new DstNxRegCaseBuilder().setNxReg(NxmNxReg7.VALUE).build(), + new DstNxRegCaseBuilder().setNxReg(NxmNxReg7.VALUE).build(), + new SrcNxRegCaseBuilder().setNxReg(NxmNxReg7.VALUE).build(), + new SrcNxRegCaseBuilder().setNxReg(NxmNxReg7.VALUE).build() } }); } 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 300ea6c56a..9ce50bfa43 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 @@ -33,17 +33,12 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.ni import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.nxm.of.arp.op.grouping.NxmOfArpOpBuilder; import org.opendaylight.yangtools.yang.binding.Augmentation; import org.opendaylight.yangtools.yang.common.Uint16; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Test for {@link ArpOpConvertor}. */ @RunWith(MockitoJUnitRunner.class) public class ArpOpConvertorTest { - - private static final Logger LOG = LoggerFactory.getLogger(ArpOpConvertorTest.class); - @Mock private Extension extension; @Mock @@ -86,25 +81,25 @@ public class ArpOpConvertorTest { MatchPath.PACKET_RECEIVED_MATCH); Assert.assertEquals(arpOpCase.getArpOp().getOpCode(), ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmOfArpOp().getValue()); - Assert.assertEquals(extensionAugment.getKey(), NxmOfArpOpKey.class); + Assert.assertEquals(NxmOfArpOpKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment1 = arpOpConvertor.convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH); Assert.assertEquals(arpOpCase.getArpOp().getOpCode(), ((NxAugMatchNodesNodeTableFlow) extensionAugment1.getAugmentationObject()).getNxmOfArpOp().getValue()); - Assert.assertEquals(extensionAugment1.getKey(), NxmOfArpOpKey.class); + Assert.assertEquals(NxmOfArpOpKey.VALUE, extensionAugment1.getKey()); final ExtensionAugment> extensionAugment2 = arpOpConvertor.convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH); Assert.assertEquals(arpOpCase.getArpOp().getOpCode(), ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment2.getAugmentationObject()).getNxmOfArpOp() .getValue()); - Assert.assertEquals(extensionAugment2.getKey(), NxmOfArpOpKey.class); + Assert.assertEquals(NxmOfArpOpKey.VALUE, extensionAugment2.getKey()); final ExtensionAugment> extensionAugment3 = arpOpConvertor.convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH); Assert.assertEquals(arpOpCase.getArpOp().getOpCode(), ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmOfArpOp().getValue()); - Assert.assertEquals(extensionAugment3.getKey(), NxmOfArpOpKey.class); + Assert.assertEquals(NxmOfArpOpKey.VALUE, extensionAugment3.getKey()); } } 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 a95ea33eb3..969d4f9717 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 @@ -32,8 +32,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.ni import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxmNxArpShaKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.nxm.nx.arp.sha.grouping.NxmNxArpShaBuilder; import org.opendaylight.yangtools.yang.binding.Augmentation; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Test for {@link ArpShaConvertor}. @@ -48,9 +46,7 @@ public class ArpShaConvertorTest { private ArpShaConvertor arpShaConvertor; - private static final MacAddress MAC_ADDRESS = MacAddress.getDefaultInstance("01:23:45:67:89:AB"); - - private static final Logger LOG = LoggerFactory.getLogger(ArpShaConvertorTest.class); + private static final MacAddress MAC_ADDRESS = new MacAddress("01:23:45:67:89:AB"); @Before public void setUp() { @@ -87,28 +83,27 @@ public class ArpShaConvertorTest { MatchPath.PACKET_RECEIVED_MATCH); Assert.assertEquals(arpShaCaseValue.getArpShaValues().getMacAddress(), ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmNxArpSha().getMacAddress()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxArpShaKey.class); + Assert.assertEquals(NxmNxArpShaKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment1 = arpShaConvertor .convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH); Assert.assertEquals(arpShaCaseValue.getArpShaValues().getMacAddress(), ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject()).getNxmNxArpSha() .getMacAddress()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxArpShaKey.class); + Assert.assertEquals(NxmNxArpShaKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment2 = arpShaConvertor .convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH); Assert.assertEquals(arpShaCaseValue.getArpShaValues().getMacAddress(), ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()).getNxmNxArpSha() .getMacAddress()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxArpShaKey.class); + Assert.assertEquals(NxmNxArpShaKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment3 = arpShaConvertor .convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH); Assert.assertEquals(arpShaCaseValue.getArpShaValues().getMacAddress(), ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmNxArpSha() .getMacAddress()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxArpShaKey.class); + Assert.assertEquals(NxmNxArpShaKey.VALUE, extensionAugment.getKey()); } - } 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 4d3be6a2ad..3073e9d587 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 @@ -86,24 +86,24 @@ public class ArpSpaConvertorTest { MatchPath.PACKET_RECEIVED_MATCH); Assert.assertEquals(IPV4_ADDRESS, ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmOfArpSpa().getIpv4Address()); - Assert.assertEquals(extensionAugment.getKey(), NxmOfArpSpaKey.class); + Assert.assertEquals(NxmOfArpSpaKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment1 = arpSpaConvertor .convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH); Assert.assertEquals(IPV4_ADDRESS, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject()) .getNxmOfArpSpa().getIpv4Address()); - Assert.assertEquals(extensionAugment.getKey(), NxmOfArpSpaKey.class); + Assert.assertEquals(NxmOfArpSpaKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment2 = arpSpaConvertor .convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH); Assert.assertEquals(IPV4_ADDRESS, ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()) .getNxmOfArpSpa().getIpv4Address()); - Assert.assertEquals(extensionAugment.getKey(), NxmOfArpSpaKey.class); + Assert.assertEquals(NxmOfArpSpaKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment3 = arpSpaConvertor .convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH); Assert.assertEquals(IPV4_ADDRESS, ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()) .getNxmOfArpSpa().getIpv4Address()); - Assert.assertEquals(extensionAugment.getKey(), NxmOfArpSpaKey.class); + Assert.assertEquals(NxmOfArpSpaKey.VALUE, extensionAugment.getKey()); } } 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 9d8d8d87e6..75c106b0d4 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 @@ -84,27 +84,27 @@ public class ArpThaConvertorTest { MatchPath.PACKET_RECEIVED_MATCH); Assert.assertEquals(arpThaCaseValue.getArpThaValues().getMacAddress(), ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmNxArpTha().getMacAddress()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxArpThaKey.class); + Assert.assertEquals(NxmNxArpThaKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment1 = arpThaConvertor .convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH); Assert.assertEquals(arpThaCaseValue.getArpThaValues().getMacAddress(), ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject()).getNxmNxArpTha() .getMacAddress()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxArpThaKey.class); + Assert.assertEquals(NxmNxArpThaKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment2 = arpThaConvertor .convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH); Assert.assertEquals(arpThaCaseValue.getArpThaValues().getMacAddress(), ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()).getNxmNxArpTha() .getMacAddress()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxArpThaKey.class); + Assert.assertEquals(NxmNxArpThaKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment3 = arpThaConvertor .convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH); Assert.assertEquals(arpThaCaseValue.getArpThaValues().getMacAddress(), ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmNxArpTha() .getMacAddress()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxArpThaKey.class); + Assert.assertEquals(NxmNxArpThaKey.VALUE, extensionAugment.getKey()); } } 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 a4aeb90dee..dd9f83ab79 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 @@ -46,7 +46,7 @@ public class ArpTpaConvertorTest { @Mock private MatchEntry matchEntry; - private static final Ipv4Address IPV4_ADDRESS = Ipv4Address.getDefaultInstance("1.2.3.4"); + private static final Ipv4Address IPV4_ADDRESS = new Ipv4Address("1.2.3.4"); private ArpTpaConvertor arpTpaConvertor; @@ -87,24 +87,24 @@ public class ArpTpaConvertorTest { MatchPath.PACKET_RECEIVED_MATCH); Assert.assertEquals(IPV4_ADDRESS, ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmOfArpTpa().getIpv4Address()); - Assert.assertEquals(extensionAugment.getKey(), NxmOfArpTpaKey.class); + Assert.assertEquals(NxmOfArpTpaKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment1 = arpTpaConvertor .convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH); Assert.assertEquals(IPV4_ADDRESS, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject()) .getNxmOfArpTpa().getIpv4Address()); - Assert.assertEquals(extensionAugment.getKey(), NxmOfArpTpaKey.class); + Assert.assertEquals(NxmOfArpTpaKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment2 = arpTpaConvertor .convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH); Assert.assertEquals(IPV4_ADDRESS, ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()) .getNxmOfArpTpa().getIpv4Address()); - Assert.assertEquals(extensionAugment.getKey(), NxmOfArpTpaKey.class); + Assert.assertEquals(NxmOfArpTpaKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment3 = arpTpaConvertor .convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH); Assert.assertEquals(IPV4_ADDRESS, ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()) .getNxmOfArpTpa().getIpv4Address()); - Assert.assertEquals(extensionAugment.getKey(), NxmOfArpTpaKey.class); + Assert.assertEquals(NxmOfArpTpaKey.VALUE, extensionAugment.getKey()); } } 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 6fb8576b83..520fec5eb2 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 @@ -91,7 +91,7 @@ public class CtStateConvertorTest { .getCtState().longValue()); Assert.assertEquals(4L, ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmNxCtState() .getMask().longValue()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxCtStateKey.class); + Assert.assertEquals(NxmNxCtStateKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment1 = ctStateConvertor .convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH); @@ -99,7 +99,7 @@ public class CtStateConvertorTest { .getNxmNxCtState().getCtState().longValue()); Assert.assertEquals(4L, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject()) .getNxmNxCtState().getMask().longValue()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxCtStateKey.class); + Assert.assertEquals(NxmNxCtStateKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment2 = ctStateConvertor .convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH); @@ -107,7 +107,7 @@ public class CtStateConvertorTest { .getNxmNxCtState().getCtState().longValue()); Assert.assertEquals(4L, ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()) .getNxmNxCtState().getMask().longValue()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxCtStateKey.class); + Assert.assertEquals(NxmNxCtStateKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment3 = ctStateConvertor .convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH); @@ -115,6 +115,6 @@ public class CtStateConvertorTest { .getNxmNxCtState().getCtState().longValue()); Assert.assertEquals(4L, ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()) .getNxmNxCtState().getMask().longValue()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxCtStateKey.class); + Assert.assertEquals(NxmNxCtStateKey.VALUE, extensionAugment.getKey()); } } 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 9a60467385..f2b82bc4f8 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 @@ -85,24 +85,24 @@ public class CtZoneConvertorTest { MatchPath.PACKET_RECEIVED_MATCH); Assert.assertEquals(2L, ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmNxCtZone() .getCtZone().longValue()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxCtZoneKey.class); + Assert.assertEquals(NxmNxCtZoneKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment1 = ctZoneConvertor .convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH); Assert.assertEquals(2L, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject()) .getNxmNxCtZone().getCtZone().longValue()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxCtZoneKey.class); + Assert.assertEquals(NxmNxCtZoneKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment2 = ctZoneConvertor .convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH); Assert.assertEquals(2L, ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()) .getNxmNxCtZone().getCtZone().longValue()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxCtZoneKey.class); + Assert.assertEquals(NxmNxCtZoneKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment3 = ctZoneConvertor .convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH); Assert.assertEquals(2L, ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmNxCtZone() .getCtZone().longValue()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxCtZoneKey.class); + Assert.assertEquals(NxmNxCtZoneKey.VALUE, extensionAugment.getKey()); } } 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 6a92463214..edeb83d685 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 @@ -87,24 +87,24 @@ public class EthDstConvertorTest { MatchPath.PACKET_RECEIVED_MATCH); Assert.assertEquals(MAC_ADDRESS, ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmOfEthDst().getMacAddress()); - Assert.assertEquals(extensionAugment.getKey(), NxmOfEthDstKey.class); + Assert.assertEquals(NxmOfEthDstKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment1 = ethDstConvertor .convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH); Assert.assertEquals(MAC_ADDRESS, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject()) .getNxmOfEthDst().getMacAddress()); - Assert.assertEquals(extensionAugment.getKey(), NxmOfEthDstKey.class); + Assert.assertEquals(NxmOfEthDstKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment2 = ethDstConvertor .convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH); Assert.assertEquals(MAC_ADDRESS, ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()) .getNxmOfEthDst().getMacAddress()); - Assert.assertEquals(extensionAugment.getKey(), NxmOfEthDstKey.class); + Assert.assertEquals(NxmOfEthDstKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment3 = ethDstConvertor .convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH); Assert.assertEquals(MAC_ADDRESS, ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()) .getNxmOfEthDst().getMacAddress()); - Assert.assertEquals(extensionAugment.getKey(), NxmOfEthDstKey.class); + Assert.assertEquals(NxmOfEthDstKey.VALUE, extensionAugment.getKey()); } } 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 d495d85c21..2f89695822 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 @@ -44,7 +44,7 @@ public class EthSrcConvertorTest { @Mock private MatchEntry matchEntry; - private static final MacAddress MAC_ADDRESS = MacAddress.getDefaultInstance("01:23:45:67:89:AB"); + private static final MacAddress MAC_ADDRESS = new MacAddress("01:23:45:67:89:AB"); private EthSrcConvertor ethSrcConvertor; @@ -85,24 +85,24 @@ public class EthSrcConvertorTest { MatchPath.PACKET_RECEIVED_MATCH); Assert.assertEquals(MAC_ADDRESS, ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmOfEthSrc().getMacAddress()); - Assert.assertEquals(extensionAugment.getKey(), NxmOfEthSrcKey.class); + Assert.assertEquals(NxmOfEthSrcKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment1 = ethSrcConvertor .convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH); Assert.assertEquals(MAC_ADDRESS, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject()) .getNxmOfEthSrc().getMacAddress()); - Assert.assertEquals(extensionAugment.getKey(), NxmOfEthSrcKey.class); + Assert.assertEquals(NxmOfEthSrcKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment2 = ethSrcConvertor .convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH); Assert.assertEquals(MAC_ADDRESS, ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()) .getNxmOfEthSrc().getMacAddress()); - Assert.assertEquals(extensionAugment.getKey(), NxmOfEthSrcKey.class); + Assert.assertEquals(NxmOfEthSrcKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment3 = ethSrcConvertor .convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH); Assert.assertEquals(MAC_ADDRESS, ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()) .getNxmOfEthSrc().getMacAddress()); - Assert.assertEquals(extensionAugment.getKey(), NxmOfEthSrcKey.class); + Assert.assertEquals(NxmOfEthSrcKey.VALUE, extensionAugment.getKey()); } } 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 e49e12b0b7..aed1e5e824 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 @@ -85,24 +85,24 @@ public class EthTypeConvertorTest { .convert(matchEntry, MatchPath.PACKET_RECEIVED_MATCH); Assert.assertEquals(1, ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmOfEthType() .getValue().intValue()); - Assert.assertEquals(extensionAugment.getKey(), NxmOfEthTypeKey.class); + Assert.assertEquals(NxmOfEthTypeKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment1 = ethTypeConvertor .convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH); Assert.assertEquals(1, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject()) .getNxmOfEthType().getValue().intValue()); - Assert.assertEquals(extensionAugment.getKey(), NxmOfEthTypeKey.class); + Assert.assertEquals(NxmOfEthTypeKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment2 = ethTypeConvertor .convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH); Assert.assertEquals(1, ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()) .getNxmOfEthType().getValue().intValue()); - Assert.assertEquals(extensionAugment.getKey(), NxmOfEthTypeKey.class); + Assert.assertEquals(NxmOfEthTypeKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment3 = ethTypeConvertor .convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH); Assert.assertEquals(1, ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmOfEthType() .getValue().intValue()); - Assert.assertEquals(extensionAugment.getKey(), NxmOfEthTypeKey.class); + Assert.assertEquals(NxmOfEthTypeKey.VALUE, extensionAugment.getKey()); } } 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 292bba4c6a..a3b0a85089 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 @@ -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.match; import static org.junit.Assert.assertEquals; @@ -84,7 +83,7 @@ public class NshFlagsConvertorTest { .getNxmNxNshFlags().getNshFlags()); assertEquals(MASK_VALUE, ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()) .getNxmNxNshFlags().getMask()); - assertEquals(extensionAugment.getKey(), NxmNxNshFlagsKey.class); + assertEquals(NxmNxNshFlagsKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment1 = convertor.convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH); @@ -92,7 +91,7 @@ public class NshFlagsConvertorTest { .getNxmNxNshFlags().getNshFlags()); assertEquals(MASK_VALUE, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject()) .getNxmNxNshFlags().getMask()); - assertEquals(extensionAugment.getKey(), NxmNxNshFlagsKey.class); + assertEquals(NxmNxNshFlagsKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment2 = convertor.convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH); @@ -100,7 +99,7 @@ public class NshFlagsConvertorTest { .getNxmNxNshFlags().getNshFlags()); assertEquals(MASK_VALUE, ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()) .getNxmNxNshFlags().getMask()); - assertEquals(extensionAugment.getKey(), NxmNxNshFlagsKey.class); + assertEquals(NxmNxNshFlagsKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment3 = convertor.convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH); @@ -108,6 +107,6 @@ public class NshFlagsConvertorTest { .getNxmNxNshFlags().getNshFlags()); assertEquals(MASK_VALUE, ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()) .getNxmNxNshFlags().getMask()); - assertEquals(extensionAugment.getKey(), NxmNxNshFlagsKey.class); + assertEquals(NxmNxNshFlagsKey.VALUE, extensionAugment.getKey()); } } \ No newline at end of file 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 77869eb99c..04c8f3ee70 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 @@ -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.match; import static org.junit.Assert.assertEquals; @@ -80,24 +79,24 @@ public class NshMdtypeConvertorTest { MatchPath.PACKET_RECEIVED_MATCH); assertEquals(MDTYPE_VALUE, ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()) .getNxmNxNshMdtype().getValue()); - assertEquals(extensionAugment.getKey(), NxmNxNshMdtypeKey.class); + assertEquals(NxmNxNshMdtypeKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment1 = convertor.convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH); assertEquals(MDTYPE_VALUE, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject()) .getNxmNxNshMdtype().getValue()); - assertEquals(extensionAugment.getKey(), NxmNxNshMdtypeKey.class); + assertEquals(NxmNxNshMdtypeKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment2 = convertor.convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH); assertEquals(MDTYPE_VALUE, ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()) .getNxmNxNshMdtype().getValue()); - assertEquals(extensionAugment.getKey(), NxmNxNshMdtypeKey.class); + assertEquals(NxmNxNshMdtypeKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment3 = convertor.convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH); assertEquals(MDTYPE_VALUE, ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()) .getNxmNxNshMdtype().getValue()); - assertEquals(extensionAugment.getKey(), NxmNxNshMdtypeKey.class); + assertEquals(NxmNxNshMdtypeKey.VALUE, extensionAugment.getKey()); } } \ No newline at end of file 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 3aab4026cf..3da57d03f4 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 @@ -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.match; import static org.junit.Assert.assertEquals; @@ -80,24 +79,24 @@ public class NshNpConvertorTest { MatchPath.PACKET_RECEIVED_MATCH); assertEquals(NP_VALUE, ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()) .getNxmNxNshNp().getValue()); - assertEquals(extensionAugment.getKey(), NxmNxNshNpKey.class); + assertEquals(NxmNxNshNpKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment1 = convertor.convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH); assertEquals(NP_VALUE, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject()) .getNxmNxNshNp().getValue()); - assertEquals(extensionAugment.getKey(), NxmNxNshNpKey.class); + assertEquals(NxmNxNshNpKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment2 = convertor.convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH); assertEquals(NP_VALUE, ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()) .getNxmNxNshNp().getValue()); - assertEquals(extensionAugment.getKey(), NxmNxNshNpKey.class); + assertEquals(NxmNxNshNpKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment3 = convertor.convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH); assertEquals(NP_VALUE, ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()) .getNxmNxNshNp().getValue()); - assertEquals(extensionAugment.getKey(), NxmNxNshNpKey.class); + assertEquals(NxmNxNshNpKey.VALUE, extensionAugment.getKey()); } } \ No newline at end of file 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 439d401065..db5ae56de0 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 @@ -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.match; import static org.junit.Assert.assertEquals; @@ -79,24 +78,24 @@ public class NshTtlConvertorTest { MatchPath.PACKET_RECEIVED_MATCH); assertEquals(TTL_VALUE, ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()) .getNxmNxNshTtl().getNshTtl()); - assertEquals(extensionAugment.getKey(), NxmNxNshTtlKey.class); + assertEquals(NxmNxNshTtlKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment1 = convertor.convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH); assertEquals(TTL_VALUE, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject()) .getNxmNxNshTtl().getNshTtl()); - assertEquals(extensionAugment.getKey(), NxmNxNshTtlKey.class); + assertEquals(NxmNxNshTtlKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment2 = convertor.convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH); assertEquals(TTL_VALUE, ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()) .getNxmNxNshTtl().getNshTtl()); - assertEquals(extensionAugment.getKey(), NxmNxNshTtlKey.class); + assertEquals(NxmNxNshTtlKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment3 = convertor.convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH); assertEquals(TTL_VALUE, ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()) .getNxmNxNshTtl().getNshTtl()); - assertEquals(extensionAugment.getKey(), NxmNxNshTtlKey.class); + assertEquals(NxmNxNshTtlKey.VALUE, extensionAugment.getKey()); } } \ No newline at end of file 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 65739b6f91..58087b1f25 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 @@ -82,7 +82,7 @@ public class Nshc1ConvertorTest { ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmNxNshc1().getValue()); Assert.assertEquals(MASK_VALUE, ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmNxNshc1().getMask()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxNshc1Key.class); + Assert.assertEquals(NxmNxNshc1Key.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment1 = nshc1Convertor.convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH); @@ -92,7 +92,7 @@ public class Nshc1ConvertorTest { Assert.assertEquals(MASK_VALUE, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject()) .getNxmNxNshc1().getMask()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxNshc1Key.class); + Assert.assertEquals(NxmNxNshc1Key.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment2 = nshc1Convertor.convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH); @@ -100,7 +100,7 @@ public class Nshc1ConvertorTest { ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()).getNxmNxNshc1().getValue()); Assert.assertEquals(MASK_VALUE, ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()).getNxmNxNshc1().getMask()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxNshc1Key.class); + Assert.assertEquals(NxmNxNshc1Key.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment3 = nshc1Convertor.convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH); @@ -108,6 +108,6 @@ public class Nshc1ConvertorTest { ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmNxNshc1().getValue()); Assert.assertEquals(MASK_VALUE, ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmNxNshc1().getMask()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxNshc1Key.class); + Assert.assertEquals(NxmNxNshc1Key.VALUE, extensionAugment.getKey()); } } 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 49dfb1df7c..df381d723b 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 @@ -82,7 +82,7 @@ public class Nshc2ConvertorTest { ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmNxNshc2().getValue()); Assert.assertEquals(MASK_VALUE, ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmNxNshc2().getMask()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxNshc2Key.class); + Assert.assertEquals(NxmNxNshc2Key.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment1 = nshc2Convertor.convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH); @@ -92,7 +92,7 @@ public class Nshc2ConvertorTest { Assert.assertEquals(MASK_VALUE, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject()) .getNxmNxNshc2().getMask()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxNshc2Key.class); + Assert.assertEquals(NxmNxNshc2Key.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment2 = nshc2Convertor.convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH); @@ -100,7 +100,7 @@ public class Nshc2ConvertorTest { ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()).getNxmNxNshc2().getValue()); Assert.assertEquals(MASK_VALUE, ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()).getNxmNxNshc2().getMask()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxNshc2Key.class); + Assert.assertEquals(NxmNxNshc2Key.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment3 = nshc2Convertor.convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH); @@ -108,6 +108,6 @@ public class Nshc2ConvertorTest { ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmNxNshc2().getValue()); Assert.assertEquals(MASK_VALUE, ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmNxNshc2().getMask()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxNshc2Key.class); + Assert.assertEquals(NxmNxNshc2Key.VALUE, extensionAugment.getKey()); } } 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 9ddc87ee92..5b7adddc5f 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 @@ -82,7 +82,7 @@ public class Nshc3ConvertorTest { ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmNxNshc3().getValue()); Assert.assertEquals(MASK_VALUE, ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmNxNshc3().getMask()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxNshc3Key.class); + Assert.assertEquals(NxmNxNshc3Key.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment1 = nshc3Convertor.convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH); @@ -92,7 +92,7 @@ public class Nshc3ConvertorTest { Assert.assertEquals(MASK_VALUE, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject()) .getNxmNxNshc3().getMask()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxNshc3Key.class); + Assert.assertEquals(NxmNxNshc3Key.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment2 = nshc3Convertor.convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH); @@ -100,7 +100,7 @@ public class Nshc3ConvertorTest { ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()).getNxmNxNshc3().getValue()); Assert.assertEquals(MASK_VALUE, ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()).getNxmNxNshc3().getMask()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxNshc3Key.class); + Assert.assertEquals(NxmNxNshc3Key.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment3 = nshc3Convertor.convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH); @@ -108,6 +108,6 @@ public class Nshc3ConvertorTest { ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmNxNshc3().getValue()); Assert.assertEquals(MASK_VALUE, ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmNxNshc3().getMask()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxNshc3Key.class); + Assert.assertEquals(NxmNxNshc3Key.VALUE, extensionAugment.getKey()); } } 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 ad77b8d49c..f608bbb99a 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 @@ -82,7 +82,7 @@ public class Nshc4ConvertorTest { ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmNxNshc4().getValue()); Assert.assertEquals(MASK_VALUE, ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmNxNshc4().getMask()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxNshc4Key.class); + Assert.assertEquals(NxmNxNshc4Key.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment1 = nshc4Convertor.convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH); @@ -92,7 +92,7 @@ public class Nshc4ConvertorTest { Assert.assertEquals(MASK_VALUE, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject()) .getNxmNxNshc4().getMask()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxNshc4Key.class); + Assert.assertEquals(NxmNxNshc4Key.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment2 = nshc4Convertor.convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH); @@ -100,7 +100,7 @@ public class Nshc4ConvertorTest { ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()).getNxmNxNshc4().getValue()); Assert.assertEquals(MASK_VALUE, ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()).getNxmNxNshc4().getMask()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxNshc4Key.class); + Assert.assertEquals(NxmNxNshc4Key.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment3 = nshc4Convertor.convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH); @@ -108,6 +108,6 @@ public class Nshc4ConvertorTest { ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmNxNshc4().getValue()); Assert.assertEquals(MASK_VALUE, ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmNxNshc4().getMask()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxNshc4Key.class); + Assert.assertEquals(NxmNxNshc4Key.VALUE, extensionAugment.getKey()); } } 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 d0842938c3..85064af708 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 @@ -78,25 +78,25 @@ public class NsiConvertorTest { MatchPath.PACKET_RECEIVED_MATCH); Assert.assertEquals(NSI_VALUE, ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmNxNsi().getNsi()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxNsiKey.class); + Assert.assertEquals(NxmNxNsiKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment1 = nsiConvertor.convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH); Assert.assertEquals(NSI_VALUE, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject()).getNxmNxNsi().getNsi()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxNsiKey.class); + Assert.assertEquals(NxmNxNsiKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment2 = nsiConvertor.convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH); Assert.assertEquals(NSI_VALUE, ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()).getNxmNxNsi().getNsi()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxNsiKey.class); + Assert.assertEquals(NxmNxNsiKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment3 = nsiConvertor.convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH); Assert.assertEquals(NSI_VALUE, ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmNxNsi().getNsi()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxNsiKey.class); + Assert.assertEquals(NxmNxNsiKey.VALUE, extensionAugment.getKey()); } } 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 83342edce2..d4b9dcc2e1 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 @@ -78,25 +78,25 @@ public class NspConvertorTest { MatchPath.PACKET_RECEIVED_MATCH); Assert.assertEquals(NSP_VALUE, ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmNxNsp().getValue()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxNspKey.class); + Assert.assertEquals(NxmNxNspKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment1 = nspConvertor.convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH); Assert.assertEquals(NSP_VALUE, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject()) .getNxmNxNsp().getValue()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxNspKey.class); + Assert.assertEquals(NxmNxNspKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment2 = nspConvertor.convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH); Assert.assertEquals(NSP_VALUE, ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()).getNxmNxNsp().getValue()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxNspKey.class); + Assert.assertEquals(NxmNxNspKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment3 = nspConvertor.convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH); Assert.assertEquals(NSP_VALUE, ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmNxNsp().getValue()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxNspKey.class); + Assert.assertEquals(NxmNxNspKey.VALUE, extensionAugment.getKey()); } } 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 4c233686c7..3fc80eba34 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 @@ -91,7 +91,7 @@ public class TcpDstConvertorTest { .getMask().intValue()); Assert.assertEquals(DEFAULT_PORT, ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmOfTcpDst().getPort()); - Assert.assertEquals(extensionAugment.getKey(), NxmOfTcpDstKey.class); + Assert.assertEquals(NxmOfTcpDstKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment1 = tcpDstConvertor .convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH); @@ -99,7 +99,7 @@ public class TcpDstConvertorTest { .getNxmOfTcpDst().getMask().intValue()); Assert.assertEquals(DEFAULT_PORT, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject()) .getNxmOfTcpDst().getPort()); - Assert.assertEquals(extensionAugment.getKey(), NxmOfTcpDstKey.class); + Assert.assertEquals(NxmOfTcpDstKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment2 = tcpDstConvertor .convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH); @@ -107,7 +107,7 @@ public class TcpDstConvertorTest { .getNxmOfTcpDst().getMask().intValue()); Assert.assertEquals(DEFAULT_PORT, ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()).getNxmOfTcpDst().getPort()); - Assert.assertEquals(extensionAugment.getKey(), NxmOfTcpDstKey.class); + Assert.assertEquals(NxmOfTcpDstKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment3 = tcpDstConvertor .convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH); @@ -115,6 +115,6 @@ public class TcpDstConvertorTest { .getMask().intValue()); Assert.assertEquals(DEFAULT_PORT, ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmOfTcpDst().getPort()); - Assert.assertEquals(extensionAugment.getKey(), NxmOfTcpDstKey.class); + Assert.assertEquals(NxmOfTcpDstKey.VALUE, extensionAugment.getKey()); } } 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 b22cea7d03..5c15458dfd 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 @@ -91,7 +91,7 @@ public class TcpSrcConvertorTest { .getMask().intValue()); Assert.assertEquals(DEFAULT_PORT, ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmOfTcpSrc().getPort()); - Assert.assertEquals(extensionAugment.getKey(), NxmOfTcpSrcKey.class); + Assert.assertEquals(NxmOfTcpSrcKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment1 = tcpSrcConvertor .convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH); @@ -99,7 +99,7 @@ public class TcpSrcConvertorTest { .getNxmOfTcpSrc().getMask().intValue()); Assert.assertEquals(DEFAULT_PORT, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject()) .getNxmOfTcpSrc().getPort()); - Assert.assertEquals(extensionAugment.getKey(), NxmOfTcpSrcKey.class); + Assert.assertEquals(NxmOfTcpSrcKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment2 = tcpSrcConvertor .convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH); @@ -107,7 +107,7 @@ public class TcpSrcConvertorTest { .getNxmOfTcpSrc().getMask().intValue()); Assert.assertEquals(DEFAULT_PORT, ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()).getNxmOfTcpSrc().getPort()); - Assert.assertEquals(extensionAugment.getKey(), NxmOfTcpSrcKey.class); + Assert.assertEquals(NxmOfTcpSrcKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment3 = tcpSrcConvertor .convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH); @@ -115,6 +115,6 @@ public class TcpSrcConvertorTest { .getMask().intValue()); Assert.assertEquals(DEFAULT_PORT, ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmOfTcpSrc().getPort()); - Assert.assertEquals(extensionAugment.getKey(), NxmOfTcpSrcKey.class); + Assert.assertEquals(NxmOfTcpSrcKey.VALUE, extensionAugment.getKey()); } } 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 c2cb841788..7b3c7726b6 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 @@ -86,24 +86,24 @@ public class TunIPv4DstConvertorTest { .convert(matchEntry, MatchPath.PACKET_RECEIVED_MATCH); Assert.assertEquals(IPV4_ADDRESS, ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()) .getNxmNxTunIpv4Dst().getIpv4Address()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxTunIpv4DstKey.class); + Assert.assertEquals(NxmNxTunIpv4DstKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment1 = tunIPv4DstConvertor .convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH); Assert.assertEquals(IPV4_ADDRESS, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject()) .getNxmNxTunIpv4Dst().getIpv4Address()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxTunIpv4DstKey.class); + Assert.assertEquals(NxmNxTunIpv4DstKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment2 = tunIPv4DstConvertor .convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH); Assert.assertEquals(IPV4_ADDRESS, ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()) .getNxmNxTunIpv4Dst().getIpv4Address()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxTunIpv4DstKey.class); + Assert.assertEquals(NxmNxTunIpv4DstKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment3 = tunIPv4DstConvertor .convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH); Assert.assertEquals(IPV4_ADDRESS, ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()) .getNxmNxTunIpv4Dst().getIpv4Address()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxTunIpv4DstKey.class); + Assert.assertEquals(NxmNxTunIpv4DstKey.VALUE, extensionAugment.getKey()); } } 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 1d662ab3f3..bcbbf228d2 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 @@ -45,7 +45,7 @@ public class TunIPv4SrcConvertorTest { @Mock private MatchEntry matchEntry; - private static final Ipv4Address IPV4_ADDRESS = Ipv4Address.getDefaultInstance("1.2.3.4"); + private static final Ipv4Address IPV4_ADDRESS = new Ipv4Address("1.2.3.4"); private TunIPv4SrcConvertor tunIPv4DstConvertor; @@ -86,24 +86,24 @@ public class TunIPv4SrcConvertorTest { .convert(matchEntry, MatchPath.PACKET_RECEIVED_MATCH); Assert.assertEquals(IPV4_ADDRESS, ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()) .getNxmNxTunIpv4Src().getIpv4Address()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxTunIpv4SrcKey.class); + Assert.assertEquals(NxmNxTunIpv4SrcKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment1 = tunIPv4DstConvertor .convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH); Assert.assertEquals(IPV4_ADDRESS, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject()) .getNxmNxTunIpv4Src().getIpv4Address()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxTunIpv4SrcKey.class); + Assert.assertEquals(NxmNxTunIpv4SrcKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment2 = tunIPv4DstConvertor .convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH); Assert.assertEquals(IPV4_ADDRESS, ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()) .getNxmNxTunIpv4Src().getIpv4Address()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxTunIpv4SrcKey.class); + Assert.assertEquals(NxmNxTunIpv4SrcKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment3 = tunIPv4DstConvertor .convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH); Assert.assertEquals(IPV4_ADDRESS, ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()) .getNxmNxTunIpv4Src().getIpv4Address()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxTunIpv4SrcKey.class); + Assert.assertEquals(NxmNxTunIpv4SrcKey.VALUE, extensionAugment.getKey()); } } 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 b09e0ec199..298d6aee67 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 @@ -84,25 +84,25 @@ public class TunIdConvertorTest { MatchPath.PACKET_RECEIVED_MATCH); Assert.assertEquals(U64_TEN, ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmNxTunId().getValue()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxTunIdKey.class); + Assert.assertEquals(NxmNxTunIdKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment1 = tunIdConvertor.convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH); Assert.assertEquals(U64_TEN, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject()).getNxmNxTunId() .getValue()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxTunIdKey.class); + Assert.assertEquals(NxmNxTunIdKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment2 = tunIdConvertor.convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH); Assert.assertEquals(U64_TEN, ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()).getNxmNxTunId().getValue()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxTunIdKey.class); + Assert.assertEquals(NxmNxTunIdKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment3 = tunIdConvertor.convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH); Assert.assertEquals(U64_TEN, ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmNxTunId().getValue()); - Assert.assertEquals(extensionAugment.getKey(), NxmNxTunIdKey.class); + Assert.assertEquals(NxmNxTunIdKey.VALUE, extensionAugment.getKey()); } } 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 063d00f659..d7e87c1c86 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 @@ -87,35 +87,35 @@ public class UdpDstConvertorTest { final ExtensionAugment> extensionAugment = udpDstConvertor.convert(matchEntry, MatchPath.PACKET_RECEIVED_MATCH); - Assert.assertEquals(Uint16.valueOf(2), + Assert.assertEquals(Uint16.TWO, ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmOfUdpDst().getMask()); Assert.assertEquals(DEFAULT_PORT, ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmOfUdpDst().getPort()); - Assert.assertEquals(extensionAugment.getKey(), NxmOfUdpDstKey.class); + Assert.assertEquals(NxmOfUdpDstKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment1 = udpDstConvertor .convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH); - Assert.assertEquals(Uint16.valueOf(2), + Assert.assertEquals(Uint16.TWO, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject()).getNxmOfUdpDst() .getMask()); Assert.assertEquals(DEFAULT_PORT, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject()) .getNxmOfUdpDst().getPort()); - Assert.assertEquals(extensionAugment.getKey(), NxmOfUdpDstKey.class); + Assert.assertEquals(NxmOfUdpDstKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment2 = udpDstConvertor .convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH); - Assert.assertEquals(Uint16.valueOf(2), + Assert.assertEquals(Uint16.TWO, ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()).getNxmOfUdpDst().getMask()); Assert.assertEquals(DEFAULT_PORT, ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()).getNxmOfUdpDst().getPort()); - Assert.assertEquals(extensionAugment.getKey(), NxmOfUdpDstKey.class); + Assert.assertEquals(NxmOfUdpDstKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment3 = udpDstConvertor .convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH); - Assert.assertEquals(Uint16.valueOf(2), + Assert.assertEquals(Uint16.TWO, ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmOfUdpDst().getMask()); Assert.assertEquals(DEFAULT_PORT, ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmOfUdpDst().getPort()); - Assert.assertEquals(extensionAugment.getKey(), NxmOfUdpDstKey.class); + Assert.assertEquals(NxmOfUdpDstKey.VALUE, extensionAugment.getKey()); } } 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 fc1fbb5943..906d171d55 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 @@ -67,7 +67,7 @@ public class UdpSrcConvertorTest { @Test public void testConvert() { final MatchEntry converted = udpSrcConvertor.convert(extension); - Assert.assertEquals(Uint16.valueOf(1), + Assert.assertEquals(Uint16.ONE, ((UdpSrcCaseValue) converted.getMatchEntryValue()).getUdpSrcValues().getMask()); Assert.assertEquals(DEFAULT_PORT, ((UdpSrcCaseValue) converted.getMatchEntryValue()).getUdpSrcValues().getPort()); @@ -87,35 +87,35 @@ public class UdpSrcConvertorTest { final ExtensionAugment> extensionAugment = udpSrcConvertor.convert(matchEntry, MatchPath.PACKET_RECEIVED_MATCH); - Assert.assertEquals(Uint16.valueOf(2), + Assert.assertEquals(Uint16.TWO, ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmOfUdpSrc().getMask()); Assert.assertEquals(DEFAULT_PORT, ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmOfUdpSrc().getPort()); - Assert.assertEquals(extensionAugment.getKey(), NxmOfUdpSrcKey.class); + Assert.assertEquals(NxmOfUdpSrcKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment1 = udpSrcConvertor .convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH); - Assert.assertEquals(Uint16.valueOf(2), + Assert.assertEquals(Uint16.TWO, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject()).getNxmOfUdpSrc() .getMask()); Assert.assertEquals(DEFAULT_PORT, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject()) .getNxmOfUdpSrc().getPort()); - Assert.assertEquals(extensionAugment.getKey(), NxmOfUdpSrcKey.class); + Assert.assertEquals(NxmOfUdpSrcKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment2 = udpSrcConvertor .convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH); - Assert.assertEquals(Uint16.valueOf(2), + Assert.assertEquals(Uint16.TWO, ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()).getNxmOfUdpSrc().getMask()); Assert.assertEquals(DEFAULT_PORT, ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()).getNxmOfUdpSrc().getPort()); - Assert.assertEquals(extensionAugment.getKey(), NxmOfUdpSrcKey.class); + Assert.assertEquals(NxmOfUdpSrcKey.VALUE, extensionAugment.getKey()); final ExtensionAugment> extensionAugment3 = udpSrcConvertor .convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH); - Assert.assertEquals(Uint16.valueOf(2), + Assert.assertEquals(Uint16.TWO, ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmOfUdpSrc().getMask()); Assert.assertEquals(DEFAULT_PORT, ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmOfUdpSrc().getPort()); - Assert.assertEquals(extensionAugment.getKey(), NxmOfUdpSrcKey.class); + Assert.assertEquals(NxmOfUdpSrcKey.VALUE, extensionAugment.getKey()); } } diff --git a/extension/pom.xml b/extension/pom.xml index cf9be2270c..d5db3237ac 100644 --- a/extension/pom.xml +++ b/extension/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.2 + 11.0.0 diff --git a/extension/test-extension/src/main/java/org/opendaylight/openflowplugin/extension/test/Test.java b/extension/test-extension/src/main/java/org/opendaylight/openflowplugin/extension/test/Test.java index 73dba0097a..7cfda7f858 100644 --- a/extension/test-extension/src/main/java/org/opendaylight/openflowplugin/extension/test/Test.java +++ b/extension/test-extension/src/main/java/org/opendaylight/openflowplugin/extension/test/Test.java @@ -94,7 +94,7 @@ public class Test implements TestService { // vendor part .setNxRegLoad(new NxRegLoadBuilder() .setDst(new DstBuilder() - .setDstChoice(new DstNxRegCaseBuilder().setNxReg(NxmNxReg0.class).build()) + .setDstChoice(new DstNxRegCaseBuilder().setNxReg(NxmNxReg0.VALUE).build()) .setStart(Uint16.ZERO) .setEnd(Uint16.valueOf(5)) .build()) diff --git a/features-aggregator/features-openflowplugin/pom.xml b/features-aggregator/features-openflowplugin/pom.xml index 7d0ae1199e..d92fd5c994 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 - 10.0.2 + 11.0.0 diff --git a/features-aggregator/odl-openflowplugin-app-arbitratorreconciliation/pom.xml b/features-aggregator/odl-openflowplugin-app-arbitratorreconciliation/pom.xml index 82249ea31d..7624b48bd1 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 - 10.0.2 + 11.0.0 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 aa36471627..bb2d0bae28 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 - 10.0.2 + 11.0.0 diff --git a/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml b/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml index 1dcbfd7331..cfac8bd6c3 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 - 10.0.2 + 11.0.0 diff --git a/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml b/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml index 535164dd8d..6ed1e4b9ea 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 - 10.0.2 + 11.0.0 diff --git a/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml b/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml index 1a7d9aefc6..61cd421e14 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 - 10.0.2 + 11.0.0 diff --git a/features-aggregator/odl-openflowplugin-app-lldp-speaker/pom.xml b/features-aggregator/odl-openflowplugin-app-lldp-speaker/pom.xml index 5271ff3b68..ec714f8303 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 - 10.0.2 + 11.0.0 diff --git a/features-aggregator/odl-openflowplugin-app-reconciliation-framework/pom.xml b/features-aggregator/odl-openflowplugin-app-reconciliation-framework/pom.xml index 0befccc5bb..dc32eb4c49 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 - 10.0.2 + 11.0.0 diff --git a/features-aggregator/odl-openflowplugin-app-southbound-cli/pom.xml b/features-aggregator/odl-openflowplugin-app-southbound-cli/pom.xml index 518698586c..34c0b3f565 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 - 10.0.2 + 11.0.0 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 afb3c44ed3..08e9413eed 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 - 10.0.2 + 11.0.0 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 cd3cd38e5c..0dc643da4f 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 - 10.0.2 + 11.0.0 diff --git a/features-aggregator/odl-openflowplugin-app-topology-manager/pom.xml b/features-aggregator/odl-openflowplugin-app-topology-manager/pom.xml index d4bff86d5a..cc6edfcf41 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 - 10.0.2 + 11.0.0 diff --git a/features-aggregator/odl-openflowplugin-app-topology/pom.xml b/features-aggregator/odl-openflowplugin-app-topology/pom.xml index 7046e6e1a5..324be5c2e7 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 - 10.0.2 + 11.0.0 diff --git a/features-aggregator/odl-openflowplugin-drop-test/pom.xml b/features-aggregator/odl-openflowplugin-drop-test/pom.xml index 7a5247d261..624dc74e9c 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 - 10.0.2 + 11.0.0 diff --git a/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml b/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml index 3966304907..a01cda35ad 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 - 10.0.2 + 11.0.0 @@ -21,7 +21,7 @@ org.opendaylight.netconf netconf-artifacts - 3.0.5 + 4.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 50acea12e6..98da6418da 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 - 10.0.2 + 11.0.0 diff --git a/features-aggregator/odl-openflowplugin-libraries/pom.xml b/features-aggregator/odl-openflowplugin-libraries/pom.xml index 831bdda5be..34de9b9c52 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 - 10.0.2 + 11.0.0 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 3c3d621afb..7ac31b39af 100644 --- a/features-aggregator/odl-openflowplugin-libraries/src/main/feature/feature.xml +++ b/features-aggregator/odl-openflowplugin-libraries/src/main/feature/feature.xml @@ -1,7 +1,7 @@ - odl-apache-commons-lang3 - odl-guava + odl-apache-commons-lang3 + odl-guava diff --git a/features-aggregator/odl-openflowplugin-nsf-model/pom.xml b/features-aggregator/odl-openflowplugin-nsf-model/pom.xml index d388ddd7d9..a9fea8126e 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 - 10.0.2 + 11.0.0 @@ -21,7 +21,7 @@ org.opendaylight.mdsal mdsal-artifacts - 9.0.4 + 10.0.0 import pom @@ -30,7 +30,7 @@ org.opendaylight.controller controller-artifacts - 5.0.5 + 6.0.0 import pom 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 1193e93769..1c2d125c4e 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,7 +1,7 @@ - odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01-minimal - odl-mdsal-model-odl-l2-types + odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01-minimal + 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 e4a56d2994..8992ab0db8 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 - 10.0.2 + 11.0.0 @@ -29,14 +29,14 @@ org.opendaylight.controller controller-artifacts - 5.0.5 + 6.0.0 import pom org.opendaylight.infrautils infrautils-artifacts - 3.0.1 + 4.0.0 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 83cff02e6c..be63940ab6 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 46dba9f487..adcfeb2a9c 100644 --- a/features-aggregator/pom.xml +++ b/features-aggregator/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.2 + 11.0.0 diff --git a/libraries/pom.xml b/libraries/pom.xml index b5b80602f9..193416dc8d 100644 --- a/libraries/pom.xml +++ b/libraries/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.2 + 11.0.0 diff --git a/model/pom.xml b/model/pom.xml index 1d5033d53d..ed3c948600 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.2 + 11.0.0 diff --git a/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml b/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml index a068543451..ac8059c5f6 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 - 10.0.2 + 11.0.0 diff --git a/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml b/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml index 0608439120..533c77ab9a 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 - 10.0.2 + 11.0.0 @@ -33,7 +33,7 @@ org.opendaylight.infrautils infrautils-artifacts - 3.0.1 + 4.0.0 import pom @@ -42,7 +42,7 @@ org.opendaylight.yangtools yangtools-artifacts - 8.0.6 + 9.0.0 import pom @@ -51,7 +51,7 @@ org.opendaylight.mdsal mdsal-artifacts - 9.0.4 + 10.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 3f7146f6c9..92e8c860ae 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-yangtools-netty - odl-mdsal-model-rfc6991 - odl-infrautils-diagstatus + odl-yangtools-netty + odl-mdsal-model-rfc6991 + odl-infrautils-diagstatus diff --git a/openflowjava/features-openflowjava-aggregator/pom.xml b/openflowjava/features-openflowjava-aggregator/pom.xml index bcc184ff55..47f129a7c2 100644 --- a/openflowjava/features-openflowjava-aggregator/pom.xml +++ b/openflowjava/features-openflowjava-aggregator/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.2 + 11.0.0 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 6789fffa28..1b8ecbe6b7 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 @@ -19,8 +19,7 @@ import org.opendaylight.yangtools.yang.common.Uint8; * @author michal.polkorab */ public final class ExperimenterActionSerializerKey extends ActionSerializerKey { - - private final Class actionSubType; + private final ExperimenterActionSubType actionSubType; /** * Constructor. @@ -30,7 +29,7 @@ public final class ExperimenterActionSerializerKey extends ActionSerializerKey actionSubType) { + final ExperimenterActionSubType actionSubType) { super(msgVersion, ExperimenterIdCase.class, experimenterId); this.actionSubType = actionSubType; } 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 3e1da12415..df34ce9120 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 @@ -19,7 +19,7 @@ import org.opendaylight.yangtools.yang.common.Uint8; * @author hyy on 2016/9/8. */ public class ExperimenterIdMeterSubTypeSerializerKey extends ExperimenterIdSerializerKey { - private final Class meterSubType; + private final ExperimenterMeterBandSubType meterSubType; /** * Constructor. @@ -30,7 +30,7 @@ public class ExperimenterIdMeterSubTypeSerializerKey ex * @param meterSubType vendor defined subtype */ public ExperimenterIdMeterSubTypeSerializerKey(final Uint8 msgVersion, final Uint32 experimenterId, - final Class objectClass, final Class meterSubType) { + final Class objectClass, final ExperimenterMeterBandSubType meterSubType) { super(msgVersion, experimenterId, objectClass); this.meterSubType = meterSubType; } 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 f45b730405..e0ab46783f 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 @@ -24,8 +24,8 @@ import org.opendaylight.yangtools.yang.common.Uint8; public final class MatchEntrySerializerKey extends MessageTypeKey implements ExperimenterSerializerKey { - private final Class oxmClass; - private final Class oxmField; + private final C oxmClass; + private final F oxmField; private Uint32 experimenterId; @@ -36,7 +36,7 @@ public final class MatchEntrySerializerKey oxmClass, final Class oxmField) { + public MatchEntrySerializerKey(final Uint8 msgVersion, final C oxmClass, final F oxmField) { super(msgVersion, MatchEntry.class); this.oxmClass = oxmClass; this.oxmField = oxmField; @@ -87,7 +87,7 @@ public final class MatchEntrySerializerKey actionSerializerKey = new ActionSerializerKey<>( EncodeConstants.OF_VERSION_1_3, ExperimenterIdCase.class, Uint32.ONE); ExperimenterActionSerializerKey experimenterActionSerializerKey = new ExperimenterActionSerializerKey( - EncodeConstants.OF_VERSION_1_3, Uint32.ONE, ExpSubType.class); + EncodeConstants.OF_VERSION_1_3, Uint32.ONE, ExpSubType.VALUE); Assert.assertFalse(actionSerializerKey.equals(experimenterActionSerializerKey)); Assert.assertFalse(experimenterActionSerializerKey.equals(actionSerializerKey)); @@ -74,14 +74,17 @@ public class KeysTest { Assert.assertEquals(instructionSerializerKey.hashCode(), experimenterInstructionSerializerKey.hashCode()); MatchEntrySerializerKey matchKey = new MatchEntrySerializerKey<>( - EncodeConstants.OF_VERSION_1_0, OpenflowBasicClass.class, InPort.class); + EncodeConstants.OF_VERSION_1_0, OpenflowBasicClass.VALUE, InPort.VALUE); MatchEntrySerializerKey matchKey2 = new MatchEntrySerializerKey<>( - EncodeConstants.OF_VERSION_1_0, OpenflowBasicClass.class, InPort.class); + EncodeConstants.OF_VERSION_1_0, OpenflowBasicClass.VALUE, InPort.VALUE); Assert.assertEquals(matchKey, matchKey2); Assert.assertEquals(matchKey.hashCode(), matchKey2.hashCode()); } private interface ExpSubType extends ExperimenterActionSubType { - // empty class - only used in test for comparation + ExpSubType VALUE = () -> ExpSubType.class; + + @Override + Class implementedInterface(); } } 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 1585a6d9c7..8f2bfef74a 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,29 +30,29 @@ public class MatchEntrySerializerKeyTest { @Test public void test() { MatchEntrySerializerKey key1 = new MatchEntrySerializerKey<>( - EncodeConstants.OF_VERSION_1_3, OpenflowBasicClass.class, InPort.class); + EncodeConstants.OF_VERSION_1_3, OpenflowBasicClass.VALUE, InPort.VALUE); MatchEntrySerializerKey key2 = new MatchEntrySerializerKey<>( - EncodeConstants.OF_VERSION_1_3, OpenflowBasicClass.class, InPort.class); + EncodeConstants.OF_VERSION_1_3, OpenflowBasicClass.VALUE, InPort.VALUE); Assert.assertTrue("Wrong equals", key1.equals(key2)); Assert.assertTrue("Wrong hashCode", key1.hashCode() == key2.hashCode()); key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, - OpenflowBasicClass.class, InPhyPort.class); + OpenflowBasicClass.VALUE, InPhyPort.VALUE); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode()); key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, - Nxm0Class.class, InPort.class); + Nxm0Class.VALUE, InPort.VALUE); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode()); key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_0, - OpenflowBasicClass.class, InPhyPort.class); + OpenflowBasicClass.VALUE, InPhyPort.VALUE); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode()); key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, - OpenflowBasicClass.class, null); + OpenflowBasicClass.VALUE, null); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode()); key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, - null, InPhyPort.class); + null, InPhyPort.VALUE); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode()); key2.setExperimenterId(Uint32.valueOf(42L)); @@ -66,8 +66,8 @@ public class MatchEntrySerializerKeyTest { public void testEquals() { MatchEntrySerializerKey key1; MatchEntrySerializerKey key2; - key1 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, OpenflowBasicClass.class, InPort.class); - key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, OpenflowBasicClass.class, InPort.class); + key1 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, OpenflowBasicClass.VALUE, InPort.VALUE); + key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, OpenflowBasicClass.VALUE, InPort.VALUE); 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.OF_VERSION_1_3, null, InPort.class); + key1 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, null, InPort.VALUE); key1.setExperimenterId(expId2); Assert.assertFalse("Wrong equal by oxmClass", key1.equals(key2)); - key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, null, InPort.class); + key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, null, InPort.VALUE); key2.setExperimenterId(expId2); Assert.assertTrue("Wrong equal by oxmClass", key1.equals(key2)); - key1 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, OpenflowBasicClass.class, null); + key1 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, OpenflowBasicClass.VALUE, null); key1.setExperimenterId(expId2); Assert.assertFalse("Wrong equal by oxmField", key1.equals(key2)); - key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, OpenflowBasicClass.class, null); + key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, OpenflowBasicClass.VALUE, null); key2.setExperimenterId(expId2); Assert.assertTrue("Wrong equal by oxmField", key1.equals(key2)); } @@ -100,12 +100,13 @@ public class MatchEntrySerializerKeyTest { @Test public void testToString() { MatchEntrySerializerKey key1; - key1 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, OpenflowBasicClass.class, InPort.class); + key1 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, OpenflowBasicClass.VALUE, InPort.VALUE); - Assert.assertEquals("Wrong toString()", "msgVersion: 4 objectType: org.opendaylight.yang.gen.v1.urn" - + ".opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry" - + " oxm_class: org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225" - + ".OpenflowBasicClass oxm_field: org.opendaylight.yang.gen.v1.urn.opendaylight.openflow" - + ".oxm.rev150225.InPort experimenterID: null", key1.toString()); + Assert.assertEquals("Wrong toString()", """ + msgVersion: 4 objectType: org.opendaylight.yang.gen.v1.urn\ + .opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry \ + oxm_class: org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225\ + .OpenflowBasicClass oxm_field: org.opendaylight.yang.gen.v1.urn.opendaylight.openflow\ + .oxm.rev150225.InPort experimenterID: null""", key1.toString()); } } 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 ca7b8a2c1a..4c48d93bc5 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.OF_VERSION_1_0, FORTY_TWO, TestSubType.class); + new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_0, FORTY_TWO, TestSubType.VALUE); ExperimenterActionSerializerKey key2 = - new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_0, FORTY_TWO, TestSubType.class); + new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_0, FORTY_TWO, TestSubType.VALUE); Assert.assertTrue("Wrong equals", key1.equals(key2)); Assert.assertTrue("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_3, FORTY_TWO, TestSubType.class); + key2 = new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_3, FORTY_TWO, TestSubType.VALUE); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_0, (Uint32) null, TestSubType.class); + key2 = new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_0, (Uint32) null, TestSubType.VALUE); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); - key2 = new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_0, FIFTY_FIVE, TestSubType.class); + key2 = new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_0, FIFTY_FIVE, TestSubType.VALUE); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); 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.OF_VERSION_1_0, FIFTY_FIVE, TestSubType2.class); + key2 = new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_0, FIFTY_FIVE, TestSubType2.VALUE); Assert.assertFalse("Wrong equals", key1.equals(key2)); Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode()); } @@ -60,18 +60,25 @@ public class ExperimenterActionSerializerKeyTest { ExperimenterActionSerializerKey key2; 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.OF_VERSION_1_0, FORTY_TWO, TestSubType2.class); + key2 = new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_0, FORTY_TWO, TestSubType2.VALUE); Assert.assertFalse("Wrong equal by actionSubType.", key1.equals(key2)); - key1 = new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_0, FORTY_TWO, TestSubType.class); + key1 = new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_0, FORTY_TWO, TestSubType.VALUE); Assert.assertFalse("Wrong equal by actionSubType.", key1.equals(key2)); } private interface TestSubType extends ExperimenterActionSubType { + TestSubType VALUE = () -> TestSubType.class; + + @Override + Class implementedInterface(); // empty class - only used in test for comparation } private interface TestSubType2 extends ExperimenterActionSubType { - // empty class - only used in test for comparation + TestSubType2 VALUE = () -> TestSubType2.class; + + @Override + Class implementedInterface(); } } diff --git a/openflowjava/openflow-protocol-impl/pom.xml b/openflowjava/openflow-protocol-impl/pom.xml index 37046508dc..596376b567 100644 --- a/openflowjava/openflow-protocol-impl/pom.xml +++ b/openflowjava/openflow-protocol-impl/pom.xml @@ -77,8 +77,8 @@ org.osgi.service.component.annotations - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api provided true diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/SwitchConnectionProviderFactoryImpl.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/SwitchConnectionProviderFactoryImpl.java index 50eb8ffd60..445bb7a0b0 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/SwitchConnectionProviderFactoryImpl.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/SwitchConnectionProviderFactoryImpl.java @@ -57,7 +57,7 @@ public class SwitchConnectionProviderFactoryImpl implements SwitchConnectionProv try { address = getInetAddress(config.getAddress()); } catch (UnknownHostException e) { - throw new RuntimeException(e); + throw new IllegalStateException(e); } } diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/AbstractOxmMatchEntryDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/AbstractOxmMatchEntryDeserializer.java index eb85ac9ac7..af7cec53cb 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/AbstractOxmMatchEntryDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/AbstractOxmMatchEntryDeserializer.java @@ -26,17 +26,17 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc */ public abstract class AbstractOxmMatchEntryDeserializer implements HeaderDeserializer, OFDeserializer { - private final @NonNull Class oxmClass; - private final @NonNull Class oxmField; + private final @NonNull OxmClassBase oxmClass; + private final @NonNull MatchField oxmField; - protected AbstractOxmMatchEntryDeserializer(final Class oxmClass, - final Class oxmField) { + protected AbstractOxmMatchEntryDeserializer(final OxmClassBase oxmClass, + final MatchField oxmField) { this.oxmClass = requireNonNull(oxmClass); this.oxmField = requireNonNull(oxmField); } - protected AbstractOxmMatchEntryDeserializer(final Class oxmField) { - this(OpenflowBasicClass.class, oxmField); + protected AbstractOxmMatchEntryDeserializer(final MatchField oxmField) { + this(OpenflowBasicClass.VALUE, oxmField); } @Override diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmArpOpDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmArpOpDeserializer.java index 9f10d0c908..56a20e8897 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmArpOpDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmArpOpDeserializer.java @@ -22,7 +22,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc */ public class OxmArpOpDeserializer extends AbstractOxmMatchEntryDeserializer { public OxmArpOpDeserializer() { - super(ArpOp.class); + super(ArpOp.VALUE); } @Override diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmArpShaDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmArpShaDeserializer.java index 9a54972596..9ac1fade54 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmArpShaDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmArpShaDeserializer.java @@ -21,7 +21,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc */ public class OxmArpShaDeserializer extends AbstractOxmMatchEntryDeserializer { public OxmArpShaDeserializer() { - super(ArpSha.class); + super(ArpSha.VALUE); } @Override diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmArpSpaDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmArpSpaDeserializer.java index cd866b23b8..9cb20eb882 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmArpSpaDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmArpSpaDeserializer.java @@ -22,10 +22,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc */ public class OxmArpSpaDeserializer extends AbstractOxmMatchEntryDeserializer { public OxmArpSpaDeserializer() { - super(ArpSpa.class); + super(ArpSpa.VALUE); } - @Override protected void deserialize(final ByteBuf input, final MatchEntryBuilder builder) { final ArpSpaBuilder arpBuilder = new ArpSpaBuilder() diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmArpThaDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmArpThaDeserializer.java index 4290e9f16e..4bc6b3ae39 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmArpThaDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmArpThaDeserializer.java @@ -21,7 +21,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc */ public class OxmArpThaDeserializer extends AbstractOxmMatchEntryDeserializer { public OxmArpThaDeserializer() { - super(ArpTha.class); + super(ArpTha.VALUE); } @Override diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmArpTpaDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmArpTpaDeserializer.java index 2de98f2039..a26cb89c63 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmArpTpaDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmArpTpaDeserializer.java @@ -22,7 +22,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc */ public class OxmArpTpaDeserializer extends AbstractOxmMatchEntryDeserializer { public OxmArpTpaDeserializer() { - super(ArpTpa.class); + super(ArpTpa.VALUE); } @Override diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmEthDstDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmEthDstDeserializer.java index f16ae42c2b..8452da8c6d 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmEthDstDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmEthDstDeserializer.java @@ -21,7 +21,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc */ public class OxmEthDstDeserializer extends AbstractOxmMatchEntryDeserializer { public OxmEthDstDeserializer() { - super(EthDst.class); + super(EthDst.VALUE); } @Override diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmEthSrcDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmEthSrcDeserializer.java index 600118b1e0..f92d77d109 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmEthSrcDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmEthSrcDeserializer.java @@ -21,7 +21,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc */ public class OxmEthSrcDeserializer extends AbstractOxmMatchEntryDeserializer { public OxmEthSrcDeserializer() { - super(EthSrc.class); + super(EthSrc.VALUE); } @Override diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmEthTypeDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmEthTypeDeserializer.java index 7ce3e307d8..18cbe3367d 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmEthTypeDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmEthTypeDeserializer.java @@ -22,7 +22,7 @@ import org.opendaylight.yangtools.yang.common.netty.ByteBufUtils; */ public class OxmEthTypeDeserializer extends AbstractOxmMatchEntryDeserializer { public OxmEthTypeDeserializer() { - super(EthType.class); + super(EthType.VALUE); } @Override diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIcmpv4CodeDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIcmpv4CodeDeserializer.java index 79da95b532..0a0143723a 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIcmpv4CodeDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIcmpv4CodeDeserializer.java @@ -22,7 +22,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc */ public class OxmIcmpv4CodeDeserializer extends AbstractOxmMatchEntryDeserializer { public OxmIcmpv4CodeDeserializer() { - super(Icmpv4Code.class); + super(Icmpv4Code.VALUE); } @Override diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIcmpv4TypeDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIcmpv4TypeDeserializer.java index 0fa682c77c..a763943d28 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIcmpv4TypeDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIcmpv4TypeDeserializer.java @@ -22,7 +22,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc */ public class OxmIcmpv4TypeDeserializer extends AbstractOxmMatchEntryDeserializer { public OxmIcmpv4TypeDeserializer() { - super(Icmpv4Type.class); + super(Icmpv4Type.VALUE); } @Override diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIcmpv6CodeDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIcmpv6CodeDeserializer.java index 080cf79e49..d0d2f3aabd 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIcmpv6CodeDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIcmpv6CodeDeserializer.java @@ -22,7 +22,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc */ public class OxmIcmpv6CodeDeserializer extends AbstractOxmMatchEntryDeserializer { public OxmIcmpv6CodeDeserializer() { - super(Icmpv6Code.class); + super(Icmpv6Code.VALUE); } @Override diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIcmpv6TypeDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIcmpv6TypeDeserializer.java index 3b9058de3f..fd3e7625af 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIcmpv6TypeDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIcmpv6TypeDeserializer.java @@ -22,7 +22,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc */ public class OxmIcmpv6TypeDeserializer extends AbstractOxmMatchEntryDeserializer { public OxmIcmpv6TypeDeserializer() { - super(Icmpv6Type.class); + super(Icmpv6Type.VALUE); } @Override diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmInPhyPortDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmInPhyPortDeserializer.java index 9d71aa9a54..707cee4385 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmInPhyPortDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmInPhyPortDeserializer.java @@ -23,7 +23,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc */ public class OxmInPhyPortDeserializer extends AbstractOxmMatchEntryDeserializer { public OxmInPhyPortDeserializer() { - super(InPhyPort.class); + super(InPhyPort.VALUE); } @Override diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmInPortDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmInPortDeserializer.java index 74b3deaae6..220e23318c 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmInPortDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmInPortDeserializer.java @@ -23,7 +23,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc */ public class OxmInPortDeserializer extends AbstractOxmMatchEntryDeserializer { public OxmInPortDeserializer() { - super(InPort.class); + super(InPort.VALUE); } @Override diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpDscpDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpDscpDeserializer.java index c3c1313808..fa16322481 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpDscpDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpDscpDeserializer.java @@ -22,7 +22,7 @@ import org.opendaylight.yangtools.yang.common.netty.ByteBufUtils; */ public class OxmIpDscpDeserializer extends AbstractOxmMatchEntryDeserializer { public OxmIpDscpDeserializer() { - super(IpDscp.class); + super(IpDscp.VALUE); } @Override diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpEcnDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpEcnDeserializer.java index 2b464a90e6..4fde9ce005 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpEcnDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpEcnDeserializer.java @@ -22,7 +22,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc */ public class OxmIpEcnDeserializer extends AbstractOxmMatchEntryDeserializer { public OxmIpEcnDeserializer() { - super(IpEcn.class); + super(IpEcn.VALUE); } @Override diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpProtoDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpProtoDeserializer.java index 58cf2912c2..4bfb022f8b 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpProtoDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpProtoDeserializer.java @@ -22,7 +22,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc */ public class OxmIpProtoDeserializer extends AbstractOxmMatchEntryDeserializer { public OxmIpProtoDeserializer() { - super(IpProto.class); + super(IpProto.VALUE); } @Override diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv4DstDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv4DstDeserializer.java index daf07d2d95..61a02cae38 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv4DstDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv4DstDeserializer.java @@ -22,7 +22,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc */ public class OxmIpv4DstDeserializer extends AbstractOxmMatchEntryDeserializer { public OxmIpv4DstDeserializer() { - super(Ipv4Dst.class); + super(Ipv4Dst.VALUE); } @Override diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv4SrcDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv4SrcDeserializer.java index 044c095162..57f7a18826 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv4SrcDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv4SrcDeserializer.java @@ -22,7 +22,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc */ public class OxmIpv4SrcDeserializer extends AbstractOxmMatchEntryDeserializer { public OxmIpv4SrcDeserializer() { - super(Ipv4Src.class); + super(Ipv4Src.VALUE); } @Override diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6DstDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6DstDeserializer.java index 581ccebb78..a0f4f974ef 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6DstDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6DstDeserializer.java @@ -22,7 +22,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc */ public class OxmIpv6DstDeserializer extends AbstractOxmMatchEntryDeserializer { public OxmIpv6DstDeserializer() { - super(Ipv6Dst.class); + super(Ipv6Dst.VALUE); } @Override diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6ExtHdrDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6ExtHdrDeserializer.java index 1fbe87c92e..00e2d385ad 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6ExtHdrDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6ExtHdrDeserializer.java @@ -21,7 +21,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc */ public class OxmIpv6ExtHdrDeserializer extends AbstractOxmMatchEntryDeserializer { public OxmIpv6ExtHdrDeserializer() { - super(Ipv6Exthdr.class); + super(Ipv6Exthdr.VALUE); } @Override diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6FlabelDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6FlabelDeserializer.java index 95cc99b940..161bdb26a0 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6FlabelDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6FlabelDeserializer.java @@ -23,7 +23,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc */ public class OxmIpv6FlabelDeserializer extends AbstractOxmMatchEntryDeserializer { public OxmIpv6FlabelDeserializer() { - super(Ipv6Flabel.class); + super(Ipv6Flabel.VALUE); } @Override diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6NdSllDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6NdSllDeserializer.java index 8bb8d0566c..c5a7769def 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6NdSllDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6NdSllDeserializer.java @@ -20,7 +20,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc */ public class OxmIpv6NdSllDeserializer extends AbstractOxmMatchEntryDeserializer { public OxmIpv6NdSllDeserializer() { - super(Ipv6NdSll.class); + super(Ipv6NdSll.VALUE); } @Override diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6NdTargetDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6NdTargetDeserializer.java index c36c3378d3..c4d10926d6 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6NdTargetDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6NdTargetDeserializer.java @@ -21,7 +21,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc */ public class OxmIpv6NdTargetDeserializer extends AbstractOxmMatchEntryDeserializer { public OxmIpv6NdTargetDeserializer() { - super(Ipv6NdTarget.class); + super(Ipv6NdTarget.VALUE); } @Override diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6NdTllDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6NdTllDeserializer.java index f54365e2db..a415f7bfdf 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6NdTllDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6NdTllDeserializer.java @@ -20,7 +20,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc */ public class OxmIpv6NdTllDeserializer extends AbstractOxmMatchEntryDeserializer { public OxmIpv6NdTllDeserializer() { - super(Ipv6NdTll.class); + super(Ipv6NdTll.VALUE); } @Override diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6SrcDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6SrcDeserializer.java index f04cd6f161..03e1d4fe6b 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6SrcDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6SrcDeserializer.java @@ -22,7 +22,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc */ public class OxmIpv6SrcDeserializer extends AbstractOxmMatchEntryDeserializer { public OxmIpv6SrcDeserializer() { - super(Ipv6Src.class); + super(Ipv6Src.VALUE); } @Override diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmMetadataDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmMetadataDeserializer.java index 44d0147903..f5a22e5128 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmMetadataDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmMetadataDeserializer.java @@ -20,7 +20,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc */ public class OxmMetadataDeserializer extends AbstractOxmMatchEntryDeserializer { public OxmMetadataDeserializer() { - super(Metadata.class); + super(Metadata.VALUE); } @Override diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmMplsBosDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmMplsBosDeserializer.java index ee49e7881c..cd5e60e4c3 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmMplsBosDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmMplsBosDeserializer.java @@ -20,7 +20,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc */ public class OxmMplsBosDeserializer extends AbstractOxmMatchEntryDeserializer { public OxmMplsBosDeserializer() { - super(MplsBos.class); + super(MplsBos.VALUE); } @Override diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmMplsLabelDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmMplsLabelDeserializer.java index 3ef91f35b8..f58a4b2a1e 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmMplsLabelDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmMplsLabelDeserializer.java @@ -22,7 +22,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc */ public class OxmMplsLabelDeserializer extends AbstractOxmMatchEntryDeserializer { public OxmMplsLabelDeserializer() { - super(MplsLabel.class); + super(MplsLabel.VALUE); } @Override diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmMplsTcDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmMplsTcDeserializer.java index 7f7e0184c0..f8c0d964c7 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmMplsTcDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmMplsTcDeserializer.java @@ -22,7 +22,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc */ public class OxmMplsTcDeserializer extends AbstractOxmMatchEntryDeserializer { public OxmMplsTcDeserializer() { - super(MplsTc.class); + super(MplsTc.VALUE); } @Override diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmPacketTypeDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmPacketTypeDeserializer.java index 121cbd62a2..dc53d79b3b 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmPacketTypeDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmPacketTypeDeserializer.java @@ -17,7 +17,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc public class OxmPacketTypeDeserializer extends AbstractOxmMatchEntryDeserializer { public OxmPacketTypeDeserializer() { - super(PacketType.class); + super(PacketType.VALUE); } @Override diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmPbbIsidDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmPbbIsidDeserializer.java index 8c2ad5d872..e4da6d382b 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmPbbIsidDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmPbbIsidDeserializer.java @@ -22,7 +22,7 @@ import org.opendaylight.yangtools.yang.common.Uint32; */ public class OxmPbbIsidDeserializer extends AbstractOxmMatchEntryDeserializer { public OxmPbbIsidDeserializer() { - super(PbbIsid.class); + super(PbbIsid.VALUE); } @Override diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmSctpDstDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmSctpDstDeserializer.java index 664729e875..d1ba0691a9 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmSctpDstDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmSctpDstDeserializer.java @@ -23,7 +23,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc */ public class OxmSctpDstDeserializer extends AbstractOxmMatchEntryDeserializer { public OxmSctpDstDeserializer() { - super(SctpDst.class); + super(SctpDst.VALUE); } @Override diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmSctpSrcDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmSctpSrcDeserializer.java index 03dad82f5a..608a50572f 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmSctpSrcDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmSctpSrcDeserializer.java @@ -23,7 +23,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc */ public class OxmSctpSrcDeserializer extends AbstractOxmMatchEntryDeserializer { public OxmSctpSrcDeserializer() { - super(SctpSrc.class); + super(SctpSrc.VALUE); } @Override diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmTcpDstDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmTcpDstDeserializer.java index 2ba1ed9211..7d42370888 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmTcpDstDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmTcpDstDeserializer.java @@ -23,7 +23,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc */ public class OxmTcpDstDeserializer extends AbstractOxmMatchEntryDeserializer { public OxmTcpDstDeserializer() { - super(TcpDst.class); + super(TcpDst.VALUE); } @Override diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmTcpSrcDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmTcpSrcDeserializer.java index c263f48cf9..7933d8acdb 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmTcpSrcDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmTcpSrcDeserializer.java @@ -23,7 +23,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc */ public class OxmTcpSrcDeserializer extends AbstractOxmMatchEntryDeserializer { public OxmTcpSrcDeserializer() { - super(TcpSrc.class); + super(TcpSrc.VALUE); } @Override diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmTunnelIdDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmTunnelIdDeserializer.java index 62c6762da4..3b84ae6c29 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmTunnelIdDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmTunnelIdDeserializer.java @@ -20,7 +20,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc */ public class OxmTunnelIdDeserializer extends AbstractOxmMatchEntryDeserializer { public OxmTunnelIdDeserializer() { - super(TunnelId.class); + super(TunnelId.VALUE); } @Override diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmUdpDstDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmUdpDstDeserializer.java index 0de5dcf91b..f3c8d79ffe 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmUdpDstDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmUdpDstDeserializer.java @@ -23,7 +23,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc */ public class OxmUdpDstDeserializer extends AbstractOxmMatchEntryDeserializer { public OxmUdpDstDeserializer() { - super(UdpDst.class); + super(UdpDst.VALUE); } @Override diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmUdpSrcDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmUdpSrcDeserializer.java index c40fcf8b42..7e4a217506 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmUdpSrcDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmUdpSrcDeserializer.java @@ -23,7 +23,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc */ public class OxmUdpSrcDeserializer extends AbstractOxmMatchEntryDeserializer { public OxmUdpSrcDeserializer() { - super(UdpSrc.class); + super(UdpSrc.VALUE); } @Override diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmVlanPcpDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmVlanPcpDeserializer.java index 8c218597ef..fbcce37d94 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmVlanPcpDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmVlanPcpDeserializer.java @@ -22,7 +22,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc */ public class OxmVlanPcpDeserializer extends AbstractOxmMatchEntryDeserializer { public OxmVlanPcpDeserializer() { - super(VlanPcp.class); + super(VlanPcp.VALUE); } @Override diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmVlanVidDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmVlanVidDeserializer.java index 43c3fc44d4..97dc2c75d6 100644 --- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmVlanVidDeserializer.java +++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmVlanVidDeserializer.java @@ -21,7 +21,7 @@ import org.opendaylight.yangtools.yang.common.Uint16; */ public class OxmVlanVidDeserializer extends AbstractOxmMatchEntryDeserializer { public OxmVlanVidDeserializer() { - super(VlanVid.class); + super(VlanVid.VALUE); } @Override 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 e315b791ea..da3d528619 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 @@ -24,8 +24,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc public abstract class AbstractOxmExperimenterMatchEntryDeserializer extends AbstractOxmMatchEntryDeserializer { - protected AbstractOxmExperimenterMatchEntryDeserializer(final Class oxmField) { - super(ExperimenterClass.class, oxmField); + protected AbstractOxmExperimenterMatchEntryDeserializer(final MatchField oxmField) { + super(ExperimenterClass.VALUE, oxmField); } protected ExperimenterIdCaseBuilder createExperimenterIdCase(final MatchEntryBuilder entryBuilder, 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 f88e0b27c3..d52ec57632 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 @@ -21,7 +21,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc */ public class OnfOxmTcpFlagsDeserializer extends AbstractOxmExperimenterMatchEntryDeserializer { public OnfOxmTcpFlagsDeserializer() { - super(TcpFlags.class); + super(TcpFlags.VALUE); } @Override 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 3c4e697b6e..61f57a88bf 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 @@ -111,54 +111,54 @@ public final class MatchEntriesInitializer { */ public static void registerMatchEntrySerializers(final SerializerRegistry serializerRegistry) { // register OF v1.3 OpenflowBasicClass match entry serializers - Class oxmClass = OpenflowBasicClass.class; + OpenflowBasicClass oxmClass = OpenflowBasicClass.VALUE; MatchEntrySerializerRegistryHelper helper = new MatchEntrySerializerRegistryHelper<>(EncodeConstants.OF_VERSION_1_3, oxmClass, serializerRegistry); - helper.registerSerializer(InPort.class, new OxmInPortSerializer()); - helper.registerSerializer(InPhyPort.class, new OxmInPhyPortSerializer()); - helper.registerSerializer(Metadata.class, new OxmMetadataSerializer()); - helper.registerSerializer(PacketType.class, new OxmPacketTypeSerializer()); - helper.registerSerializer(EthDst.class, new OxmEthDstSerializer()); - helper.registerSerializer(EthSrc.class, new OxmEthSrcSerializer()); - helper.registerSerializer(EthType.class, new OxmEthTypeSerializer()); - helper.registerSerializer(VlanVid.class, new OxmVlanVidSerializer()); - helper.registerSerializer(VlanPcp.class, new OxmVlanPcpSerializer()); - helper.registerSerializer(IpDscp.class, new OxmIpDscpSerializer()); - helper.registerSerializer(IpEcn.class, new OxmIpEcnSerializer()); - helper.registerSerializer(IpProto.class, new OxmIpProtoSerializer()); - helper.registerSerializer(Ipv4Src.class, new OxmIpv4SrcSerializer()); - helper.registerSerializer(Ipv4Dst.class, new OxmIpv4DstSerializer()); - helper.registerSerializer(TcpSrc.class, new OxmTcpSrcSerializer()); - helper.registerSerializer(TcpDst.class, new OxmTcpDstSerializer()); - helper.registerSerializer(UdpSrc.class, new OxmUdpSrcSerializer()); - helper.registerSerializer(UdpDst.class, new OxmUdpDstSerializer()); - helper.registerSerializer(SctpSrc.class, new OxmSctpSrcSerializer()); - helper.registerSerializer(SctpDst.class, new OxmSctpDstSerializer()); - helper.registerSerializer(Icmpv4Type.class, new OxmIcmpv4TypeSerializer()); - helper.registerSerializer(Icmpv4Code.class, new OxmIcmpv4CodeSerializer()); - helper.registerSerializer(ArpOp.class, new OxmArpOpSerializer()); - helper.registerSerializer(ArpSpa.class, new OxmArpSpaSerializer()); - helper.registerSerializer(ArpTpa.class, new OxmArpTpaSerializer()); - helper.registerSerializer(ArpSha.class, new OxmArpShaSerializer()); - helper.registerSerializer(ArpTha.class, new OxmArpThaSerializer()); - helper.registerSerializer(Ipv6Src.class, new OxmIpv6SrcSerializer()); - helper.registerSerializer(Ipv6Dst.class, new OxmIpv6DstSerializer()); - helper.registerSerializer(Ipv6Flabel.class, new OxmIpv6FlabelSerializer()); - helper.registerSerializer(Icmpv6Type.class, new OxmIcmpv6TypeSerializer()); - helper.registerSerializer(Icmpv6Code.class, new OxmIcmpv6CodeSerializer()); - helper.registerSerializer(Ipv6NdTarget.class, new OxmIpv6NdTargetSerializer()); - helper.registerSerializer(Ipv6NdSll.class, new OxmIpv6NdSllSerializer()); - helper.registerSerializer(Ipv6NdTll.class, new OxmIpv6NdTllSerializer()); - helper.registerSerializer(MplsLabel.class, new OxmMplsLabelSerializer()); - helper.registerSerializer(MplsTc.class, new OxmMplsTcSerializer()); - helper.registerSerializer(MplsBos.class, new OxmMplsBosSerializer()); - helper.registerSerializer(PbbIsid.class, new OxmPbbIsidSerializer()); - helper.registerSerializer(TunnelId.class, new OxmTunnelIdSerializer()); - helper.registerSerializer(Ipv6Exthdr.class, new OxmIpv6ExtHdrSerializer()); + helper.registerSerializer(InPort.VALUE, new OxmInPortSerializer()); + helper.registerSerializer(InPhyPort.VALUE, new OxmInPhyPortSerializer()); + helper.registerSerializer(Metadata.VALUE, new OxmMetadataSerializer()); + helper.registerSerializer(PacketType.VALUE, new OxmPacketTypeSerializer()); + helper.registerSerializer(EthDst.VALUE, new OxmEthDstSerializer()); + helper.registerSerializer(EthSrc.VALUE, new OxmEthSrcSerializer()); + helper.registerSerializer(EthType.VALUE, new OxmEthTypeSerializer()); + helper.registerSerializer(VlanVid.VALUE, new OxmVlanVidSerializer()); + helper.registerSerializer(VlanPcp.VALUE, new OxmVlanPcpSerializer()); + helper.registerSerializer(IpDscp.VALUE, new OxmIpDscpSerializer()); + helper.registerSerializer(IpEcn.VALUE, new OxmIpEcnSerializer()); + helper.registerSerializer(IpProto.VALUE, new OxmIpProtoSerializer()); + helper.registerSerializer(Ipv4Src.VALUE, new OxmIpv4SrcSerializer()); + helper.registerSerializer(Ipv4Dst.VALUE, new OxmIpv4DstSerializer()); + helper.registerSerializer(TcpSrc.VALUE, new OxmTcpSrcSerializer()); + helper.registerSerializer(TcpDst.VALUE, new OxmTcpDstSerializer()); + helper.registerSerializer(UdpSrc.VALUE, new OxmUdpSrcSerializer()); + helper.registerSerializer(UdpDst.VALUE, new OxmUdpDstSerializer()); + helper.registerSerializer(SctpSrc.VALUE, new OxmSctpSrcSerializer()); + helper.registerSerializer(SctpDst.VALUE, new OxmSctpDstSerializer()); + helper.registerSerializer(Icmpv4Type.VALUE, new OxmIcmpv4TypeSerializer()); + helper.registerSerializer(Icmpv4Code.VALUE, new OxmIcmpv4CodeSerializer()); + helper.registerSerializer(ArpOp.VALUE, new OxmArpOpSerializer()); + helper.registerSerializer(ArpSpa.VALUE, new OxmArpSpaSerializer()); + helper.registerSerializer(ArpTpa.VALUE, new OxmArpTpaSerializer()); + helper.registerSerializer(ArpSha.VALUE, new OxmArpShaSerializer()); + helper.registerSerializer(ArpTha.VALUE, new OxmArpThaSerializer()); + helper.registerSerializer(Ipv6Src.VALUE, new OxmIpv6SrcSerializer()); + helper.registerSerializer(Ipv6Dst.VALUE, new OxmIpv6DstSerializer()); + helper.registerSerializer(Ipv6Flabel.VALUE, new OxmIpv6FlabelSerializer()); + helper.registerSerializer(Icmpv6Type.VALUE, new OxmIcmpv6TypeSerializer()); + helper.registerSerializer(Icmpv6Code.VALUE, new OxmIcmpv6CodeSerializer()); + helper.registerSerializer(Ipv6NdTarget.VALUE, new OxmIpv6NdTargetSerializer()); + helper.registerSerializer(Ipv6NdSll.VALUE, new OxmIpv6NdSllSerializer()); + helper.registerSerializer(Ipv6NdTll.VALUE, new OxmIpv6NdTllSerializer()); + helper.registerSerializer(MplsLabel.VALUE, new OxmMplsLabelSerializer()); + helper.registerSerializer(MplsTc.VALUE, new OxmMplsTcSerializer()); + helper.registerSerializer(MplsBos.VALUE, new OxmMplsBosSerializer()); + helper.registerSerializer(PbbIsid.VALUE, new OxmPbbIsidSerializer()); + helper.registerSerializer(TunnelId.VALUE, new OxmTunnelIdSerializer()); + helper.registerSerializer(Ipv6Exthdr.VALUE, new OxmIpv6ExtHdrSerializer()); // Register approved openflow match entry serializers - helper.registerExperimenterSerializer(TcpFlags.class, EncodeConstants.ONF_EXPERIMENTER_ID, + helper.registerExperimenterSerializer(TcpFlags.VALUE, EncodeConstants.ONF_EXPERIMENTER_ID, new OnfOxmTcpFlagsSerializer()); } } 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 82d899acf0..4208bc86e1 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 @@ -46,7 +46,7 @@ public class OF13SetFieldActionSerializer implements OFSerializer, .getMatchEntry().get(0); MatchEntrySerializerKey key = new MatchEntrySerializerKey<>( EncodeConstants.OF_VERSION_1_3, entry.getOxmClass(), entry.getOxmMatchField()); - if (entry.getOxmClass().equals(ExperimenterClass.class)) { + if (ExperimenterClass.VALUE.equals(entry.getOxmClass())) { ExperimenterIdCase experimenterIdCase = (ExperimenterIdCase) entry.getMatchEntryValue(); key.setExperimenterId(experimenterIdCase.getExperimenter().getExperimenter().getValue()); } else { 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 7a4872b23a..4ab309a272 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 @@ -89,7 +89,7 @@ public class MeterModInputMessageFactory implements OFSerializer, experimenterBand.augmentation(ExperimenterIdMeterBand.class); if (expIdMeterBand != null) { Uint32 expId = expIdMeterBand.getExperimenter().getValue(); - Class meterBandSubType = expIdMeterBand.getSubType(); + ExperimenterMeterBandSubType meterBandSubType = expIdMeterBand.getSubType(); try { OFSerializer serializer = registry.getSerializer( ExperimenterSerializerKeyFactory.createMeterBandSerializerKey( 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 031e48200b..8867b59a31 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 @@ -39,10 +39,10 @@ public class MatchDeserializer implements OFDeserializer, int length = input.readUnsignedShort(); switch (type) { case 0: - builder.setType(StandardMatchType.class); + builder.setType(StandardMatchType.VALUE); break; case 1: - builder.setType(OxmMatchType.class); + builder.setType(OxmMatchType.VALUE); break; default: break; @@ -62,6 +62,6 @@ public class MatchDeserializer implements OFDeserializer, @Override public void injectDeserializerRegistry(final DeserializerRegistry deserializerRegistry) { - this.registry = deserializerRegistry; + 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 1cfd49725c..df8fc5a30b 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 @@ -27,7 +27,7 @@ import org.opendaylight.yangtools.yang.common.Uint8; public class MatchEntrySerializerRegistryHelper { private final Uint8 version; - private final Class generalClass; + private final C generalClass; private final SerializerRegistry serializerRegistry; /** @@ -37,7 +37,7 @@ 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 Uint8 version, final Class generalClass, + public MatchEntrySerializerRegistryHelper(final Uint8 version, final C generalClass, final SerializerRegistry serializerRegistry) { this.version = requireNonNull(version); this.generalClass = generalClass; @@ -51,7 +51,7 @@ public class MatchEntrySerializerRegistryHelper { * @param serializer the serializer instance */ public void registerSerializer( - final Class specificClass, final OFGeneralSerializer serializer) { + final F specificClass, final OFGeneralSerializer serializer) { MatchEntrySerializerKey key = new MatchEntrySerializerKey<>(version, generalClass, specificClass); key.setExperimenterId(null); serializerRegistry.registerSerializer(key, serializer); @@ -64,9 +64,9 @@ public class MatchEntrySerializerRegistryHelper { * @param serializer the serializer instance */ public void registerExperimenterSerializer( - final Class specificClass, final Uint32 expId, final OFGeneralSerializer serializer) { + final F specificClass, final Uint32 expId, final OFGeneralSerializer serializer) { MatchEntrySerializerKey key = new MatchEntrySerializerKey<>( - version, ExperimenterClass.class, specificClass); + version, ExperimenterClass.VALUE, specificClass); key.setExperimenterId(expId); serializerRegistry.registerSerializer(key, serializer); } 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 fa072741a3..b208e9e449 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 @@ -57,9 +57,9 @@ public class OF13MatchSerializer implements OFSerializer, SerializerRegis } private static void serializeType(final Match match, final ByteBuf out) { - if (match.getType().isAssignableFrom(StandardMatchType.class)) { + if (match.getType() instanceof StandardMatchType) { out.writeShort(STANDARD_MATCH_TYPE_CODE); - } else if (match.getType().isAssignableFrom(OxmMatchType.class)) { + } else if (match.getType() instanceof OxmMatchType) { out.writeShort(OXM_MATCH_TYPE_CODE); } } @@ -79,7 +79,7 @@ public class OF13MatchSerializer implements OFSerializer, SerializerRegis MatchEntrySerializerKey key = new MatchEntrySerializerKey<>( EncodeConstants.OF_VERSION_1_3, entry.getOxmClass(), entry.getOxmMatchField()); - if (entry.getOxmClass().equals(ExperimenterClass.class)) { + if (ExperimenterClass.VALUE.equals(entry.getOxmClass())) { ExperimenterIdCase entryValue = (ExperimenterIdCase) entry.getMatchEntryValue(); key.setExperimenterId(entryValue.getExperimenter().getExperimenter().getValue()); } else { @@ -92,6 +92,6 @@ public class OF13MatchSerializer implements OFSerializer, SerializerRegis @Override public void injectSerializerRegistry(final SerializerRegistry serializerRegistry) { - this.registry = serializerRegistry; + registry = serializerRegistry; } } 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 9253a28b6a..91c961d25e 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 @@ -46,7 +46,7 @@ public final class TypeKeyMakerFactory { MatchEntrySerializerKey key; key = new MatchEntrySerializerKey<>(getVersion(), entry.getOxmClass(), entry.getOxmMatchField()); - if (entry.getOxmClass().equals(ExperimenterClass.class)) { + if (ExperimenterClass.VALUE.equals(entry.getOxmClass())) { ExperimenterIdCase entryValue = (ExperimenterIdCase) entry.getMatchEntryValue(); key.setExperimenterId(entryValue.getExperimenter().getExperimenter().getValue()); return key; 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 21acd56900..2a9aced7dd 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 @@ -150,9 +150,8 @@ public class SwitchConnectionProviderImpl02Test { public void testUnregisterExistingKeys() throws UnknownHostException { startUp(TransportProtocol.TCP); // -- registerActionSerializer - final ExperimenterActionSerializerKey key1 - = new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(42), - TestSubType.class); + final ExperimenterActionSerializerKey key1 = + new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(42), TestSubType.VALUE); provider.registerActionSerializer(key1, serializer); Assert.assertTrue("Wrong -- unregister ActionSerializer", provider.unregisterSerializer(key1)); Assert.assertFalse("Wrong -- unregister ActionSerializer by not existing key", @@ -165,22 +164,22 @@ public class SwitchConnectionProviderImpl02Test { Assert.assertFalse("Wrong -- unregister ActionDeserializer by not existing key", provider.unregisterDeserializer(key2)); // -- registerInstructionSerializer - final ExperimenterInstructionSerializerKey key3 - = new ExperimenterInstructionSerializerKey(EncodeConstants.OF_VERSION_1_0, 42L); + final ExperimenterInstructionSerializerKey key3 = + 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.OF_VERSION_1_0, 42L); + final ExperimenterInstructionDeserializerKey key4 = + 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.OF_VERSION_1_0, 0x8000, 42); + final MatchEntryDeserializerKey key5 = + 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", @@ -229,40 +228,40 @@ public class SwitchConnectionProviderImpl02Test { Assert.assertFalse("Wrong -- unregister MeterBandDeserializer by not existing key", provider.unregisterDeserializer(key11)); // -- registerExperimenterMessageSerializer - ExperimenterIdSerializerKey key12 - = new ExperimenterIdSerializerKey<>(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(42), - ExperimenterDataOfChoice.class); + ExperimenterIdSerializerKey key12 = + new ExperimenterIdSerializerKey<>(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(42), + ExperimenterDataOfChoice.class); provider.registerExperimenterMessageSerializer(key12, serializerExperimenterInput); Assert.assertTrue("Wrong -- unregister ExperimenterMessageSerializer", provider.unregisterSerializer(key12)); Assert.assertFalse("Wrong -- unregister ExperimenterMessageSerializer by not existing key", provider.unregisterSerializer(key12)); //registerMultipartRequestSerializer - ExperimenterIdSerializerKey key13 - = new ExperimenterIdSerializerKey<>(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(42), - ExperimenterDataOfChoice.class); + ExperimenterIdSerializerKey key13 = + new ExperimenterIdSerializerKey<>(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(42), + ExperimenterDataOfChoice.class); provider.registerMultipartRequestSerializer(key13, serializerMultipartRequestExpCase); Assert.assertTrue("Wrong -- unregister MultipartRequestSerializer", provider.unregisterSerializer(key13)); Assert.assertFalse("Wrong -- unregister MultipartRequestSerializer by not existing key", provider.unregisterSerializer(key13)); // -- registerMultipartRequestTFSerializer - final ExperimenterIdSerializerKey key14 - = new ExperimenterIdSerializerKey<>(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(42), - TableFeatureProperties.class); + final ExperimenterIdSerializerKey key14 = + 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.OF_VERSION_1_0, Uint32.valueOf(42), - MeterBandExperimenterCase.class,null); + final ExperimenterIdMeterSubTypeSerializerKey key15 = + 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)); Assert.assertFalse("Wrong -- unregister MeterBandSerializer by not existing key", provider.unregisterSerializer(key15)); // -- registerMatchEntrySerializer - final MatchEntrySerializerKey key16 - = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, OpenflowBasicClass.class, InPort.class); + final MatchEntrySerializerKey key16 = + new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, OpenflowBasicClass.VALUE, InPort.VALUE); provider.registerMatchEntrySerializer(key16, serializer); Assert.assertTrue("Wrong -- unregister MatchEntrySerializer", provider.unregisterSerializer(key16)); Assert.assertFalse("Wrong -- unregister MatchEntrySerializer by not existing key", @@ -276,6 +275,6 @@ public class SwitchConnectionProviderImpl02Test { } private interface TestSubType extends ExperimenterActionSubType { - // empty class - only used in test for comparation + TestSubType VALUE = () -> TestSubType.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 f50d820a7a..01aede96d8 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 @@ -138,11 +138,11 @@ public class FlowModInputMessageFactoryTest { private static Match createMatch() { MatchBuilder matchBuilder = new MatchBuilder(); - matchBuilder.setType(OxmMatchType.class); + matchBuilder.setType(OxmMatchType.VALUE); final List entries = new ArrayList<>(); MatchEntryBuilder entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(InPhyPort.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(InPhyPort.VALUE); entriesBuilder.setHasMask(false); InPhyPortCaseBuilder inPhyPortCaseBuilder = new InPhyPortCaseBuilder(); InPhyPortBuilder inPhyPortBuilder = new InPhyPortBuilder(); @@ -150,8 +150,8 @@ public class FlowModInputMessageFactoryTest { inPhyPortCaseBuilder.setInPhyPort(inPhyPortBuilder.build()); entriesBuilder.setMatchEntryValue(inPhyPortCaseBuilder.build()); entries.add(entriesBuilder.build()); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(IpEcn.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(IpEcn.VALUE); entriesBuilder.setHasMask(false); IpEcnCaseBuilder ipEcnCaseBuilder = new IpEcnCaseBuilder(); IpEcnBuilder ipEcnBuilder = new IpEcnBuilder(); @@ -162,5 +162,4 @@ public class FlowModInputMessageFactoryTest { matchBuilder.setMatchEntry(entries); return matchBuilder.build(); } - } 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 53b253a472..8088cb1393 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 @@ -911,11 +911,11 @@ public class MultipartReplyMessageFactoryTest { Assert.assertTrue("Wrong setFieldType", message.getGroupDesc().get(0).getBucketsList().get(0) .getAction().get(1).getActionChoice() instanceof SetFieldCase); - Assert.assertEquals("Wrong setFieldOXMClass", OpenflowBasicClass.class, + Assert.assertEquals("Wrong setFieldOXMClass", OpenflowBasicClass.VALUE, ((SetFieldCase) message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(1) .getActionChoice()).getSetFieldAction().getMatchEntry().get(0).getOxmClass()); - Assert.assertEquals("Wrong setFieldOXMField", InPort.class, + Assert.assertEquals("Wrong setFieldOXMField", InPort.VALUE, ((SetFieldCase) message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(1) .getActionChoice()).getSetFieldAction().getMatchEntry().get(0).getOxmMatchField()); 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 4e12acaba0..1ced0ce0a3 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 @@ -137,8 +137,8 @@ public class MultipartRequestTableFeaturesInputMessageFactoryTest { public List createMatchEntries() { final List entries = new ArrayList<>(); MatchEntryBuilder entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(InPhyPort.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(InPhyPort.VALUE); entriesBuilder.setHasMask(false); entries.add(entriesBuilder.build()); return entries; 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 7fbeff4b1d..9a34e13d1b 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 @@ -111,7 +111,7 @@ public class MultipartReplyFlowTest { Assert.assertEquals("Wrong cookie", Uint64.valueOf("FF01010101010101", 16), flowStats1.getCookie()); Assert.assertEquals("Wrong packetCount", Uint64.valueOf("EF01010101010101", 16), flowStats1.getPacketCount()); Assert.assertEquals("Wrong byteCount", Uint64.valueOf("7F01010101010101", 16), flowStats1.getByteCount()); - Assert.assertEquals("Wrong match type", OxmMatchType.class, flowStats1.getMatch().getType()); + Assert.assertEquals("Wrong match type", OxmMatchType.VALUE, flowStats1.getMatch().getType()); flowStats1 = message.getFlowStats().get(1); Assert.assertEquals("Wrong tableId", 8, flowStats1.getTableId().intValue()); Assert.assertEquals("Wrong durationSec", 9, flowStats1.getDurationSec().intValue()); @@ -123,6 +123,6 @@ public class MultipartReplyFlowTest { Assert.assertEquals("Wrong cookie", Uint64.valueOf("FF01010101010101", 16), flowStats1.getCookie()); Assert.assertEquals("Wrong packetCount", Uint64.valueOf("EF01010101010101", 16), flowStats1.getPacketCount()); Assert.assertEquals("Wrong byteCount", Uint64.valueOf("7F01010101010101", 16), flowStats1.getByteCount()); - Assert.assertEquals("Wrong match type", OxmMatchType.class, flowStats1.getMatch().getType()); + Assert.assertEquals("Wrong match type", OxmMatchType.VALUE, flowStats1.getMatch().getType()); } } diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6ExtHdrDeserializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6ExtHdrDeserializerTest.java index bf34baf24a..eaf80f724b 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6ExtHdrDeserializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6ExtHdrDeserializerTest.java @@ -35,8 +35,8 @@ public class OxmIpv6ExtHdrDeserializerTest { OxmIpv6ExtHdrDeserializer deserializer = new OxmIpv6ExtHdrDeserializer(); MatchEntry entry = deserializer.deserialize(buffer); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry.getOxmClass()); - Assert.assertEquals("Wrong entry field", Ipv6Exthdr.class, entry.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry.getOxmClass()); + Assert.assertEquals("Wrong entry field", Ipv6Exthdr.VALUE, entry.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", false, entry.getHasMask()); Assert.assertEquals("Wrong entry value", new Ipv6ExthdrFlags(true, true, true, true, true, true, true, true, true), diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6FlabelDeserializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6FlabelDeserializerTest.java index c0b32b741c..a47033ddd8 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6FlabelDeserializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6FlabelDeserializerTest.java @@ -34,8 +34,8 @@ public class OxmIpv6FlabelDeserializerTest { OxmIpv6FlabelDeserializer deserializer = new OxmIpv6FlabelDeserializer(); MatchEntry entry = deserializer.deserialize(buffer); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry.getOxmClass()); - Assert.assertEquals("Wrong entry field", Ipv6Flabel.class, entry.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry.getOxmClass()); + Assert.assertEquals("Wrong entry field", Ipv6Flabel.VALUE, entry.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", false, entry.getHasMask()); Assert.assertEquals("Wrong entry value", 2, ((Ipv6FlabelCase) entry.getMatchEntryValue()).getIpv6Flabel() @@ -53,8 +53,8 @@ public class OxmIpv6FlabelDeserializerTest { OxmIpv6FlabelDeserializer deserializer = new OxmIpv6FlabelDeserializer(); MatchEntry entry = deserializer.deserialize(buffer); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry.getOxmClass()); - Assert.assertEquals("Wrong entry field", Ipv6Flabel.class, entry.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry.getOxmClass()); + Assert.assertEquals("Wrong entry field", Ipv6Flabel.VALUE, entry.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", true, entry.getHasMask()); Assert.assertEquals("Wrong entry value", 2, ((Ipv6FlabelCase) entry.getMatchEntryValue()).getIpv6Flabel() diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmMetadataDeserializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmMetadataDeserializerTest.java index f4f97b8615..14e4a0b753 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmMetadataDeserializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmMetadataDeserializerTest.java @@ -35,8 +35,8 @@ public class OxmMetadataDeserializerTest { OxmMetadataDeserializer deserializer = new OxmMetadataDeserializer(); MatchEntry entry = deserializer.deserialize(buffer); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry.getOxmClass()); - Assert.assertEquals("Wrong entry field", Metadata.class, entry.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry.getOxmClass()); + Assert.assertEquals("Wrong entry field", Metadata.VALUE, entry.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", false, entry.getHasMask()); Assert.assertArrayEquals("Wrong entry value", ByteBufUtils.hexStringToBytes("00 00 00 00 00 00 00 03"), ((MetadataCase) entry.getMatchEntryValue()).getMetadata().getMetadata()); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmMplsBosDeserializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmMplsBosDeserializerTest.java index df60a2c0aa..dfd71b3306 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmMplsBosDeserializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmMplsBosDeserializerTest.java @@ -34,8 +34,8 @@ public class OxmMplsBosDeserializerTest { OxmMplsBosDeserializer deserializer = new OxmMplsBosDeserializer(); MatchEntry entry = deserializer.deserialize(buffer); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry.getOxmClass()); - Assert.assertEquals("Wrong entry field", MplsBos.class, entry.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry.getOxmClass()); + Assert.assertEquals("Wrong entry field", MplsBos.VALUE, entry.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", false, entry.getHasMask()); Assert.assertEquals("Wrong entry value", false, ((MplsBosCase) entry.getMatchEntryValue()).getMplsBos().getBos()); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmPacketTypeDeserializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmPacketTypeDeserializerTest.java index d5996a1a79..7e98463fd8 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmPacketTypeDeserializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmPacketTypeDeserializerTest.java @@ -26,9 +26,9 @@ public class OxmPacketTypeDeserializerTest { OxmPacketTypeDeserializer deserializer = new OxmPacketTypeDeserializer(); MatchEntry entry = deserializer.deserialize(buffer); - Assert.assertEquals(OpenflowBasicClass.class, entry.getOxmClass()); - Assert.assertEquals(PacketType.class, entry.getOxmMatchField()); - Assert.assertEquals(false, entry.getHasMask()); + Assert.assertEquals(OpenflowBasicClass.VALUE, entry.getOxmClass()); + Assert.assertEquals(PacketType.VALUE, entry.getOxmMatchField()); + Assert.assertFalse(entry.getHasMask()); PacketTypeCase packetTypeCase = (PacketTypeCase) entry.getMatchEntryValue(); Assert.assertEquals(0x1894f, packetTypeCase.getPacketType().getPacketType().longValue()); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmPbbIsidDeserializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmPbbIsidDeserializerTest.java index 891daf9683..0caf1d6eda 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmPbbIsidDeserializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmPbbIsidDeserializerTest.java @@ -34,9 +34,9 @@ public class OxmPbbIsidDeserializerTest { OxmPbbIsidDeserializer deserializer = new OxmPbbIsidDeserializer(); MatchEntry entry = deserializer.deserialize(buffer); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry.getOxmClass()); - Assert.assertEquals("Wrong entry field", PbbIsid.class, entry.getOxmMatchField()); - Assert.assertEquals("Wrong entry hasMask", false, entry.getHasMask()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry.getOxmClass()); + Assert.assertEquals("Wrong entry field", PbbIsid.VALUE, entry.getOxmMatchField()); + Assert.assertFalse("Wrong entry hasMask", entry.getHasMask()); Assert.assertEquals("Wrong entry value", 2, ((PbbIsidCase) entry.getMatchEntryValue()) .getPbbIsid().getIsid().intValue()); } diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmVlanVidDeserializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmVlanVidDeserializerTest.java index 36186606e4..26206ec657 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmVlanVidDeserializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmVlanVidDeserializerTest.java @@ -34,8 +34,8 @@ public class OxmVlanVidDeserializerTest { OxmVlanVidDeserializer deserializer = new OxmVlanVidDeserializer(); MatchEntry entry = deserializer.deserialize(buffer); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry.getOxmClass()); - Assert.assertEquals("Wrong entry field", VlanVid.class, entry.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry.getOxmClass()); + Assert.assertEquals("Wrong entry field", VlanVid.VALUE, entry.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", false, entry.getHasMask()); Assert.assertEquals("Wrong entry value", 10, ((VlanVidCase) entry.getMatchEntryValue()).getVlanVid().getVlanVid().intValue()); 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 2bf6c90b56..1831e1d4ab 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 @@ -71,8 +71,8 @@ public class OF13SetFieldActionSerializerTest { expBuilder.setExperimenter(new ExperimenterId(experimenterId)); expCaseBuilder.setExperimenter(expBuilder.build()); MatchEntryBuilder meb = new MatchEntryBuilder(); - meb.setOxmClass(ExperimenterClass.class); - meb.setOxmMatchField(OxmMatchFieldClass.class); + meb.setOxmClass(ExperimenterClass.VALUE); + meb.setOxmMatchField(OxmMatchFieldClass.VALUE); meb.setMatchEntryValue(expCaseBuilder.build()); List matchEntry = new ArrayList<>(); MatchEntry me = meb.build(); @@ -83,7 +83,7 @@ public class OF13SetFieldActionSerializerTest { caseBuilder.setSetFieldAction(setFieldBuilder.build()); actionBuilder.setActionChoice(caseBuilder.build()); MatchEntrySerializerKey key = new MatchEntrySerializerKey<>( - EncodeConstants.OF_VERSION_1_3, ExperimenterClass.class, OxmMatchFieldClass.class); + EncodeConstants.OF_VERSION_1_3, ExperimenterClass.VALUE, OxmMatchFieldClass.VALUE); 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/FlowModInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/FlowModInputMessageFactoryTest.java index 88f4e730e3..a5068ca7a9 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 @@ -99,11 +99,11 @@ public class FlowModInputMessageFactoryTest { builder.setOutGroup(Uint32.valueOf(98)); builder.setFlags(new FlowModFlags(true, false, true, false, true)); MatchBuilder matchBuilder = new MatchBuilder(); - matchBuilder.setType(OxmMatchType.class); + matchBuilder.setType(OxmMatchType.VALUE); final List entries = new ArrayList<>(); MatchEntryBuilder entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(InPhyPort.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(InPhyPort.VALUE); entriesBuilder.setHasMask(false); InPhyPortCaseBuilder inPhyPortCaseBuilder = new InPhyPortCaseBuilder(); InPhyPortBuilder inPhyPortBuilder = new InPhyPortBuilder(); @@ -111,8 +111,8 @@ public class FlowModInputMessageFactoryTest { inPhyPortCaseBuilder.setInPhyPort(inPhyPortBuilder.build()); entriesBuilder.setMatchEntryValue(inPhyPortCaseBuilder.build()); entries.add(entriesBuilder.build()); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(IpEcn.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(IpEcn.VALUE); entriesBuilder.setHasMask(false); IpEcnCaseBuilder ipEcnCaseBuilder = new IpEcnCaseBuilder(); IpEcnBuilder ipEcnBuilder = new IpEcnBuilder(); 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 ac8bac2ceb..654daca708 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 @@ -73,11 +73,11 @@ public class FlowRemovedMessageFactoryTest { builder.setPacketCount(Uint64.valueOf(1234)); builder.setByteCount(Uint64.valueOf(1234)); MatchBuilder matchBuilder = new MatchBuilder(); - matchBuilder.setType(OxmMatchType.class); + matchBuilder.setType(OxmMatchType.VALUE); final List entries = new ArrayList<>(); MatchEntryBuilder entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(InPhyPort.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(InPhyPort.VALUE); entriesBuilder.setHasMask(false); InPhyPortCaseBuilder inPhyPortCaseBuilder = new InPhyPortCaseBuilder(); InPhyPortBuilder inPhyPortBuilder = new InPhyPortBuilder(); @@ -85,8 +85,8 @@ public class FlowRemovedMessageFactoryTest { inPhyPortCaseBuilder.setInPhyPort(inPhyPortBuilder.build()); entriesBuilder.setMatchEntryValue(inPhyPortCaseBuilder.build()); entries.add(entriesBuilder.build()); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(IpEcn.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(IpEcn.VALUE); entriesBuilder.setHasMask(false); IpEcnCaseBuilder ipEcnCaseBuilder = new IpEcnCaseBuilder(); IpEcnBuilder ipEcnBuilder = new IpEcnBuilder(); 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 18da871bd1..6245637bce 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 @@ -290,14 +290,14 @@ public class MultipartReplyMessageFactoryTest { propBuilder = new TableFeaturePropertiesBuilder(); propBuilder.setType(TableFeaturesPropType.OFPTFPTMATCH); MatchEntryBuilder entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(InPhyPort.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(InPhyPort.VALUE); entriesBuilder.setHasMask(false); List entries = new ArrayList<>(); entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(InPort.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(InPort.VALUE); entriesBuilder.setHasMask(false); entries.add(entriesBuilder.build()); propBuilder.addAugmentation(new OxmRelatedTableFeaturePropertyBuilder().setMatchEntry(entries).build()); @@ -318,13 +318,13 @@ public class MultipartReplyMessageFactoryTest { propBuilder.setType(TableFeaturesPropType.OFPTFPTAPPLYSETFIELD); entries = new ArrayList<>(); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(IpProto.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(IpProto.VALUE); entriesBuilder.setHasMask(false); entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(IpEcn.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(IpEcn.VALUE); entriesBuilder.setHasMask(false); entries.add(entriesBuilder.build()); propBuilder.addAugmentation(new OxmRelatedTableFeaturePropertyBuilder().setMatchEntry(entries).build()); @@ -1330,11 +1330,11 @@ public class MultipartReplyMessageFactoryTest { builder.setPacketCount(Uint64.valueOf(1234)); builder.setByteCount(Uint64.valueOf(1234)); MatchBuilder matchBuilder = new MatchBuilder(); - matchBuilder.setType(OxmMatchType.class); + matchBuilder.setType(OxmMatchType.VALUE); final List entries = new ArrayList<>(); MatchEntryBuilder entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(InPhyPort.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(InPhyPort.VALUE); entriesBuilder.setHasMask(false); InPhyPortCaseBuilder inPhyPortCaseBuilder = new InPhyPortCaseBuilder(); InPhyPortBuilder inPhyPortBuilder = new InPhyPortBuilder(); @@ -1342,8 +1342,8 @@ public class MultipartReplyMessageFactoryTest { inPhyPortCaseBuilder.setInPhyPort(inPhyPortBuilder.build()); entriesBuilder.setMatchEntryValue(inPhyPortCaseBuilder.build()); entries.add(entriesBuilder.build()); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(IpEcn.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(IpEcn.VALUE); entriesBuilder.setHasMask(false); IpEcnCaseBuilder ipEcnCaseBuilder = new IpEcnCaseBuilder(); IpEcnBuilder ipEcnBuilder = new IpEcnBuilder(); 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 f8138ada15..44e9eec39f 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 @@ -70,11 +70,11 @@ public class PacketInMessageFactoryTest { builder.setTableId(new TableId(Uint32.ONE)); builder.setCookie(Uint64.valueOf("FF01040106000701", 16)); MatchBuilder matchBuilder = new MatchBuilder(); - matchBuilder.setType(OxmMatchType.class); + matchBuilder.setType(OxmMatchType.VALUE); final List entries = new ArrayList<>(); MatchEntryBuilder entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(InPhyPort.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(InPhyPort.VALUE); entriesBuilder.setHasMask(false); InPhyPortCaseBuilder inPhyPortCaseBuilder = new InPhyPortCaseBuilder(); InPhyPortBuilder inPhyPortBuilder = new InPhyPortBuilder(); @@ -82,8 +82,8 @@ public class PacketInMessageFactoryTest { inPhyPortCaseBuilder.setInPhyPort(inPhyPortBuilder.build()); entriesBuilder.setMatchEntryValue(inPhyPortCaseBuilder.build()); entries.add(entriesBuilder.build()); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(IpEcn.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(IpEcn.VALUE); entriesBuilder.setHasMask(false); IpEcnCaseBuilder ipEcnCaseBuilder = new IpEcnCaseBuilder(); IpEcnBuilder ipEcnBuilder = new IpEcnBuilder(); 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 50ff8b3ae8..b5d0f5793f 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 @@ -194,14 +194,14 @@ public class MultipartRequestTableFeaturesTest { propBuilder = new TableFeaturePropertiesBuilder(); propBuilder.setType(TableFeaturesPropType.OFPTFPTMATCH); MatchEntryBuilder entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(InPhyPort.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(InPhyPort.VALUE); entriesBuilder.setHasMask(false); List entries = new ArrayList<>(); entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(InPort.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(InPort.VALUE); entriesBuilder.setHasMask(false); entries.add(entriesBuilder.build()); propBuilder.addAugmentation(new OxmRelatedTableFeaturePropertyBuilder().setMatchEntry(entries).build()); @@ -222,13 +222,13 @@ public class MultipartRequestTableFeaturesTest { propBuilder.setType(TableFeaturesPropType.OFPTFPTAPPLYSETFIELD); entries = new ArrayList<>(); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(IpProto.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(IpProto.VALUE); entriesBuilder.setHasMask(false); entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(IpEcn.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(IpEcn.VALUE); entriesBuilder.setHasMask(false); entries.add(entriesBuilder.build()); propBuilder.addAugmentation(new OxmRelatedTableFeaturePropertyBuilder().setMatchEntry(entries).build()); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmArpOpSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmArpOpSerializerTest.java index 9ec7e5453a..703dbebd21 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmArpOpSerializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmArpOpSerializerTest.java @@ -83,7 +83,7 @@ public class OxmArpOpSerializerTest { assertEquals("Wrong value length", Short.BYTES, serializer.getValueLength()); } - private static MatchEntryBuilder prepareArpOpMatchEntry(Uint16 value) { + private static MatchEntryBuilder prepareArpOpMatchEntry(final Uint16 value) { MatchEntryBuilder builder = prepareArpOpHeader(false); ArpOpCaseBuilder casebuilder = new ArpOpCaseBuilder(); ArpOpBuilder valueBuilder = new ArpOpBuilder(); @@ -93,15 +93,15 @@ public class OxmArpOpSerializerTest { return builder; } - private static MatchEntryBuilder prepareArpOpHeader(boolean hasMask) { + private static MatchEntryBuilder prepareArpOpHeader(final boolean hasMask) { MatchEntryBuilder builder = new MatchEntryBuilder(); - builder.setOxmClass(OpenflowBasicClass.class); - builder.setOxmMatchField(ArpOp.class); + builder.setOxmClass(OpenflowBasicClass.VALUE); + builder.setOxmMatchField(ArpOp.VALUE); builder.setHasMask(hasMask); return builder; } - private static void checkHeader(ByteBuf buffer, boolean hasMask) { + private static void checkHeader(final ByteBuf buffer, final boolean hasMask) { assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort()); short fieldAndMask = buffer.readUnsignedByte(); assertEquals("Wrong oxm-field", OxmMatchConstants.ARP_OP, fieldAndMask >>> 1); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmArpShaSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmArpShaSerializerTest.java index e36438b98e..cc60f2b349 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmArpShaSerializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmArpShaSerializerTest.java @@ -123,7 +123,7 @@ public class OxmArpShaSerializerTest { assertEquals("Wrong value length", EncodeConstants.MAC_ADDRESS_LENGTH, serializer.getValueLength()); } - private static MatchEntryBuilder prepareMatchEntry(boolean hasMask, String value) { + private static MatchEntryBuilder prepareMatchEntry(final boolean hasMask, final String value) { final MatchEntryBuilder builder = prepareHeader(hasMask); ArpShaCaseBuilder casebuilder = new ArpShaCaseBuilder(); ArpShaBuilder valueBuilder = new ArpShaBuilder(); @@ -136,15 +136,15 @@ public class OxmArpShaSerializerTest { return builder; } - private static MatchEntryBuilder prepareHeader(boolean hasMask) { + private static MatchEntryBuilder prepareHeader(final boolean hasMask) { MatchEntryBuilder builder = new MatchEntryBuilder(); - builder.setOxmClass(OpenflowBasicClass.class); - builder.setOxmMatchField(ArpSha.class); + builder.setOxmClass(OpenflowBasicClass.VALUE); + builder.setOxmMatchField(ArpSha.VALUE); builder.setHasMask(hasMask); return builder; } - private static void checkHeader(ByteBuf buffer, boolean hasMask) { + private static void checkHeader(final ByteBuf buffer, final boolean hasMask) { assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort()); short fieldAndMask = buffer.readUnsignedByte(); assertEquals("Wrong oxm-field", OxmMatchConstants.ARP_SHA, fieldAndMask >>> 1); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmArpSpaSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmArpSpaSerializerTest.java index 406b3e9fd6..a47cbfb796 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmArpSpaSerializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmArpSpaSerializerTest.java @@ -121,7 +121,7 @@ public class OxmArpSpaSerializerTest { assertEquals("Wrong value length", Integer.BYTES, serializer.getValueLength()); } - private static MatchEntryBuilder prepareMatchEntry(boolean hasMask, String value) { + private static MatchEntryBuilder prepareMatchEntry(final boolean hasMask, final String value) { final MatchEntryBuilder builder = prepareHeader(hasMask); ArpSpaCaseBuilder casebuilder = new ArpSpaCaseBuilder(); ArpSpaBuilder valueBuilder = new ArpSpaBuilder(); @@ -134,15 +134,15 @@ public class OxmArpSpaSerializerTest { return builder; } - private static MatchEntryBuilder prepareHeader(boolean hasMask) { + private static MatchEntryBuilder prepareHeader(final boolean hasMask) { MatchEntryBuilder builder = new MatchEntryBuilder(); - builder.setOxmClass(OpenflowBasicClass.class); - builder.setOxmMatchField(ArpSpa.class); + builder.setOxmClass(OpenflowBasicClass.VALUE); + builder.setOxmMatchField(ArpSpa.VALUE); builder.setHasMask(hasMask); return builder; } - private static void checkHeader(ByteBuf buffer, boolean hasMask) { + private static void checkHeader(final ByteBuf buffer, final boolean hasMask) { assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort()); short fieldAndMask = buffer.readUnsignedByte(); assertEquals("Wrong oxm-field", OxmMatchConstants.ARP_SPA, fieldAndMask >>> 1); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmArpThaSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmArpThaSerializerTest.java index b591ea1853..8e9af476e2 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmArpThaSerializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmArpThaSerializerTest.java @@ -123,7 +123,7 @@ public class OxmArpThaSerializerTest { assertEquals("Wrong value length", EncodeConstants.MAC_ADDRESS_LENGTH, serializer.getValueLength()); } - private static MatchEntryBuilder prepareMatchEntry(boolean hasMask, String value) { + private static MatchEntryBuilder prepareMatchEntry(final boolean hasMask, final String value) { final MatchEntryBuilder builder = prepareHeader(hasMask); ArpThaCaseBuilder casebuilder = new ArpThaCaseBuilder(); ArpThaBuilder valueBuilder = new ArpThaBuilder(); @@ -136,15 +136,15 @@ public class OxmArpThaSerializerTest { return builder; } - private static MatchEntryBuilder prepareHeader(boolean hasMask) { + private static MatchEntryBuilder prepareHeader(final boolean hasMask) { MatchEntryBuilder builder = new MatchEntryBuilder(); - builder.setOxmClass(OpenflowBasicClass.class); - builder.setOxmMatchField(ArpTha.class); + builder.setOxmClass(OpenflowBasicClass.VALUE); + builder.setOxmMatchField(ArpTha.VALUE); builder.setHasMask(hasMask); return builder; } - private static void checkHeader(ByteBuf buffer, boolean hasMask) { + private static void checkHeader(final ByteBuf buffer, final boolean hasMask) { assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort()); short fieldAndMask = buffer.readUnsignedByte(); assertEquals("Wrong oxm-field", OxmMatchConstants.ARP_THA, fieldAndMask >>> 1); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmArpTpaSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmArpTpaSerializerTest.java index c3d0ee47ca..5453b36932 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmArpTpaSerializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmArpTpaSerializerTest.java @@ -121,7 +121,7 @@ public class OxmArpTpaSerializerTest { assertEquals("Wrong value length", Integer.BYTES, serializer.getValueLength()); } - private static MatchEntryBuilder prepareMatchEntry(boolean hasMask, String value) { + private static MatchEntryBuilder prepareMatchEntry(final boolean hasMask, final String value) { final MatchEntryBuilder builder = prepareHeader(hasMask); ArpTpaCaseBuilder casebuilder = new ArpTpaCaseBuilder(); ArpTpaBuilder valueBuilder = new ArpTpaBuilder(); @@ -134,15 +134,15 @@ public class OxmArpTpaSerializerTest { return builder; } - private static MatchEntryBuilder prepareHeader(boolean hasMask) { + private static MatchEntryBuilder prepareHeader(final boolean hasMask) { MatchEntryBuilder builder = new MatchEntryBuilder(); - builder.setOxmClass(OpenflowBasicClass.class); - builder.setOxmMatchField(ArpTpa.class); + builder.setOxmClass(OpenflowBasicClass.VALUE); + builder.setOxmMatchField(ArpTpa.VALUE); builder.setHasMask(hasMask); return builder; } - private static void checkHeader(ByteBuf buffer, boolean hasMask) { + private static void checkHeader(final ByteBuf buffer, final boolean hasMask) { assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort()); short fieldAndMask = buffer.readUnsignedByte(); assertEquals("Wrong oxm-field", OxmMatchConstants.ARP_TPA, fieldAndMask >>> 1); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmEthDstSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmEthDstSerializerTest.java index 722481d4e7..1ff1665acb 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmEthDstSerializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmEthDstSerializerTest.java @@ -123,7 +123,7 @@ public class OxmEthDstSerializerTest { assertEquals("Wrong value length", EncodeConstants.MAC_ADDRESS_LENGTH, serializer.getValueLength()); } - private static MatchEntryBuilder prepareMatchEntry(boolean hasMask, String value) { + private static MatchEntryBuilder prepareMatchEntry(final boolean hasMask, final String value) { final MatchEntryBuilder builder = prepareHeader(hasMask); EthDstCaseBuilder casebuilder = new EthDstCaseBuilder(); EthDstBuilder valueBuilder = new EthDstBuilder(); @@ -136,15 +136,15 @@ public class OxmEthDstSerializerTest { return builder; } - private static MatchEntryBuilder prepareHeader(boolean hasMask) { + private static MatchEntryBuilder prepareHeader(final boolean hasMask) { MatchEntryBuilder builder = new MatchEntryBuilder(); - builder.setOxmClass(OpenflowBasicClass.class); - builder.setOxmMatchField(EthDst.class); + builder.setOxmClass(OpenflowBasicClass.VALUE); + builder.setOxmMatchField(EthDst.VALUE); builder.setHasMask(hasMask); return builder; } - private static void checkHeader(ByteBuf buffer, boolean hasMask) { + private static void checkHeader(final ByteBuf buffer, final boolean hasMask) { assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort()); short fieldAndMask = buffer.readUnsignedByte(); assertEquals("Wrong oxm-field", OxmMatchConstants.ETH_DST, fieldAndMask >>> 1); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmEthSrcSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmEthSrcSerializerTest.java index 867d1e234e..6c15ba70de 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmEthSrcSerializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmEthSrcSerializerTest.java @@ -123,7 +123,7 @@ public class OxmEthSrcSerializerTest { assertEquals("Wrong value length", EncodeConstants.MAC_ADDRESS_LENGTH, serializer.getValueLength()); } - private static MatchEntryBuilder prepareMatchEntry(boolean hasMask, String value) { + private static MatchEntryBuilder prepareMatchEntry(final boolean hasMask, final String value) { final MatchEntryBuilder builder = prepareHeader(hasMask); EthSrcCaseBuilder casebuilder = new EthSrcCaseBuilder(); EthSrcBuilder valueBuilder = new EthSrcBuilder(); @@ -136,15 +136,15 @@ public class OxmEthSrcSerializerTest { return builder; } - private static MatchEntryBuilder prepareHeader(boolean hasMask) { + private static MatchEntryBuilder prepareHeader(final boolean hasMask) { MatchEntryBuilder builder = new MatchEntryBuilder(); - builder.setOxmClass(OpenflowBasicClass.class); - builder.setOxmMatchField(EthSrc.class); + builder.setOxmClass(OpenflowBasicClass.VALUE); + builder.setOxmMatchField(EthSrc.VALUE); builder.setHasMask(hasMask); return builder; } - private static void checkHeader(ByteBuf buffer, boolean hasMask) { + private static void checkHeader(final ByteBuf buffer, final boolean hasMask) { assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort()); short fieldAndMask = buffer.readUnsignedByte(); assertEquals("Wrong oxm-field", OxmMatchConstants.ETH_SRC, fieldAndMask >>> 1); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmEthTypeSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmEthTypeSerializerTest.java index cfbb3afef2..b4ae0cf0cd 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmEthTypeSerializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmEthTypeSerializerTest.java @@ -84,7 +84,7 @@ public class OxmEthTypeSerializerTest { assertEquals("Wrong value length", Short.BYTES, serializer.getValueLength()); } - private static MatchEntryBuilder prepareEthTypeMatchEntry(Uint16 type) { + private static MatchEntryBuilder prepareEthTypeMatchEntry(final Uint16 type) { MatchEntryBuilder builder = prepareEthTypeHeader(false); EthTypeCaseBuilder casebuilder = new EthTypeCaseBuilder(); EthTypeBuilder valueBuilder = new EthTypeBuilder(); @@ -94,15 +94,15 @@ public class OxmEthTypeSerializerTest { return builder; } - private static MatchEntryBuilder prepareEthTypeHeader(boolean hasMask) { + private static MatchEntryBuilder prepareEthTypeHeader(final boolean hasMask) { MatchEntryBuilder builder = new MatchEntryBuilder(); - builder.setOxmClass(OpenflowBasicClass.class); - builder.setOxmMatchField(EthType.class); + builder.setOxmClass(OpenflowBasicClass.VALUE); + builder.setOxmMatchField(EthType.VALUE); builder.setHasMask(hasMask); return builder; } - private static void checkHeader(ByteBuf buffer, boolean hasMask) { + private static void checkHeader(final ByteBuf buffer, final boolean hasMask) { assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort()); short fieldAndMask = buffer.readUnsignedByte(); assertEquals("Wrong oxm-field", OxmMatchConstants.ETH_TYPE, fieldAndMask >>> 1); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIcmpv4CodeSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIcmpv4CodeSerializerTest.java index 1d69813d67..7562927c09 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIcmpv4CodeSerializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIcmpv4CodeSerializerTest.java @@ -83,7 +83,7 @@ public class OxmIcmpv4CodeSerializerTest { assertEquals("Wrong value length", Byte.BYTES, serializer.getValueLength()); } - private static MatchEntryBuilder prepareIcmpv4CodeMatchEntry(Uint8 value) { + private static MatchEntryBuilder prepareIcmpv4CodeMatchEntry(final Uint8 value) { MatchEntryBuilder builder = prepareIcmpv4CodeHeader(false); Icmpv4CodeCaseBuilder casebuilder = new Icmpv4CodeCaseBuilder(); Icmpv4CodeBuilder valueBuilder = new Icmpv4CodeBuilder(); @@ -93,15 +93,15 @@ public class OxmIcmpv4CodeSerializerTest { return builder; } - private static MatchEntryBuilder prepareIcmpv4CodeHeader(boolean hasMask) { + private static MatchEntryBuilder prepareIcmpv4CodeHeader(final boolean hasMask) { MatchEntryBuilder builder = new MatchEntryBuilder(); - builder.setOxmClass(OpenflowBasicClass.class); - builder.setOxmMatchField(Icmpv4Code.class); + builder.setOxmClass(OpenflowBasicClass.VALUE); + builder.setOxmMatchField(Icmpv4Code.VALUE); builder.setHasMask(hasMask); return builder; } - private static void checkHeader(ByteBuf buffer, boolean hasMask) { + private static void checkHeader(final ByteBuf buffer, final boolean hasMask) { assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort()); short fieldAndMask = buffer.readUnsignedByte(); assertEquals("Wrong oxm-field", OxmMatchConstants.ICMPV4_CODE, fieldAndMask >>> 1); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIcmpv4TypeSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIcmpv4TypeSerializerTest.java index 39dc1e3d01..963406f452 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIcmpv4TypeSerializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIcmpv4TypeSerializerTest.java @@ -83,7 +83,7 @@ public class OxmIcmpv4TypeSerializerTest { assertEquals("Wrong value length", Byte.BYTES, serializer.getValueLength()); } - private static MatchEntryBuilder prepareIcmpv4TypeMatchEntry(Uint8 value) { + private static MatchEntryBuilder prepareIcmpv4TypeMatchEntry(final Uint8 value) { MatchEntryBuilder builder = prepareIcmpv4TypeHeader(false); Icmpv4TypeCaseBuilder casebuilder = new Icmpv4TypeCaseBuilder(); Icmpv4TypeBuilder valueBuilder = new Icmpv4TypeBuilder(); @@ -93,15 +93,15 @@ public class OxmIcmpv4TypeSerializerTest { return builder; } - private static MatchEntryBuilder prepareIcmpv4TypeHeader(boolean hasMask) { + private static MatchEntryBuilder prepareIcmpv4TypeHeader(final boolean hasMask) { MatchEntryBuilder builder = new MatchEntryBuilder(); - builder.setOxmClass(OpenflowBasicClass.class); - builder.setOxmMatchField(Icmpv4Type.class); + builder.setOxmClass(OpenflowBasicClass.VALUE); + builder.setOxmMatchField(Icmpv4Type.VALUE); builder.setHasMask(hasMask); return builder; } - private static void checkHeader(ByteBuf buffer, boolean hasMask) { + private static void checkHeader(final ByteBuf buffer, final boolean hasMask) { assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort()); short fieldAndMask = buffer.readUnsignedByte(); assertEquals("Wrong oxm-field", OxmMatchConstants.ICMPV4_TYPE, fieldAndMask >>> 1); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIcmpv6CodeSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIcmpv6CodeSerializerTest.java index 03bfebcc32..b94d41f23a 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIcmpv6CodeSerializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIcmpv6CodeSerializerTest.java @@ -83,7 +83,7 @@ public class OxmIcmpv6CodeSerializerTest { assertEquals("Wrong value length", Byte.BYTES, serializer.getValueLength()); } - private static MatchEntryBuilder prepareIcmpv6CodeMatchEntry(Uint8 value) { + private static MatchEntryBuilder prepareIcmpv6CodeMatchEntry(final Uint8 value) { MatchEntryBuilder builder = prepareIcmpv6CodeHeader(false); Icmpv6CodeCaseBuilder casebuilder = new Icmpv6CodeCaseBuilder(); Icmpv6CodeBuilder valueBuilder = new Icmpv6CodeBuilder(); @@ -93,15 +93,15 @@ public class OxmIcmpv6CodeSerializerTest { return builder; } - private static MatchEntryBuilder prepareIcmpv6CodeHeader(boolean hasMask) { + private static MatchEntryBuilder prepareIcmpv6CodeHeader(final boolean hasMask) { MatchEntryBuilder builder = new MatchEntryBuilder(); - builder.setOxmClass(OpenflowBasicClass.class); - builder.setOxmMatchField(Icmpv6Code.class); + builder.setOxmClass(OpenflowBasicClass.VALUE); + builder.setOxmMatchField(Icmpv6Code.VALUE); builder.setHasMask(hasMask); return builder; } - private static void checkHeader(ByteBuf buffer, boolean hasMask) { + private static void checkHeader(final ByteBuf buffer, final boolean hasMask) { assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort()); short fieldAndMask = buffer.readUnsignedByte(); assertEquals("Wrong oxm-field", OxmMatchConstants.ICMPV6_CODE, fieldAndMask >>> 1); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIcmpv6TypeSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIcmpv6TypeSerializerTest.java index c18a723efb..4e42985617 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIcmpv6TypeSerializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIcmpv6TypeSerializerTest.java @@ -83,7 +83,7 @@ public class OxmIcmpv6TypeSerializerTest { assertEquals("Wrong value length", Byte.BYTES, serializer.getValueLength()); } - private static MatchEntryBuilder prepareIcmpv6TypeMatchEntry(Uint8 value) { + private static MatchEntryBuilder prepareIcmpv6TypeMatchEntry(final Uint8 value) { MatchEntryBuilder builder = prepareIcmpv6TypeHeader(false); Icmpv6TypeCaseBuilder casebuilder = new Icmpv6TypeCaseBuilder(); Icmpv6TypeBuilder valueBuilder = new Icmpv6TypeBuilder(); @@ -93,15 +93,15 @@ public class OxmIcmpv6TypeSerializerTest { return builder; } - private static MatchEntryBuilder prepareIcmpv6TypeHeader(boolean hasMask) { + private static MatchEntryBuilder prepareIcmpv6TypeHeader(final boolean hasMask) { MatchEntryBuilder builder = new MatchEntryBuilder(); - builder.setOxmClass(OpenflowBasicClass.class); - builder.setOxmMatchField(Icmpv6Type.class); + builder.setOxmClass(OpenflowBasicClass.VALUE); + builder.setOxmMatchField(Icmpv6Type.VALUE); builder.setHasMask(hasMask); return builder; } - private static void checkHeader(ByteBuf buffer, boolean hasMask) { + private static void checkHeader(final ByteBuf buffer, final boolean hasMask) { assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort()); short fieldAndMask = buffer.readUnsignedByte(); assertEquals("Wrong oxm-field", OxmMatchConstants.ICMPV6_TYPE, fieldAndMask >>> 1); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpDscpSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpDscpSerializerTest.java index 7117446dad..e31513293c 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpDscpSerializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpDscpSerializerTest.java @@ -84,7 +84,7 @@ public class OxmIpDscpSerializerTest { assertEquals("Wrong value length", Byte.BYTES, serializer.getValueLength()); } - private static MatchEntryBuilder prepareIpDscpMatchEntry(Uint8 value) { + private static MatchEntryBuilder prepareIpDscpMatchEntry(final Uint8 value) { MatchEntryBuilder builder = prepareIpDscpHeader(false); IpDscpCaseBuilder casebuilder = new IpDscpCaseBuilder(); IpDscpBuilder dscpBuilder = new IpDscpBuilder(); @@ -94,15 +94,15 @@ public class OxmIpDscpSerializerTest { return builder; } - private static MatchEntryBuilder prepareIpDscpHeader(boolean hasMask) { + private static MatchEntryBuilder prepareIpDscpHeader(final boolean hasMask) { MatchEntryBuilder builder = new MatchEntryBuilder(); - builder.setOxmClass(OpenflowBasicClass.class); - builder.setOxmMatchField(IpDscp.class); + builder.setOxmClass(OpenflowBasicClass.VALUE); + builder.setOxmMatchField(IpDscp.VALUE); builder.setHasMask(hasMask); return builder; } - private static void checkHeader(ByteBuf buffer, boolean hasMask) { + private static void checkHeader(final ByteBuf buffer, final boolean hasMask) { assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort()); short fieldAndMask = buffer.readUnsignedByte(); assertEquals("Wrong oxm-field", OxmMatchConstants.IP_DSCP, fieldAndMask >>> 1); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpProtoSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpProtoSerializerTest.java index 5efebc51bd..727eb3c138 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpProtoSerializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpProtoSerializerTest.java @@ -83,7 +83,7 @@ public class OxmIpProtoSerializerTest { assertEquals("Wrong value length", Byte.BYTES, serializer.getValueLength()); } - private static MatchEntryBuilder prepareMatchEntry(Uint8 value) { + private static MatchEntryBuilder prepareMatchEntry(final Uint8 value) { MatchEntryBuilder builder = prepareHeader(false); IpProtoCaseBuilder casebuilder = new IpProtoCaseBuilder(); IpProtoBuilder protoBuilder = new IpProtoBuilder(); @@ -93,15 +93,15 @@ public class OxmIpProtoSerializerTest { return builder; } - private static MatchEntryBuilder prepareHeader(boolean hasMask) { + private static MatchEntryBuilder prepareHeader(final boolean hasMask) { MatchEntryBuilder builder = new MatchEntryBuilder(); - builder.setOxmClass(OpenflowBasicClass.class); - builder.setOxmMatchField(IpProto.class); + builder.setOxmClass(OpenflowBasicClass.VALUE); + builder.setOxmMatchField(IpProto.VALUE); builder.setHasMask(hasMask); return builder; } - private static void checkHeader(ByteBuf buffer, boolean hasMask) { + private static void checkHeader(final ByteBuf buffer, final boolean hasMask) { assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort()); short fieldAndMask = buffer.readUnsignedByte(); assertEquals("Wrong oxm-field", OxmMatchConstants.IP_PROTO, fieldAndMask >>> 1); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv4DstSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv4DstSerializerTest.java index 68f560680c..c89471bf49 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv4DstSerializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv4DstSerializerTest.java @@ -121,7 +121,7 @@ public class OxmIpv4DstSerializerTest { assertEquals("Wrong value length", Integer.BYTES, serializer.getValueLength()); } - private static MatchEntryBuilder prepareMatchEntry(boolean hasMask, String value) { + private static MatchEntryBuilder prepareMatchEntry(final boolean hasMask, final String value) { final MatchEntryBuilder builder = prepareHeader(hasMask); Ipv4DstCaseBuilder casebuilder = new Ipv4DstCaseBuilder(); Ipv4DstBuilder valueBuilder = new Ipv4DstBuilder(); @@ -134,15 +134,15 @@ public class OxmIpv4DstSerializerTest { return builder; } - private static MatchEntryBuilder prepareHeader(boolean hasMask) { + private static MatchEntryBuilder prepareHeader(final boolean hasMask) { MatchEntryBuilder builder = new MatchEntryBuilder(); - builder.setOxmClass(OpenflowBasicClass.class); - builder.setOxmMatchField(Ipv4Dst.class); + builder.setOxmClass(OpenflowBasicClass.VALUE); + builder.setOxmMatchField(Ipv4Dst.VALUE); builder.setHasMask(hasMask); return builder; } - private static void checkHeader(ByteBuf buffer, boolean hasMask) { + private static void checkHeader(final ByteBuf buffer, final boolean hasMask) { assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort()); short fieldAndMask = buffer.readUnsignedByte(); assertEquals("Wrong oxm-field", OxmMatchConstants.IPV4_DST, fieldAndMask >>> 1); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv4SrcSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv4SrcSerializerTest.java index 95252a1dbc..b58fb07274 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv4SrcSerializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv4SrcSerializerTest.java @@ -121,7 +121,7 @@ public class OxmIpv4SrcSerializerTest { assertEquals("Wrong value length", Integer.BYTES, serializer.getValueLength()); } - private static MatchEntryBuilder prepareMatchEntry(boolean hasMask, String value) { + private static MatchEntryBuilder prepareMatchEntry(final boolean hasMask, final String value) { final MatchEntryBuilder builder = prepareHeader(hasMask); Ipv4SrcCaseBuilder casebuilder = new Ipv4SrcCaseBuilder(); Ipv4SrcBuilder valueBuilder = new Ipv4SrcBuilder(); @@ -134,15 +134,15 @@ public class OxmIpv4SrcSerializerTest { return builder; } - private static MatchEntryBuilder prepareHeader(boolean hasMask) { + private static MatchEntryBuilder prepareHeader(final boolean hasMask) { MatchEntryBuilder builder = new MatchEntryBuilder(); - builder.setOxmClass(OpenflowBasicClass.class); - builder.setOxmMatchField(Ipv4Src.class); + builder.setOxmClass(OpenflowBasicClass.VALUE); + builder.setOxmMatchField(Ipv4Src.VALUE); builder.setHasMask(hasMask); return builder; } - private static void checkHeader(ByteBuf buffer, boolean hasMask) { + private static void checkHeader(final ByteBuf buffer, final boolean hasMask) { assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort()); short fieldAndMask = buffer.readUnsignedByte(); assertEquals("Wrong oxm-field", OxmMatchConstants.IPV4_SRC, fieldAndMask >>> 1); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv6ExtHdrSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv6ExtHdrSerializerTest.java index 8a5809813b..3f03dbf809 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv6ExtHdrSerializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv6ExtHdrSerializerTest.java @@ -118,7 +118,7 @@ public class OxmIpv6ExtHdrSerializerTest { assertEquals("Wrong value length", Short.BYTES, serializer.getValueLength()); } - private static MatchEntryBuilder prepareIpv6ExtHdrMatchEntry(boolean hasMask, Ipv6ExthdrFlags flags) { + private static MatchEntryBuilder prepareIpv6ExtHdrMatchEntry(final boolean hasMask, final Ipv6ExthdrFlags flags) { final MatchEntryBuilder builder = prepareIpv6ExtHdrHeader(hasMask); Ipv6ExthdrCaseBuilder casebuilder = new Ipv6ExthdrCaseBuilder(); Ipv6ExthdrBuilder valueBuilder = new Ipv6ExthdrBuilder(); @@ -131,15 +131,15 @@ public class OxmIpv6ExtHdrSerializerTest { return builder; } - private static MatchEntryBuilder prepareIpv6ExtHdrHeader(boolean hasMask) { + private static MatchEntryBuilder prepareIpv6ExtHdrHeader(final boolean hasMask) { MatchEntryBuilder builder = new MatchEntryBuilder(); - builder.setOxmClass(OpenflowBasicClass.class); - builder.setOxmMatchField(Ipv6Exthdr.class); + builder.setOxmClass(OpenflowBasicClass.VALUE); + builder.setOxmMatchField(Ipv6Exthdr.VALUE); builder.setHasMask(hasMask); return builder; } - private static void checkHeader(ByteBuf buffer, boolean hasMask) { + private static void checkHeader(final ByteBuf buffer, final boolean hasMask) { assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort()); short fieldAndMask = buffer.readUnsignedByte(); assertEquals("Wrong oxm-field", OxmMatchConstants.IPV6_EXTHDR, fieldAndMask >>> 1); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv6NdSllSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv6NdSllSerializerTest.java index 063a51c3c9..71d6d0c98c 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv6NdSllSerializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv6NdSllSerializerTest.java @@ -88,7 +88,7 @@ public class OxmIpv6NdSllSerializerTest { assertEquals("Wrong value length", EncodeConstants.MAC_ADDRESS_LENGTH, serializer.getValueLength()); } - private static MatchEntryBuilder prepareMatchEntry(String value) { + private static MatchEntryBuilder prepareMatchEntry(final String value) { MatchEntryBuilder builder = prepareHeader(false); Ipv6NdSllCaseBuilder casebuilder = new Ipv6NdSllCaseBuilder(); Ipv6NdSllBuilder valueBuilder = new Ipv6NdSllBuilder(); @@ -98,15 +98,15 @@ public class OxmIpv6NdSllSerializerTest { return builder; } - private static MatchEntryBuilder prepareHeader(boolean hasMask) { + private static MatchEntryBuilder prepareHeader(final boolean hasMask) { MatchEntryBuilder builder = new MatchEntryBuilder(); - builder.setOxmClass(OpenflowBasicClass.class); - builder.setOxmMatchField(Ipv6NdSll.class); + builder.setOxmClass(OpenflowBasicClass.VALUE); + builder.setOxmMatchField(Ipv6NdSll.VALUE); builder.setHasMask(hasMask); return builder; } - private static void checkHeader(ByteBuf buffer, boolean hasMask) { + private static void checkHeader(final ByteBuf buffer, final boolean hasMask) { assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort()); short fieldAndMask = buffer.readUnsignedByte(); assertEquals("Wrong oxm-field", OxmMatchConstants.IPV6_ND_SLL, fieldAndMask >>> 1); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv6NdTllSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv6NdTllSerializerTest.java index 85fb22ba0e..89d724360f 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv6NdTllSerializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv6NdTllSerializerTest.java @@ -88,7 +88,7 @@ public class OxmIpv6NdTllSerializerTest { assertEquals("Wrong value length", EncodeConstants.MAC_ADDRESS_LENGTH, serializer.getValueLength()); } - private static MatchEntryBuilder prepareMatchEntry(String value) { + private static MatchEntryBuilder prepareMatchEntry(final String value) { MatchEntryBuilder builder = prepareHeader(false); Ipv6NdTllCaseBuilder casebuilder = new Ipv6NdTllCaseBuilder(); Ipv6NdTllBuilder valueBuilder = new Ipv6NdTllBuilder(); @@ -98,15 +98,15 @@ public class OxmIpv6NdTllSerializerTest { return builder; } - private static MatchEntryBuilder prepareHeader(boolean hasMask) { + private static MatchEntryBuilder prepareHeader(final boolean hasMask) { MatchEntryBuilder builder = new MatchEntryBuilder(); - builder.setOxmClass(OpenflowBasicClass.class); - builder.setOxmMatchField(Ipv6NdTll.class); + builder.setOxmClass(OpenflowBasicClass.VALUE); + builder.setOxmMatchField(Ipv6NdTll.VALUE); builder.setHasMask(hasMask); return builder; } - private static void checkHeader(ByteBuf buffer, boolean hasMask) { + private static void checkHeader(final ByteBuf buffer, final boolean hasMask) { assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort()); short fieldAndMask = buffer.readUnsignedByte(); assertEquals("Wrong oxm-field", OxmMatchConstants.IPV6_ND_TLL, fieldAndMask >>> 1); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv6SrcSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv6SrcSerializerTest.java index 9f5181f406..5e8eb2b242 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv6SrcSerializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv6SrcSerializerTest.java @@ -77,7 +77,7 @@ public class OxmIpv6SrcSerializerTest { assertTrue("Unexpected data", buffer.readableBytes() == 0); } - private static MatchEntryBuilder prepareMatchEntry(boolean hasMask, String value) { + private static MatchEntryBuilder prepareMatchEntry(final boolean hasMask, final String value) { final MatchEntryBuilder builder = prepareHeader(hasMask); Ipv6SrcCaseBuilder caseBuilder = new Ipv6SrcCaseBuilder(); Ipv6SrcBuilder srcBuilder = new Ipv6SrcBuilder(); @@ -90,15 +90,15 @@ public class OxmIpv6SrcSerializerTest { return builder; } - private static MatchEntryBuilder prepareHeader(boolean hasMask) { + private static MatchEntryBuilder prepareHeader(final boolean hasMask) { MatchEntryBuilder builder = new MatchEntryBuilder(); - builder.setOxmClass(OpenflowBasicClass.class); - builder.setOxmMatchField(Ipv6Src.class); + builder.setOxmClass(OpenflowBasicClass.VALUE); + builder.setOxmMatchField(Ipv6Src.VALUE); builder.setHasMask(hasMask); return builder; } - private static void checkHeader(ByteBuf buffer, boolean hasMask) { + private static void checkHeader(final ByteBuf buffer, final boolean hasMask) { assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort()); short fieldAndMask = buffer.readUnsignedByte(); assertEquals("Wrong oxm-field", OxmMatchConstants.IPV6_SRC, fieldAndMask >>> 1); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmMetadataSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmMetadataSerializerTest.java index 67f64836e5..10f32ccaad 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmMetadataSerializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmMetadataSerializerTest.java @@ -120,7 +120,7 @@ public class OxmMetadataSerializerTest { assertEquals("Wrong value length", Long.BYTES, serializer.getValueLength()); } - private static MatchEntryBuilder prepareMatchEntry(boolean hasMask, byte[] value) { + private static MatchEntryBuilder prepareMatchEntry(final boolean hasMask, final byte[] value) { final MatchEntryBuilder builder = prepareHeader(hasMask); MetadataCaseBuilder casebuilder = new MetadataCaseBuilder(); MetadataBuilder valueBuilder = new MetadataBuilder(); @@ -133,15 +133,15 @@ public class OxmMetadataSerializerTest { return builder; } - private static MatchEntryBuilder prepareHeader(boolean hasMask) { + private static MatchEntryBuilder prepareHeader(final boolean hasMask) { MatchEntryBuilder builder = new MatchEntryBuilder(); - builder.setOxmClass(OpenflowBasicClass.class); - builder.setOxmMatchField(Metadata.class); + builder.setOxmClass(OpenflowBasicClass.VALUE); + builder.setOxmMatchField(Metadata.VALUE); builder.setHasMask(hasMask); return builder; } - private static void checkHeader(ByteBuf buffer, boolean hasMask) { + private static void checkHeader(final ByteBuf buffer, final boolean hasMask) { assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort()); short fieldAndMask = buffer.readUnsignedByte(); assertEquals("Wrong oxm-field", OxmMatchConstants.METADATA, fieldAndMask >>> 1); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmMplsBosSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmMplsBosSerializerTest.java index 2a4a7198b6..07b6bfa221 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmMplsBosSerializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmMplsBosSerializerTest.java @@ -82,7 +82,7 @@ public class OxmMplsBosSerializerTest { assertEquals("Wrong value length", Byte.BYTES, serializer.getValueLength()); } - private static MatchEntryBuilder prepareMplsBosMatchEntry(boolean bos) { + private static MatchEntryBuilder prepareMplsBosMatchEntry(final boolean bos) { MatchEntryBuilder builder = prepareMplsBosHeader(false); MplsBosCaseBuilder casebuilder = new MplsBosCaseBuilder(); MplsBosBuilder valueBuilder = new MplsBosBuilder(); @@ -92,15 +92,15 @@ public class OxmMplsBosSerializerTest { return builder; } - private static MatchEntryBuilder prepareMplsBosHeader(boolean hasMask) { + private static MatchEntryBuilder prepareMplsBosHeader(final boolean hasMask) { MatchEntryBuilder builder = new MatchEntryBuilder(); - builder.setOxmClass(OpenflowBasicClass.class); - builder.setOxmMatchField(MplsBos.class); + builder.setOxmClass(OpenflowBasicClass.VALUE); + builder.setOxmMatchField(MplsBos.VALUE); builder.setHasMask(hasMask); return builder; } - private static void checkHeader(ByteBuf buffer, boolean hasMask) { + private static void checkHeader(final ByteBuf buffer, final boolean hasMask) { assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort()); short fieldAndMask = buffer.readUnsignedByte(); assertEquals("Wrong oxm-field", OxmMatchConstants.MPLS_BOS, fieldAndMask >>> 1); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmMplsLabelSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmMplsLabelSerializerTest.java index ed71ae2388..3d52d0ec13 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmMplsLabelSerializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmMplsLabelSerializerTest.java @@ -83,7 +83,7 @@ public class OxmMplsLabelSerializerTest { assertEquals("Wrong value length", Integer.BYTES, serializer.getValueLength()); } - private static MatchEntryBuilder prepareMplsLabelMatchEntry(Uint32 label) { + private static MatchEntryBuilder prepareMplsLabelMatchEntry(final Uint32 label) { MatchEntryBuilder builder = prepareMplsLabelHeader(false); MplsLabelCaseBuilder casebuilder = new MplsLabelCaseBuilder(); MplsLabelBuilder valueBuilder = new MplsLabelBuilder(); @@ -93,15 +93,15 @@ public class OxmMplsLabelSerializerTest { return builder; } - private static MatchEntryBuilder prepareMplsLabelHeader(boolean hasMask) { + private static MatchEntryBuilder prepareMplsLabelHeader(final boolean hasMask) { MatchEntryBuilder builder = new MatchEntryBuilder(); - builder.setOxmClass(OpenflowBasicClass.class); - builder.setOxmMatchField(MplsLabel.class); + builder.setOxmClass(OpenflowBasicClass.VALUE); + builder.setOxmMatchField(MplsLabel.VALUE); builder.setHasMask(hasMask); return builder; } - private static void checkHeader(ByteBuf buffer, boolean hasMask) { + private static void checkHeader(final ByteBuf buffer, final boolean hasMask) { assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort()); short fieldAndMask = buffer.readUnsignedByte(); assertEquals("Wrong oxm-field", OxmMatchConstants.MPLS_LABEL, fieldAndMask >>> 1); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmMplsTcSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmMplsTcSerializerTest.java index ddbcc845c8..5dceea9e3d 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmMplsTcSerializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmMplsTcSerializerTest.java @@ -83,7 +83,7 @@ public class OxmMplsTcSerializerTest { assertEquals("Wrong value length", Byte.BYTES, serializer.getValueLength()); } - private static MatchEntryBuilder prepareMplsTcMatchEntry(Uint8 value) { + private static MatchEntryBuilder prepareMplsTcMatchEntry(final Uint8 value) { MatchEntryBuilder builder = prepareMplsTcHeader(false); MplsTcCaseBuilder casebuilder = new MplsTcCaseBuilder(); MplsTcBuilder valueBuilder = new MplsTcBuilder(); @@ -93,15 +93,15 @@ public class OxmMplsTcSerializerTest { return builder; } - private static MatchEntryBuilder prepareMplsTcHeader(boolean hasMask) { + private static MatchEntryBuilder prepareMplsTcHeader(final boolean hasMask) { MatchEntryBuilder builder = new MatchEntryBuilder(); - builder.setOxmClass(OpenflowBasicClass.class); - builder.setOxmMatchField(MplsTc.class); + builder.setOxmClass(OpenflowBasicClass.VALUE); + builder.setOxmMatchField(MplsTc.VALUE); builder.setHasMask(hasMask); return builder; } - private static void checkHeader(ByteBuf buffer, boolean hasMask) { + private static void checkHeader(final ByteBuf buffer, final boolean hasMask) { assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort()); short fieldAndMask = buffer.readUnsignedByte(); assertEquals("Wrong oxm-field", OxmMatchConstants.MPLS_TC, fieldAndMask >>> 1); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmPacketTypeSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmPacketTypeSerializerTest.java index a968d1c418..32992f3d89 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmPacketTypeSerializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmPacketTypeSerializerTest.java @@ -48,13 +48,13 @@ public class OxmPacketTypeSerializerTest { assertEquals(packetType, buffer.readUnsignedInt()); } - private static MatchEntry createMatchEntry(Uint32 packetType) { + private static MatchEntry createMatchEntry(final Uint32 packetType) { PacketTypeCase packetTypeCase = new PacketTypeCaseBuilder() .setPacketType(new PacketTypeBuilder().setPacketType(packetType).build()) .build(); return new MatchEntryBuilder() - .setOxmClass(OpenflowBasicClass.class) - .setOxmMatchField(PacketType.class) + .setOxmClass(OpenflowBasicClass.VALUE) + .setOxmMatchField(PacketType.VALUE) .setHasMask(false) .setMatchEntryValue(packetTypeCase) .build(); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmPbbIsidSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmPbbIsidSerializerTest.java index e2427d5120..6ec812f5c3 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmPbbIsidSerializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmPbbIsidSerializerTest.java @@ -118,7 +118,7 @@ public class OxmPbbIsidSerializerTest { assertEquals("Wrong value length", EncodeConstants.SIZE_OF_3_BYTES, serializer.getValueLength()); } - private static MatchEntryBuilder preparePbbIsidMatchEntry(boolean hasMask, int value) { + private static MatchEntryBuilder preparePbbIsidMatchEntry(final boolean hasMask, final int value) { final MatchEntryBuilder builder = preparePbbIsidHeader(hasMask); PbbIsidCaseBuilder casebuilder = new PbbIsidCaseBuilder(); PbbIsidBuilder valueBuilder = new PbbIsidBuilder(); @@ -131,15 +131,15 @@ public class OxmPbbIsidSerializerTest { return builder; } - private static MatchEntryBuilder preparePbbIsidHeader(boolean hasMask) { + private static MatchEntryBuilder preparePbbIsidHeader(final boolean hasMask) { MatchEntryBuilder builder = new MatchEntryBuilder(); - builder.setOxmClass(OpenflowBasicClass.class); - builder.setOxmMatchField(PbbIsid.class); + builder.setOxmClass(OpenflowBasicClass.VALUE); + builder.setOxmMatchField(PbbIsid.VALUE); builder.setHasMask(hasMask); return builder; } - private static void checkHeader(ByteBuf buffer, boolean hasMask) { + private static void checkHeader(final ByteBuf buffer, final boolean hasMask) { assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort()); short fieldAndMask = buffer.readUnsignedByte(); assertEquals("Wrong oxm-field", OxmMatchConstants.PBB_ISID, fieldAndMask >>> 1); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmSctpDstSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmSctpDstSerializerTest.java index 81b14024ef..55918c8467 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmSctpDstSerializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmSctpDstSerializerTest.java @@ -84,7 +84,7 @@ public class OxmSctpDstSerializerTest { assertEquals("Wrong value length", Short.BYTES, serializer.getValueLength()); } - private static MatchEntryBuilder prepareMatchEntry(int value) { + private static MatchEntryBuilder prepareMatchEntry(final int value) { MatchEntryBuilder builder = prepareHeader(false); SctpDstCaseBuilder casebuilder = new SctpDstCaseBuilder(); SctpDstBuilder valueBuilder = new SctpDstBuilder(); @@ -94,15 +94,15 @@ public class OxmSctpDstSerializerTest { return builder; } - private static MatchEntryBuilder prepareHeader(boolean hasMask) { + private static MatchEntryBuilder prepareHeader(final boolean hasMask) { MatchEntryBuilder builder = new MatchEntryBuilder(); - builder.setOxmClass(OpenflowBasicClass.class); - builder.setOxmMatchField(SctpDst.class); + builder.setOxmClass(OpenflowBasicClass.VALUE); + builder.setOxmMatchField(SctpDst.VALUE); builder.setHasMask(hasMask); return builder; } - private static void checkHeader(ByteBuf buffer, boolean hasMask) { + private static void checkHeader(final ByteBuf buffer, final boolean hasMask) { assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort()); short fieldAndMask = buffer.readUnsignedByte(); assertEquals("Wrong oxm-field", OxmMatchConstants.SCTP_DST, fieldAndMask >>> 1); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmSctpSrcSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmSctpSrcSerializerTest.java index 7d63e0f991..1cdc117eda 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmSctpSrcSerializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmSctpSrcSerializerTest.java @@ -84,7 +84,7 @@ public class OxmSctpSrcSerializerTest { assertEquals("Wrong value length", Short.BYTES, serializer.getValueLength()); } - private static MatchEntryBuilder prepareMatchEntry(int value) { + private static MatchEntryBuilder prepareMatchEntry(final int value) { MatchEntryBuilder builder = prepareHeader(false); SctpSrcCaseBuilder casebuilder = new SctpSrcCaseBuilder(); SctpSrcBuilder valueBuilder = new SctpSrcBuilder(); @@ -94,15 +94,15 @@ public class OxmSctpSrcSerializerTest { return builder; } - private static MatchEntryBuilder prepareHeader(boolean hasMask) { + private static MatchEntryBuilder prepareHeader(final boolean hasMask) { MatchEntryBuilder builder = new MatchEntryBuilder(); - builder.setOxmClass(OpenflowBasicClass.class); - builder.setOxmMatchField(SctpSrc.class); + builder.setOxmClass(OpenflowBasicClass.VALUE); + builder.setOxmMatchField(SctpSrc.VALUE); builder.setHasMask(hasMask); return builder; } - private static void checkHeader(ByteBuf buffer, boolean hasMask) { + private static void checkHeader(final ByteBuf buffer, final boolean hasMask) { assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort()); short fieldAndMask = buffer.readUnsignedByte(); assertEquals("Wrong oxm-field", OxmMatchConstants.SCTP_SRC, fieldAndMask >>> 1); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmTcpDstSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmTcpDstSerializerTest.java index 627782bc38..f250e900d1 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmTcpDstSerializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmTcpDstSerializerTest.java @@ -84,7 +84,7 @@ public class OxmTcpDstSerializerTest { assertEquals("Wrong value length", Short.BYTES, serializer.getValueLength()); } - private static MatchEntryBuilder prepareMatchEntry(int value) { + private static MatchEntryBuilder prepareMatchEntry(final int value) { MatchEntryBuilder builder = prepareHeader(false); TcpDstCaseBuilder casebuilder = new TcpDstCaseBuilder(); TcpDstBuilder valueBuilder = new TcpDstBuilder(); @@ -94,15 +94,15 @@ public class OxmTcpDstSerializerTest { return builder; } - private static MatchEntryBuilder prepareHeader(boolean hasMask) { + private static MatchEntryBuilder prepareHeader(final boolean hasMask) { MatchEntryBuilder builder = new MatchEntryBuilder(); - builder.setOxmClass(OpenflowBasicClass.class); - builder.setOxmMatchField(TcpDst.class); + builder.setOxmClass(OpenflowBasicClass.VALUE); + builder.setOxmMatchField(TcpDst.VALUE); builder.setHasMask(hasMask); return builder; } - private static void checkHeader(ByteBuf buffer, boolean hasMask) { + private static void checkHeader(final ByteBuf buffer, final boolean hasMask) { assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort()); short fieldAndMask = buffer.readUnsignedByte(); assertEquals("Wrong oxm-field", OxmMatchConstants.TCP_DST, fieldAndMask >>> 1); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmTcpSrcSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmTcpSrcSerializerTest.java index f7f4c54710..11f6cbce94 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmTcpSrcSerializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmTcpSrcSerializerTest.java @@ -84,7 +84,7 @@ public class OxmTcpSrcSerializerTest { assertEquals("Wrong value length", Short.BYTES, serializer.getValueLength()); } - private static MatchEntryBuilder prepareMatchEntry(int value) { + private static MatchEntryBuilder prepareMatchEntry(final int value) { MatchEntryBuilder builder = prepareHeader(false); TcpSrcCaseBuilder casebuilder = new TcpSrcCaseBuilder(); TcpSrcBuilder valueBuilder = new TcpSrcBuilder(); @@ -94,15 +94,15 @@ public class OxmTcpSrcSerializerTest { return builder; } - private static MatchEntryBuilder prepareHeader(boolean hasMask) { + private static MatchEntryBuilder prepareHeader(final boolean hasMask) { MatchEntryBuilder builder = new MatchEntryBuilder(); - builder.setOxmClass(OpenflowBasicClass.class); - builder.setOxmMatchField(TcpSrc.class); + builder.setOxmClass(OpenflowBasicClass.VALUE); + builder.setOxmMatchField(TcpSrc.VALUE); builder.setHasMask(hasMask); return builder; } - private static void checkHeader(ByteBuf buffer, boolean hasMask) { + private static void checkHeader(final ByteBuf buffer, final boolean hasMask) { assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort()); short fieldAndMask = buffer.readUnsignedByte(); assertEquals("Wrong oxm-field", OxmMatchConstants.TCP_SRC, fieldAndMask >>> 1); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmTunnelIdSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmTunnelIdSerializerTest.java index f7e3d675af..fa3ec83d72 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmTunnelIdSerializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmTunnelIdSerializerTest.java @@ -120,7 +120,7 @@ public class OxmTunnelIdSerializerTest { assertEquals("Wrong value length", Long.BYTES, serializer.getValueLength()); } - private static MatchEntryBuilder prepareMatchEntry(boolean hasMask, byte[] value) { + private static MatchEntryBuilder prepareMatchEntry(final boolean hasMask, final byte[] value) { final MatchEntryBuilder builder = prepareHeader(hasMask); TunnelIdCaseBuilder casebuilder = new TunnelIdCaseBuilder(); TunnelIdBuilder valueBuilder = new TunnelIdBuilder(); @@ -133,15 +133,15 @@ public class OxmTunnelIdSerializerTest { return builder; } - private static MatchEntryBuilder prepareHeader(boolean hasMask) { + private static MatchEntryBuilder prepareHeader(final boolean hasMask) { MatchEntryBuilder builder = new MatchEntryBuilder(); - builder.setOxmClass(OpenflowBasicClass.class); - builder.setOxmMatchField(TunnelId.class); + builder.setOxmClass(OpenflowBasicClass.VALUE); + builder.setOxmMatchField(TunnelId.VALUE); builder.setHasMask(hasMask); return builder; } - private static void checkHeader(ByteBuf buffer, boolean hasMask) { + private static void checkHeader(final ByteBuf buffer, final boolean hasMask) { assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort()); short fieldAndMask = buffer.readUnsignedByte(); assertEquals("Wrong oxm-field", OxmMatchConstants.TUNNEL_ID, fieldAndMask >>> 1); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmUdpDstSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmUdpDstSerializerTest.java index 1d91fd50b5..48ae0ddd20 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmUdpDstSerializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmUdpDstSerializerTest.java @@ -84,7 +84,7 @@ public class OxmUdpDstSerializerTest { assertEquals("Wrong value length", Short.BYTES, serializer.getValueLength()); } - private static MatchEntryBuilder prepareMatchEntry(int value) { + private static MatchEntryBuilder prepareMatchEntry(final int value) { MatchEntryBuilder builder = prepareHeader(false); UdpDstCaseBuilder casebuilder = new UdpDstCaseBuilder(); UdpDstBuilder valueBuilder = new UdpDstBuilder(); @@ -94,15 +94,15 @@ public class OxmUdpDstSerializerTest { return builder; } - private static MatchEntryBuilder prepareHeader(boolean hasMask) { + private static MatchEntryBuilder prepareHeader(final boolean hasMask) { MatchEntryBuilder builder = new MatchEntryBuilder(); - builder.setOxmClass(OpenflowBasicClass.class); - builder.setOxmMatchField(UdpDst.class); + builder.setOxmClass(OpenflowBasicClass.VALUE); + builder.setOxmMatchField(UdpDst.VALUE); builder.setHasMask(hasMask); return builder; } - private static void checkHeader(ByteBuf buffer, boolean hasMask) { + private static void checkHeader(final ByteBuf buffer, final boolean hasMask) { assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort()); short fieldAndMask = buffer.readUnsignedByte(); assertEquals("Wrong oxm-field", OxmMatchConstants.UDP_DST, fieldAndMask >>> 1); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmUdpSrcSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmUdpSrcSerializerTest.java index 39fbf7029a..cd4c6d3139 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmUdpSrcSerializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmUdpSrcSerializerTest.java @@ -84,7 +84,7 @@ public class OxmUdpSrcSerializerTest { assertEquals("Wrong value length", Short.BYTES, serializer.getValueLength()); } - private static MatchEntryBuilder prepareMatchEntry(int value) { + private static MatchEntryBuilder prepareMatchEntry(final int value) { MatchEntryBuilder builder = prepareHeader(false); UdpSrcCaseBuilder casebuilder = new UdpSrcCaseBuilder(); UdpSrcBuilder valueBuilder = new UdpSrcBuilder(); @@ -94,15 +94,15 @@ public class OxmUdpSrcSerializerTest { return builder; } - private static MatchEntryBuilder prepareHeader(boolean hasMask) { + private static MatchEntryBuilder prepareHeader(final boolean hasMask) { MatchEntryBuilder builder = new MatchEntryBuilder(); - builder.setOxmClass(OpenflowBasicClass.class); - builder.setOxmMatchField(UdpSrc.class); + builder.setOxmClass(OpenflowBasicClass.VALUE); + builder.setOxmMatchField(UdpSrc.VALUE); builder.setHasMask(hasMask); return builder; } - private static void checkHeader(ByteBuf buffer, boolean hasMask) { + private static void checkHeader(final ByteBuf buffer, final boolean hasMask) { assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort()); short fieldAndMask = buffer.readUnsignedByte(); assertEquals("Wrong oxm-field", OxmMatchConstants.UDP_SRC, fieldAndMask >>> 1); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmVlanPcpSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmVlanPcpSerializerTest.java index 2140bd8aec..f856e905ed 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmVlanPcpSerializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmVlanPcpSerializerTest.java @@ -83,7 +83,7 @@ public class OxmVlanPcpSerializerTest { assertEquals("Wrong value length", Byte.BYTES, serializer.getValueLength()); } - private static MatchEntryBuilder prepareVlanPcpMatchEntry(Uint8 value) { + private static MatchEntryBuilder prepareVlanPcpMatchEntry(final Uint8 value) { MatchEntryBuilder builder = prepareVlanPcpHeader(false); VlanPcpCaseBuilder casebuilder = new VlanPcpCaseBuilder(); VlanPcpBuilder valueBuilder = new VlanPcpBuilder(); @@ -93,15 +93,15 @@ public class OxmVlanPcpSerializerTest { return builder; } - private static MatchEntryBuilder prepareVlanPcpHeader(boolean hasMask) { + private static MatchEntryBuilder prepareVlanPcpHeader(final boolean hasMask) { MatchEntryBuilder builder = new MatchEntryBuilder(); - builder.setOxmClass(OpenflowBasicClass.class); - builder.setOxmMatchField(VlanPcp.class); + builder.setOxmClass(OpenflowBasicClass.VALUE); + builder.setOxmMatchField(VlanPcp.VALUE); builder.setHasMask(hasMask); return builder; } - private static void checkHeader(ByteBuf buffer, boolean hasMask) { + private static void checkHeader(final ByteBuf buffer, final boolean hasMask) { assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort()); short fieldAndMask = buffer.readUnsignedByte(); assertEquals("Wrong oxm-field", OxmMatchConstants.VLAN_PCP, fieldAndMask >>> 1); diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmVlanVidSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmVlanVidSerializerTest.java index 53aabf2998..272833f879 100644 --- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmVlanVidSerializerTest.java +++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmVlanVidSerializerTest.java @@ -116,7 +116,7 @@ public class OxmVlanVidSerializerTest { assertEquals("Wrong value length", Short.BYTES, serializer.getValueLength()); } - private static MatchEntryBuilder prepareVlanVidMatchEntry(boolean hasMask, boolean cfiBit) { + private static MatchEntryBuilder prepareVlanVidMatchEntry(final boolean hasMask, final boolean cfiBit) { final MatchEntryBuilder builder = prepareVlanVidHeader(hasMask); final VlanVidCaseBuilder casebuilder = new VlanVidCaseBuilder(); VlanVidBuilder valueBuilder = new VlanVidBuilder(); @@ -130,15 +130,15 @@ public class OxmVlanVidSerializerTest { return builder; } - private static MatchEntryBuilder prepareVlanVidHeader(boolean hasMask) { + private static MatchEntryBuilder prepareVlanVidHeader(final boolean hasMask) { MatchEntryBuilder builder = new MatchEntryBuilder(); - builder.setOxmClass(OpenflowBasicClass.class); - builder.setOxmMatchField(VlanVid.class); + builder.setOxmClass(OpenflowBasicClass.VALUE); + builder.setOxmMatchField(VlanVid.VALUE); builder.setHasMask(hasMask); return builder; } - private static void checkHeader(ByteBuf buffer, boolean hasMask) { + private static void checkHeader(final ByteBuf buffer, final boolean hasMask) { assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort()); short fieldAndMask = buffer.readUnsignedByte(); assertEquals("Wrong oxm-field", OxmMatchConstants.VLAN_VID, fieldAndMask >>> 1); 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 8efebfa4c9..5861cb89df 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 @@ -129,9 +129,9 @@ public class ActionsDeserializerTest { .getSetFieldAction().getMatchEntry(); Assert.assertEquals("Wrong number of fields", 1, entries.size()); Assert.assertEquals("Wrong match entry class", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow." - + "oxm.rev150225.OpenflowBasicClass", entries.get(0).getOxmClass().getName()); + + "oxm.rev150225.OpenflowBasicClass", entries.get(0).getOxmClass().implementedInterface().getName()); Assert.assertEquals("Wrong match entry field", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow." - + "oxm.rev150225.InPhyPort", entries.get(0).getOxmMatchField().getName()); + + "oxm.rev150225.InPhyPort", entries.get(0).getOxmMatchField().implementedInterface().getName()); Assert.assertEquals("Wrong match entry mask", false, entries.get(0).getHasMask()); Assert.assertEquals("Wrong match entry value", 11, ((InPhyPortCase) entries.get(0).getMatchEntryValue()).getInPhyPort().getPortNumber() 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 467beca319..6ee5715776 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 @@ -214,54 +214,54 @@ public class MatchDeserializerTest { + "80 00 58 04 00 01 89 4f"); Match match = matchDeserializer.deserialize(buffer); - Assert.assertEquals("Wrong match type", OxmMatchType.class, match.getType()); + Assert.assertEquals("Wrong match type", OxmMatchType.VALUE, match.getType()); Assert.assertEquals("Wrong match entries size", 41, match.getMatchEntry().size()); List entries = match.getMatchEntry(); MatchEntry entry0 = entries.get(0); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry0.getOxmClass()); - Assert.assertEquals("Wrong entry field", InPort.class, entry0.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry0.getOxmClass()); + Assert.assertEquals("Wrong entry field", InPort.VALUE, entry0.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", false, entry0.getHasMask()); Assert.assertEquals("Wrong entry value", 1, ((InPortCase) entry0.getMatchEntryValue()).getInPort().getPortNumber().getValue().intValue()); MatchEntry entry1 = entries.get(1); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry1.getOxmClass()); - Assert.assertEquals("Wrong entry field", InPhyPort.class, entry1.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry1.getOxmClass()); + Assert.assertEquals("Wrong entry field", InPhyPort.VALUE, entry1.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", false, entry1.getHasMask()); Assert.assertEquals("Wrong entry value", 2, ((InPhyPortCase) entry1.getMatchEntryValue()).getInPhyPort().getPortNumber().getValue().intValue()); MatchEntry entry2 = entries.get(2); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry2.getOxmClass()); - Assert.assertEquals("Wrong entry field", Metadata.class, entry2.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry2.getOxmClass()); + Assert.assertEquals("Wrong entry field", Metadata.VALUE, entry2.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", true, entry2.getHasMask()); Assert.assertArrayEquals("Wrong entry value", ByteBufUtils.hexStringToBytes("00 00 00 00 00 00 00 03"), ((MetadataCase) entry2.getMatchEntryValue()).getMetadata().getMetadata()); Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 00 00 00 00 00 00 04"), ((MetadataCase) entry2.getMatchEntryValue()).getMetadata().getMask()); MatchEntry entry3 = entries.get(3); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry3.getOxmClass()); - Assert.assertEquals("Wrong entry field", EthDst.class, entry3.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry3.getOxmClass()); + Assert.assertEquals("Wrong entry field", EthDst.VALUE, entry3.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", true, entry3.getHasMask()); Assert.assertEquals("Wrong entry value", new MacAddress("00:00:00:00:00:05"), ((EthDstCase) entry3.getMatchEntryValue()).getEthDst().getMacAddress()); Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 00 00 00 00 06"), ((EthDstCase) entry3.getMatchEntryValue()).getEthDst().getMask()); MatchEntry entry4 = entries.get(4); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry4.getOxmClass()); - Assert.assertEquals("Wrong entry field", EthSrc.class, entry4.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry4.getOxmClass()); + Assert.assertEquals("Wrong entry field", EthSrc.VALUE, entry4.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", true, entry4.getHasMask()); Assert.assertEquals("Wrong entry value", new MacAddress("00:00:00:00:00:07"), ((EthSrcCase) entry4.getMatchEntryValue()).getEthSrc().getMacAddress()); Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 00 00 00 00 08"), ((EthSrcCase) entry4.getMatchEntryValue()).getEthSrc().getMask()); MatchEntry entry5 = entries.get(5); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry5.getOxmClass()); - Assert.assertEquals("Wrong entry field", EthType.class, entry5.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry5.getOxmClass()); + Assert.assertEquals("Wrong entry field", EthType.VALUE, entry5.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", false, entry5.getHasMask()); Assert.assertEquals("Wrong entry value", 9, ((EthTypeCase) entry5.getMatchEntryValue()).getEthType().getEthType().getValue().intValue()); MatchEntry entry6 = entries.get(6); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry6.getOxmClass()); - Assert.assertEquals("Wrong entry field", VlanVid.class, entry6.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry6.getOxmClass()); + Assert.assertEquals("Wrong entry field", VlanVid.VALUE, entry6.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", true, entry6.getHasMask()); Assert.assertEquals("Wrong entry value", 10, ((VlanVidCase) entry6.getMatchEntryValue()).getVlanVid().getVlanVid().intValue()); @@ -270,134 +270,134 @@ public class MatchDeserializerTest { Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 0B"), ((VlanVidCase) entry6.getMatchEntryValue()).getVlanVid().getMask()); MatchEntry entry7 = entries.get(7); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry7.getOxmClass()); - Assert.assertEquals("Wrong entry field", VlanPcp.class, entry7.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry7.getOxmClass()); + Assert.assertEquals("Wrong entry field", VlanPcp.VALUE, entry7.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", false, entry7.getHasMask()); Assert.assertEquals("Wrong entry value", 12, ((VlanPcpCase) entry7.getMatchEntryValue()).getVlanPcp().getVlanPcp().intValue()); MatchEntry entry8 = entries.get(8); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry8.getOxmClass()); - Assert.assertEquals("Wrong entry field", IpDscp.class, entry8.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry8.getOxmClass()); + Assert.assertEquals("Wrong entry field", IpDscp.VALUE, entry8.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", false, entry8.getHasMask()); Assert.assertEquals("Wrong entry value", 13, ((IpDscpCase) entry8.getMatchEntryValue()).getIpDscp().getDscp().getValue().intValue()); MatchEntry entry9 = entries.get(9); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry9.getOxmClass()); - Assert.assertEquals("Wrong entry field", IpEcn.class, entry9.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry9.getOxmClass()); + Assert.assertEquals("Wrong entry field", IpEcn.VALUE, entry9.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", false, entry9.getHasMask()); Assert.assertEquals("Wrong entry value", 14, ((IpEcnCase) entry9.getMatchEntryValue()).getIpEcn().getEcn().intValue()); MatchEntry entry10 = entries.get(10); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry10.getOxmClass()); - Assert.assertEquals("Wrong entry field", IpProto.class, entry10.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry10.getOxmClass()); + Assert.assertEquals("Wrong entry field", IpProto.VALUE, entry10.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", false, entry10.getHasMask()); Assert.assertEquals("Wrong entry value", 15, ((IpProtoCase) entry10.getMatchEntryValue()).getIpProto().getProtocolNumber().intValue()); MatchEntry entry11 = entries.get(11); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry11.getOxmClass()); - Assert.assertEquals("Wrong entry field", Ipv4Src.class, entry11.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry11.getOxmClass()); + Assert.assertEquals("Wrong entry field", Ipv4Src.VALUE, entry11.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", true, entry11.getHasMask()); Assert.assertEquals("Wrong entry value", new Ipv4Address("10.0.0.1"), ((Ipv4SrcCase) entry11.getMatchEntryValue()).getIpv4Src().getIpv4Address()); Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 00 FF 00"), ((Ipv4SrcCase) entry11.getMatchEntryValue()).getIpv4Src().getMask()); MatchEntry entry12 = entries.get(12); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry12.getOxmClass()); - Assert.assertEquals("Wrong entry field", Ipv4Dst.class, entry12.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry12.getOxmClass()); + Assert.assertEquals("Wrong entry field", Ipv4Dst.VALUE, entry12.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", true, entry12.getHasMask()); Assert.assertEquals("Wrong entry value", new Ipv4Address("10.0.0.2"), ((Ipv4DstCase) entry12.getMatchEntryValue()).getIpv4Dst().getIpv4Address()); Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 00 00 FF"), ((Ipv4DstCase) entry12.getMatchEntryValue()).getIpv4Dst().getMask()); MatchEntry entry13 = entries.get(13); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry13.getOxmClass()); - Assert.assertEquals("Wrong entry field", TcpSrc.class, entry13.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry13.getOxmClass()); + Assert.assertEquals("Wrong entry field", TcpSrc.VALUE, entry13.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", false, entry13.getHasMask()); Assert.assertEquals("Wrong entry value", 3, ((TcpSrcCase) entry13.getMatchEntryValue()).getTcpSrc().getPort().getValue().intValue()); MatchEntry entry14 = entries.get(14); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry14.getOxmClass()); - Assert.assertEquals("Wrong entry field", TcpDst.class, entry14.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry14.getOxmClass()); + Assert.assertEquals("Wrong entry field", TcpDst.VALUE, entry14.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", false, entry14.getHasMask()); Assert.assertEquals("Wrong entry value", 4, ((TcpDstCase) entry14.getMatchEntryValue()).getTcpDst().getPort().getValue().intValue()); MatchEntry entry15 = entries.get(15); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry15.getOxmClass()); - Assert.assertEquals("Wrong entry field", UdpSrc.class, entry15.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry15.getOxmClass()); + Assert.assertEquals("Wrong entry field", UdpSrc.VALUE, entry15.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", false, entry15.getHasMask()); Assert.assertEquals("Wrong entry value", 5, ((UdpSrcCase) entry15.getMatchEntryValue()).getUdpSrc().getPort().getValue().intValue()); MatchEntry entry16 = entries.get(16); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry16.getOxmClass()); - Assert.assertEquals("Wrong entry field", UdpDst.class, entry16.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry16.getOxmClass()); + Assert.assertEquals("Wrong entry field", UdpDst.VALUE, entry16.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", false, entry16.getHasMask()); Assert.assertEquals("Wrong entry value", 6, ((UdpDstCase) entry16.getMatchEntryValue()).getUdpDst().getPort().getValue().intValue()); MatchEntry entry17 = entries.get(17); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry17.getOxmClass()); - Assert.assertEquals("Wrong entry field", SctpSrc.class, entry17.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry17.getOxmClass()); + Assert.assertEquals("Wrong entry field", SctpSrc.VALUE, entry17.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", false, entry17.getHasMask()); Assert.assertEquals("Wrong entry value", 7, ((SctpSrcCase) entry17.getMatchEntryValue()).getSctpSrc().getPort().getValue().intValue()); MatchEntry entry18 = entries.get(18); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry18.getOxmClass()); - Assert.assertEquals("Wrong entry field", SctpDst.class, entry18.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry18.getOxmClass()); + Assert.assertEquals("Wrong entry field", SctpDst.VALUE, entry18.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", false, entry18.getHasMask()); Assert.assertEquals("Wrong entry value", 8, ((SctpDstCase) entry18.getMatchEntryValue()).getSctpDst().getPort().getValue().intValue()); MatchEntry entry19 = entries.get(19); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry19.getOxmClass()); - Assert.assertEquals("Wrong entry field", Icmpv4Type.class, entry19.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry19.getOxmClass()); + Assert.assertEquals("Wrong entry field", Icmpv4Type.VALUE, entry19.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", false, entry19.getHasMask()); Assert.assertEquals("Wrong entry value", 5, ((Icmpv4TypeCase) entry19.getMatchEntryValue()).getIcmpv4Type().getIcmpv4Type().intValue()); MatchEntry entry20 = entries.get(20); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry20.getOxmClass()); - Assert.assertEquals("Wrong entry field", Icmpv4Code.class, entry20.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry20.getOxmClass()); + Assert.assertEquals("Wrong entry field", Icmpv4Code.VALUE, entry20.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", false, entry20.getHasMask()); Assert.assertEquals("Wrong entry value", 7, ((Icmpv4CodeCase) entry20.getMatchEntryValue()).getIcmpv4Code().getIcmpv4Code().intValue()); MatchEntry entry21 = entries.get(21); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry21.getOxmClass()); - Assert.assertEquals("Wrong entry field", ArpOp.class, entry21.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry21.getOxmClass()); + Assert.assertEquals("Wrong entry field", ArpOp.VALUE, entry21.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", false, entry21.getHasMask()); Assert.assertEquals("Wrong entry value", 16, ((ArpOpCase) entry21.getMatchEntryValue()).getArpOp().getOpCode().intValue()); MatchEntry entry22 = entries.get(22); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry22.getOxmClass()); - Assert.assertEquals("Wrong entry field", ArpSpa.class, entry22.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry22.getOxmClass()); + Assert.assertEquals("Wrong entry field", ArpSpa.VALUE, entry22.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", true, entry22.getHasMask()); Assert.assertEquals("Wrong entry value", new Ipv4Address("10.0.0.9"), ((ArpSpaCase) entry22.getMatchEntryValue()).getArpSpa().getIpv4Address()); Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 00 FF 00"), ((ArpSpaCase) entry22.getMatchEntryValue()).getArpSpa().getMask()); MatchEntry entry23 = entries.get(23); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry23.getOxmClass()); - Assert.assertEquals("Wrong entry field", ArpTpa.class, entry23.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry23.getOxmClass()); + Assert.assertEquals("Wrong entry field", ArpTpa.VALUE, entry23.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", true, entry23.getHasMask()); Assert.assertEquals("Wrong entry value", new Ipv4Address("10.0.0.10"), ((ArpTpaCase) entry23.getMatchEntryValue()).getArpTpa().getIpv4Address()); Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 00 00 FF"), ((ArpTpaCase) entry23.getMatchEntryValue()).getArpTpa().getMask()); MatchEntry entry24 = entries.get(24); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry24.getOxmClass()); - Assert.assertEquals("Wrong entry field", ArpSha.class, entry24.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry24.getOxmClass()); + Assert.assertEquals("Wrong entry field", ArpSha.VALUE, entry24.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", true, entry24.getHasMask()); Assert.assertEquals("Wrong entry value", new MacAddress("00:00:00:00:00:01"), ((ArpShaCase) entry24.getMatchEntryValue()).getArpSha().getMacAddress()); Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 00 00 00 00 03"), ((ArpShaCase) entry24.getMatchEntryValue()).getArpSha().getMask()); MatchEntry entry25 = entries.get(25); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry25.getOxmClass()); - Assert.assertEquals("Wrong entry field", ArpTha.class, entry25.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry25.getOxmClass()); + Assert.assertEquals("Wrong entry field", ArpTha.VALUE, entry25.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", true, entry25.getHasMask()); Assert.assertEquals("Wrong entry value", new MacAddress("00:00:00:00:00:02"), ((ArpThaCase) entry25.getMatchEntryValue()).getArpTha().getMacAddress()); Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 00 00 00 00 04"), ((ArpThaCase) entry25.getMatchEntryValue()).getArpTha().getMask()); MatchEntry entry26 = entries.get(26); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry26.getOxmClass()); - Assert.assertEquals("Wrong entry field", Ipv6Src.class, entry26.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry26.getOxmClass()); + Assert.assertEquals("Wrong entry field", Ipv6Src.VALUE, entry26.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", true, entry26.getHasMask()); Assert.assertEquals("Wrong entry value", new Ipv6Address("::15"), ((Ipv6SrcCase) entry26.getMatchEntryValue()).getIpv6Src().getIpv6Address()); @@ -405,8 +405,8 @@ public class MatchDeserializerTest { ByteBufUtils.hexStringToBytes("00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 16"), ((Ipv6SrcCase) entry26.getMatchEntryValue()).getIpv6Src().getMask()); MatchEntry entry27 = entries.get(27); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry27.getOxmClass()); - Assert.assertEquals("Wrong entry field", Ipv6Dst.class, entry27.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry27.getOxmClass()); + Assert.assertEquals("Wrong entry field", Ipv6Dst.VALUE, entry27.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", true, entry27.getHasMask()); Assert.assertEquals("Wrong entry value", new Ipv6Address("::17"), ((Ipv6DstCase) entry27.getMatchEntryValue()).getIpv6Dst().getIpv6Address()); @@ -414,79 +414,79 @@ public class MatchDeserializerTest { ByteBufUtils.hexStringToBytes("00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 18"), ((Ipv6DstCase) entry27.getMatchEntryValue()).getIpv6Dst().getMask()); MatchEntry entry28 = entries.get(28); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry28.getOxmClass()); - Assert.assertEquals("Wrong entry field", Ipv6Flabel.class, entry28.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry28.getOxmClass()); + Assert.assertEquals("Wrong entry field", Ipv6Flabel.VALUE, entry28.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", false, entry28.getHasMask()); Assert.assertEquals("Wrong entry value", 2, ((Ipv6FlabelCase) entry28.getMatchEntryValue()).getIpv6Flabel().getIpv6Flabel() .getValue().intValue()); MatchEntry entry29 = entries.get(29); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry29.getOxmClass()); - Assert.assertEquals("Wrong entry field", Icmpv6Type.class, entry29.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry29.getOxmClass()); + Assert.assertEquals("Wrong entry field", Icmpv6Type.VALUE, entry29.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", false, entry29.getHasMask()); Assert.assertEquals("Wrong entry value", 21, ((Icmpv6TypeCase) entry29.getMatchEntryValue()).getIcmpv6Type().getIcmpv6Type().intValue()); MatchEntry entry30 = entries.get(30); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry30.getOxmClass()); - Assert.assertEquals("Wrong entry field", Icmpv6Code.class, entry30.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry30.getOxmClass()); + Assert.assertEquals("Wrong entry field", Icmpv6Code.VALUE, entry30.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", false, entry30.getHasMask()); Assert.assertEquals("Wrong entry value", 23, ((Icmpv6CodeCase) entry30.getMatchEntryValue()).getIcmpv6Code().getIcmpv6Code().intValue()); MatchEntry entry31 = entries.get(31); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry31.getOxmClass()); - Assert.assertEquals("Wrong entry field", Ipv6NdTarget.class, entry31.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry31.getOxmClass()); + Assert.assertEquals("Wrong entry field", Ipv6NdTarget.VALUE, entry31.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", false, entry31.getHasMask()); Assert.assertEquals("Wrong entry value", new Ipv6Address("::20"), ((Ipv6NdTargetCase) entry31.getMatchEntryValue()).getIpv6NdTarget().getIpv6Address()); MatchEntry entry32 = entries.get(32); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry32.getOxmClass()); - Assert.assertEquals("Wrong entry field", Ipv6NdSll.class, entry32.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry32.getOxmClass()); + Assert.assertEquals("Wrong entry field", Ipv6NdSll.VALUE, entry32.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", false, entry32.getHasMask()); Assert.assertEquals("Wrong entry value", new MacAddress("00:05:00:00:00:01"), ((Ipv6NdSllCase) entry32.getMatchEntryValue()).getIpv6NdSll().getMacAddress()); MatchEntry entry33 = entries.get(33); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry33.getOxmClass()); - Assert.assertEquals("Wrong entry field", Ipv6NdTll.class, entry33.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry33.getOxmClass()); + Assert.assertEquals("Wrong entry field", Ipv6NdTll.VALUE, entry33.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", false, entry33.getHasMask()); Assert.assertEquals("Wrong entry value", new MacAddress("00:05:00:00:00:02"), ((Ipv6NdTllCase) entry33.getMatchEntryValue()).getIpv6NdTll().getMacAddress()); MatchEntry entry34 = entries.get(34); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry34.getOxmClass()); - Assert.assertEquals("Wrong entry field", MplsLabel.class, entry34.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry34.getOxmClass()); + Assert.assertEquals("Wrong entry field", MplsLabel.VALUE, entry34.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", false, entry34.getHasMask()); Assert.assertEquals("Wrong entry value", 515, ((MplsLabelCase) entry34.getMatchEntryValue()).getMplsLabel().getMplsLabel().intValue()); MatchEntry entry35 = entries.get(35); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry35.getOxmClass()); - Assert.assertEquals("Wrong entry field", MplsTc.class, entry35.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry35.getOxmClass()); + Assert.assertEquals("Wrong entry field", MplsTc.VALUE, entry35.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", false, entry35.getHasMask()); Assert.assertEquals("Wrong entry value", 3, ((MplsTcCase) entry35.getMatchEntryValue()).getMplsTc().getTc().intValue()); MatchEntry entry36 = entries.get(36); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry36.getOxmClass()); - Assert.assertEquals("Wrong entry field", MplsBos.class, entry36.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry36.getOxmClass()); + Assert.assertEquals("Wrong entry field", MplsBos.VALUE, entry36.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", false, entry36.getHasMask()); Assert.assertEquals("Wrong entry value", true, ((MplsBosCase) entry36.getMatchEntryValue()).getMplsBos().getBos()); MatchEntry entry37 = entries.get(37); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry37.getOxmClass()); - Assert.assertEquals("Wrong entry field", PbbIsid.class, entry37.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry37.getOxmClass()); + Assert.assertEquals("Wrong entry field", PbbIsid.VALUE, entry37.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", true, entry37.getHasMask()); Assert.assertEquals("Wrong entry value", 2, ((PbbIsidCase) entry37.getMatchEntryValue()).getPbbIsid().getIsid().intValue()); Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 00 01"), ((PbbIsidCase) entry37.getMatchEntryValue()).getPbbIsid().getMask()); MatchEntry entry38 = entries.get(38); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry38.getOxmClass()); - Assert.assertEquals("Wrong entry field", TunnelId.class, entry38.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry38.getOxmClass()); + Assert.assertEquals("Wrong entry field", TunnelId.VALUE, entry38.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", true, entry38.getHasMask()); Assert.assertArrayEquals("Wrong entry value", ByteBufUtils.hexStringToBytes("00 00 00 00 00 00 00 07"), ((TunnelIdCase) entry38.getMatchEntryValue()).getTunnelId().getTunnelId()); Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 00 00 00 00 00 00 FF"), ((TunnelIdCase) entry38.getMatchEntryValue()).getTunnelId().getMask()); MatchEntry entry39 = entries.get(39); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry39.getOxmClass()); - Assert.assertEquals("Wrong entry field", Ipv6Exthdr.class, entry39.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry39.getOxmClass()); + Assert.assertEquals("Wrong entry field", Ipv6Exthdr.VALUE, entry39.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", true, entry39.getHasMask()); Assert.assertEquals("Wrong entry value", new Ipv6ExthdrFlags(false, false, false, false, false, false, false, false, false), @@ -495,8 +495,8 @@ public class MatchDeserializerTest { ((Ipv6ExthdrCase) entry39.getMatchEntryValue()).getIpv6Exthdr().getMask()); Assert.assertTrue("Unread data", buffer.readableBytes() == 0); MatchEntry entry40 = entries.get(40); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry40.getOxmClass()); - Assert.assertEquals("Wrong entry field", PacketType.class, entry40.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry40.getOxmClass()); + Assert.assertEquals("Wrong entry field", PacketType.VALUE, entry40.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", false, entry40.getHasMask()); Assert.assertEquals("Wrong entry value", 0x1894f, ((PacketTypeCase) entry40.getMatchEntryValue()).getPacketType().getPacketType().longValue()); @@ -513,8 +513,8 @@ public class MatchDeserializerTest { key.setExperimenterId(null); HeaderDeserializer entryDeserializer = registry.getDeserializer(key); MatchEntry entry = entryDeserializer.deserializeHeader(buffer); - Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry.getOxmClass()); - Assert.assertEquals("Wrong entry field", Ipv4Dst.class, entry.getOxmMatchField()); + Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry.getOxmClass()); + Assert.assertEquals("Wrong entry field", Ipv4Dst.VALUE, entry.getOxmMatchField()); Assert.assertEquals("Wrong entry hasMask", false, entry.getHasMask()); Assert.assertNull("Wrong Ipv4 address", entry.getMatchEntryValue()); } @@ -528,7 +528,7 @@ public class MatchDeserializerTest { Match match = matchDeserializer.deserialize(buffer); - Assert.assertEquals("Wrong match type", StandardMatchType.class, match.getType()); + Assert.assertEquals("Wrong match type", StandardMatchType.VALUE, match.getType()); Assert.assertEquals("Wrong match entries size", 1, match.getMatchEntry().size()); } } 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 259c8f75b5..959f9fdc1c 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 @@ -155,8 +155,8 @@ public class OF13ActionsSerializerTest { actions.add(actionBuilder.build()); actionBuilder = new ActionBuilder(); MatchEntryBuilder matchBuilder = new MatchEntryBuilder(); - matchBuilder.setOxmClass(OpenflowBasicClass.class); - matchBuilder.setOxmMatchField(InPort.class); + matchBuilder.setOxmClass(OpenflowBasicClass.VALUE); + matchBuilder.setOxmMatchField(InPort.VALUE); matchBuilder.setHasMask(false); InPortCaseBuilder inPortCaseBuilder = new InPortCaseBuilder(); InPortBuilder inPortBuilder = new InPortBuilder(); @@ -265,8 +265,8 @@ public class OF13ActionsSerializerTest { actions.add(actionBuilder.build()); actionBuilder = new ActionBuilder(); MatchEntryBuilder matchBuilder = new MatchEntryBuilder(); - matchBuilder.setOxmClass(OpenflowBasicClass.class); - matchBuilder.setOxmMatchField(InPort.class); + matchBuilder.setOxmClass(OpenflowBasicClass.VALUE); + matchBuilder.setOxmMatchField(InPort.VALUE); matchBuilder.setHasMask(false); InPortCaseBuilder inPortCaseBuilder = new InPortCaseBuilder(); InPortBuilder inPortBuilder = new InPortBuilder(); 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 8da31d151f..67850f4583 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 @@ -186,7 +186,7 @@ public class OF13MatchSerializer02Test { @Test public void testEmptyMatch() { MatchBuilder builder = new MatchBuilder(); - builder.setType(OxmMatchType.class); + builder.setType(OxmMatchType.VALUE); Match match = builder.build(); ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer(); @@ -203,11 +203,11 @@ public class OF13MatchSerializer02Test { @Test public void test() { MatchBuilder builder = new MatchBuilder(); - builder.setType(OxmMatchType.class); + builder.setType(OxmMatchType.VALUE); final List entries = new ArrayList<>(); MatchEntryBuilder entryBuilder = new MatchEntryBuilder(); - entryBuilder.setOxmClass(OpenflowBasicClass.class); - entryBuilder.setOxmMatchField(InPort.class); + entryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entryBuilder.setOxmMatchField(InPort.VALUE); entryBuilder.setHasMask(false); InPortCaseBuilder inPortCaseBuilder = new InPortCaseBuilder(); InPortBuilder inPortBuilder = new InPortBuilder(); @@ -216,8 +216,8 @@ public class OF13MatchSerializer02Test { entryBuilder.setMatchEntryValue(inPortCaseBuilder.build()); entries.add(entryBuilder.build()); entryBuilder = new MatchEntryBuilder(); - entryBuilder.setOxmClass(OpenflowBasicClass.class); - entryBuilder.setOxmMatchField(InPhyPort.class); + entryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entryBuilder.setOxmMatchField(InPhyPort.VALUE); entryBuilder.setHasMask(false); InPhyPortCaseBuilder inPhyPortCaseBuilder = new InPhyPortCaseBuilder(); InPhyPortBuilder inPhyPortBuilder = new InPhyPortBuilder(); @@ -226,8 +226,8 @@ public class OF13MatchSerializer02Test { entryBuilder.setMatchEntryValue(inPhyPortCaseBuilder.build()); entries.add(entryBuilder.build()); entryBuilder = new MatchEntryBuilder(); - entryBuilder.setOxmClass(OpenflowBasicClass.class); - entryBuilder.setOxmMatchField(Metadata.class); + entryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entryBuilder.setOxmMatchField(Metadata.VALUE); entryBuilder.setHasMask(true); MetadataCaseBuilder metaCaseBuilder = new MetadataCaseBuilder(); MetadataBuilder metadataBuilder = new MetadataBuilder(); @@ -237,8 +237,8 @@ public class OF13MatchSerializer02Test { entryBuilder.setMatchEntryValue(metaCaseBuilder.build()); entries.add(entryBuilder.build()); entryBuilder = new MatchEntryBuilder(); - entryBuilder.setOxmClass(OpenflowBasicClass.class); - entryBuilder.setOxmMatchField(EthDst.class); + entryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entryBuilder.setOxmMatchField(EthDst.VALUE); entryBuilder.setHasMask(true); EthDstCaseBuilder ethDstCaseBuilder = new EthDstCaseBuilder(); EthDstBuilder ethDstBuilder = new EthDstBuilder(); @@ -248,8 +248,8 @@ public class OF13MatchSerializer02Test { entryBuilder.setMatchEntryValue(ethDstCaseBuilder.build()); entries.add(entryBuilder.build()); entryBuilder = new MatchEntryBuilder(); - entryBuilder.setOxmClass(OpenflowBasicClass.class); - entryBuilder.setOxmMatchField(EthSrc.class); + entryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entryBuilder.setOxmMatchField(EthSrc.VALUE); entryBuilder.setHasMask(true); EthSrcCaseBuilder ethSrcCaseBuilder = new EthSrcCaseBuilder(); EthSrcBuilder ethSrcBuilder = new EthSrcBuilder(); @@ -259,8 +259,8 @@ public class OF13MatchSerializer02Test { entryBuilder.setMatchEntryValue(ethSrcCaseBuilder.build()); entries.add(entryBuilder.build()); entryBuilder = new MatchEntryBuilder(); - entryBuilder.setOxmClass(OpenflowBasicClass.class); - entryBuilder.setOxmMatchField(EthType.class); + entryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entryBuilder.setOxmMatchField(EthType.VALUE); entryBuilder.setHasMask(false); EthTypeCaseBuilder ethTypeCaseBuilder = new EthTypeCaseBuilder(); EthTypeBuilder ethTypeBuilder = new EthTypeBuilder(); @@ -269,8 +269,8 @@ public class OF13MatchSerializer02Test { entryBuilder.setMatchEntryValue(ethTypeCaseBuilder.build()); entries.add(entryBuilder.build()); entryBuilder = new MatchEntryBuilder(); - entryBuilder.setOxmClass(OpenflowBasicClass.class); - entryBuilder.setOxmMatchField(VlanVid.class); + entryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entryBuilder.setOxmMatchField(VlanVid.VALUE); entryBuilder.setHasMask(true); final VlanVidCaseBuilder vlanVidCaseBuilder = new VlanVidCaseBuilder(); VlanVidBuilder vlanVidBuilder = new VlanVidBuilder(); @@ -281,8 +281,8 @@ public class OF13MatchSerializer02Test { entryBuilder.setMatchEntryValue(vlanVidCaseBuilder.build()); entries.add(entryBuilder.build()); entryBuilder = new MatchEntryBuilder(); - entryBuilder.setOxmClass(OpenflowBasicClass.class); - entryBuilder.setOxmMatchField(VlanPcp.class); + entryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entryBuilder.setOxmMatchField(VlanPcp.VALUE); entryBuilder.setHasMask(false); VlanPcpCaseBuilder vlanPcpCaseBuilder = new VlanPcpCaseBuilder(); VlanPcpBuilder vlanPcpBuilder = new VlanPcpBuilder(); @@ -291,8 +291,8 @@ public class OF13MatchSerializer02Test { entryBuilder.setMatchEntryValue(vlanPcpCaseBuilder.build()); entries.add(entryBuilder.build()); entryBuilder = new MatchEntryBuilder(); - entryBuilder.setOxmClass(OpenflowBasicClass.class); - entryBuilder.setOxmMatchField(IpDscp.class); + entryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entryBuilder.setOxmMatchField(IpDscp.VALUE); entryBuilder.setHasMask(false); IpDscpCaseBuilder ipDscpCaseBuilder = new IpDscpCaseBuilder(); IpDscpBuilder ipDscpBuilder = new IpDscpBuilder(); @@ -301,8 +301,8 @@ public class OF13MatchSerializer02Test { entryBuilder.setMatchEntryValue(ipDscpCaseBuilder.build()); entries.add(entryBuilder.build()); entryBuilder = new MatchEntryBuilder(); - entryBuilder.setOxmClass(OpenflowBasicClass.class); - entryBuilder.setOxmMatchField(IpEcn.class); + entryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entryBuilder.setOxmMatchField(IpEcn.VALUE); entryBuilder.setHasMask(false); IpEcnCaseBuilder ipEcnCaseBuilder = new IpEcnCaseBuilder(); IpEcnBuilder ipEcnBuilder = new IpEcnBuilder(); @@ -311,8 +311,8 @@ public class OF13MatchSerializer02Test { entryBuilder.setMatchEntryValue(ipEcnCaseBuilder.build()); entries.add(entryBuilder.build()); entryBuilder = new MatchEntryBuilder(); - entryBuilder.setOxmClass(OpenflowBasicClass.class); - entryBuilder.setOxmMatchField(IpProto.class); + entryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entryBuilder.setOxmMatchField(IpProto.VALUE); entryBuilder.setHasMask(false); IpProtoCaseBuilder ipProtoCaseBuilder = new IpProtoCaseBuilder(); IpProtoBuilder ipProtoBuilder = new IpProtoBuilder(); @@ -321,8 +321,8 @@ public class OF13MatchSerializer02Test { entryBuilder.setMatchEntryValue(ipProtoCaseBuilder.build()); entries.add(entryBuilder.build()); entryBuilder = new MatchEntryBuilder(); - entryBuilder.setOxmClass(OpenflowBasicClass.class); - entryBuilder.setOxmMatchField(Ipv4Src.class); + entryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entryBuilder.setOxmMatchField(Ipv4Src.VALUE); entryBuilder.setHasMask(true); Ipv4SrcCaseBuilder ipv4SrcCaseBuilder = new Ipv4SrcCaseBuilder(); Ipv4SrcBuilder ipv4SrcBuilder = new Ipv4SrcBuilder(); @@ -332,8 +332,8 @@ public class OF13MatchSerializer02Test { entryBuilder.setMatchEntryValue(ipv4SrcCaseBuilder.build()); entries.add(entryBuilder.build()); entryBuilder = new MatchEntryBuilder(); - entryBuilder.setOxmClass(OpenflowBasicClass.class); - entryBuilder.setOxmMatchField(Ipv4Dst.class); + entryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entryBuilder.setOxmMatchField(Ipv4Dst.VALUE); entryBuilder.setHasMask(true); Ipv4DstCaseBuilder ipv4DstCaseBuilder = new Ipv4DstCaseBuilder(); Ipv4DstBuilder ipv4DstBuilder = new Ipv4DstBuilder(); @@ -343,8 +343,8 @@ public class OF13MatchSerializer02Test { entryBuilder.setMatchEntryValue(ipv4DstCaseBuilder.build()); entries.add(entryBuilder.build()); entryBuilder = new MatchEntryBuilder(); - entryBuilder.setOxmClass(OpenflowBasicClass.class); - entryBuilder.setOxmMatchField(TcpSrc.class); + entryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entryBuilder.setOxmMatchField(TcpSrc.VALUE); entryBuilder.setHasMask(false); TcpSrcCaseBuilder tcpSrcCaseBuilder = new TcpSrcCaseBuilder(); TcpSrcBuilder tcpSrcBuilder = new TcpSrcBuilder(); @@ -354,8 +354,8 @@ public class OF13MatchSerializer02Test { entryBuilder.setMatchEntryValue(tcpSrcCaseBuilder.build()); entries.add(entryBuilder.build()); entryBuilder = new MatchEntryBuilder(); - entryBuilder.setOxmClass(OpenflowBasicClass.class); - entryBuilder.setOxmMatchField(TcpDst.class); + entryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entryBuilder.setOxmMatchField(TcpDst.VALUE); entryBuilder.setHasMask(false); TcpDstCaseBuilder tcpDstCaseBuilder = new TcpDstCaseBuilder(); TcpDstBuilder tcpDstBuilder = new TcpDstBuilder(); @@ -365,8 +365,8 @@ public class OF13MatchSerializer02Test { entryBuilder.setMatchEntryValue(tcpDstCaseBuilder.build()); entries.add(entryBuilder.build()); entryBuilder = new MatchEntryBuilder(); - entryBuilder.setOxmClass(OpenflowBasicClass.class); - entryBuilder.setOxmMatchField(UdpSrc.class); + entryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entryBuilder.setOxmMatchField(UdpSrc.VALUE); entryBuilder.setHasMask(false); UdpSrcCaseBuilder udpSrcCaseBuilder = new UdpSrcCaseBuilder(); UdpSrcBuilder udpSrcBuilder = new UdpSrcBuilder(); @@ -376,8 +376,8 @@ public class OF13MatchSerializer02Test { entryBuilder.setMatchEntryValue(udpSrcCaseBuilder.build()); entries.add(entryBuilder.build()); entryBuilder = new MatchEntryBuilder(); - entryBuilder.setOxmClass(OpenflowBasicClass.class); - entryBuilder.setOxmMatchField(UdpDst.class); + entryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entryBuilder.setOxmMatchField(UdpDst.VALUE); entryBuilder.setHasMask(false); UdpDstCaseBuilder udpDstCaseBuilder = new UdpDstCaseBuilder(); UdpDstBuilder udpDstBuilder = new UdpDstBuilder(); @@ -387,8 +387,8 @@ public class OF13MatchSerializer02Test { entryBuilder.setMatchEntryValue(udpDstCaseBuilder.build()); entries.add(entryBuilder.build()); entryBuilder = new MatchEntryBuilder(); - entryBuilder.setOxmClass(OpenflowBasicClass.class); - entryBuilder.setOxmMatchField(SctpSrc.class); + entryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entryBuilder.setOxmMatchField(SctpSrc.VALUE); entryBuilder.setHasMask(false); SctpSrcCaseBuilder sctpSrcCaseBuilder = new SctpSrcCaseBuilder(); SctpSrcBuilder sctpSrcBuilder = new SctpSrcBuilder(); @@ -398,8 +398,8 @@ public class OF13MatchSerializer02Test { entryBuilder.setMatchEntryValue(sctpSrcCaseBuilder.build()); entries.add(entryBuilder.build()); entryBuilder = new MatchEntryBuilder(); - entryBuilder.setOxmClass(OpenflowBasicClass.class); - entryBuilder.setOxmMatchField(SctpDst.class); + entryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entryBuilder.setOxmMatchField(SctpDst.VALUE); entryBuilder.setHasMask(false); SctpDstCaseBuilder sctpDstCaseBuilder = new SctpDstCaseBuilder(); SctpDstBuilder sctpDstBuilder = new SctpDstBuilder(); @@ -409,8 +409,8 @@ public class OF13MatchSerializer02Test { entryBuilder.setMatchEntryValue(sctpDstCaseBuilder.build()); entries.add(entryBuilder.build()); entryBuilder = new MatchEntryBuilder(); - entryBuilder.setOxmClass(OpenflowBasicClass.class); - entryBuilder.setOxmMatchField(Icmpv4Type.class); + entryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entryBuilder.setOxmMatchField(Icmpv4Type.VALUE); entryBuilder.setHasMask(false); Icmpv4TypeCaseBuilder icmpv4TypeCaseBuilder = new Icmpv4TypeCaseBuilder(); Icmpv4TypeBuilder icmpv4TypeBuilder = new Icmpv4TypeBuilder(); @@ -419,8 +419,8 @@ public class OF13MatchSerializer02Test { entryBuilder.setMatchEntryValue(icmpv4TypeCaseBuilder.build()); entries.add(entryBuilder.build()); entryBuilder = new MatchEntryBuilder(); - entryBuilder.setOxmClass(OpenflowBasicClass.class); - entryBuilder.setOxmMatchField(Icmpv4Code.class); + entryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entryBuilder.setOxmMatchField(Icmpv4Code.VALUE); entryBuilder.setHasMask(false); Icmpv4CodeCaseBuilder icmpv4CodeCaseBuilder = new Icmpv4CodeCaseBuilder(); Icmpv4CodeBuilder icmpv4CodeBuilder = new Icmpv4CodeBuilder(); @@ -429,8 +429,8 @@ public class OF13MatchSerializer02Test { entryBuilder.setMatchEntryValue(icmpv4CodeCaseBuilder.build()); entries.add(entryBuilder.build()); entryBuilder = new MatchEntryBuilder(); - entryBuilder.setOxmClass(OpenflowBasicClass.class); - entryBuilder.setOxmMatchField(ArpOp.class); + entryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entryBuilder.setOxmMatchField(ArpOp.VALUE); entryBuilder.setHasMask(false); ArpOpCaseBuilder arpOpCaseBuilder = new ArpOpCaseBuilder(); ArpOpBuilder arpOpBuilder = new ArpOpBuilder(); @@ -439,8 +439,8 @@ public class OF13MatchSerializer02Test { entryBuilder.setMatchEntryValue(arpOpCaseBuilder.build()); entries.add(entryBuilder.build()); entryBuilder = new MatchEntryBuilder(); - entryBuilder.setOxmClass(OpenflowBasicClass.class); - entryBuilder.setOxmMatchField(ArpSpa.class); + entryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entryBuilder.setOxmMatchField(ArpSpa.VALUE); entryBuilder.setHasMask(true); ArpSpaCaseBuilder arpSpaCaseBuilder = new ArpSpaCaseBuilder(); ArpSpaBuilder arpSpaBuilder = new ArpSpaBuilder(); @@ -450,8 +450,8 @@ public class OF13MatchSerializer02Test { entryBuilder.setMatchEntryValue(arpSpaCaseBuilder.build()); entries.add(entryBuilder.build()); entryBuilder = new MatchEntryBuilder(); - entryBuilder.setOxmClass(OpenflowBasicClass.class); - entryBuilder.setOxmMatchField(ArpTpa.class); + entryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entryBuilder.setOxmMatchField(ArpTpa.VALUE); entryBuilder.setHasMask(true); ArpTpaCaseBuilder arpTpaCaseBuilder = new ArpTpaCaseBuilder(); ArpTpaBuilder arpTpaBuilder = new ArpTpaBuilder(); @@ -461,8 +461,8 @@ public class OF13MatchSerializer02Test { entryBuilder.setMatchEntryValue(arpTpaCaseBuilder.build()); entries.add(entryBuilder.build()); entryBuilder = new MatchEntryBuilder(); - entryBuilder.setOxmClass(OpenflowBasicClass.class); - entryBuilder.setOxmMatchField(ArpSha.class); + entryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entryBuilder.setOxmMatchField(ArpSha.VALUE); entryBuilder.setHasMask(true); ArpShaCaseBuilder arpShaCaseBuilder = new ArpShaCaseBuilder(); ArpShaBuilder arpShaBuilder = new ArpShaBuilder(); @@ -472,8 +472,8 @@ public class OF13MatchSerializer02Test { entryBuilder.setMatchEntryValue(arpShaCaseBuilder.build()); entries.add(entryBuilder.build()); entryBuilder = new MatchEntryBuilder(); - entryBuilder.setOxmClass(OpenflowBasicClass.class); - entryBuilder.setOxmMatchField(ArpTha.class); + entryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entryBuilder.setOxmMatchField(ArpTha.VALUE); entryBuilder.setHasMask(true); ArpThaCaseBuilder arpThaCaseBuilder = new ArpThaCaseBuilder(); ArpThaBuilder arpThaBuilder = new ArpThaBuilder(); @@ -483,8 +483,8 @@ public class OF13MatchSerializer02Test { entryBuilder.setMatchEntryValue(arpThaCaseBuilder.build()); entries.add(entryBuilder.build()); entryBuilder = new MatchEntryBuilder(); - entryBuilder.setOxmClass(OpenflowBasicClass.class); - entryBuilder.setOxmMatchField(Ipv6Src.class); + entryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entryBuilder.setOxmMatchField(Ipv6Src.VALUE); entryBuilder.setHasMask(true); Ipv6SrcCaseBuilder ipv6SrcCaseBuilder = new Ipv6SrcCaseBuilder(); Ipv6SrcBuilder ipv6SrcBuilder = new Ipv6SrcBuilder(); @@ -494,8 +494,8 @@ public class OF13MatchSerializer02Test { entryBuilder.setMatchEntryValue(ipv6SrcCaseBuilder.build()); entries.add(entryBuilder.build()); entryBuilder = new MatchEntryBuilder(); - entryBuilder.setOxmClass(OpenflowBasicClass.class); - entryBuilder.setOxmMatchField(Ipv6Dst.class); + entryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entryBuilder.setOxmMatchField(Ipv6Dst.VALUE); entryBuilder.setHasMask(true); Ipv6DstCaseBuilder ipv6DstCaseBuilder = new Ipv6DstCaseBuilder(); Ipv6DstBuilder ipv6DstBuilder = new Ipv6DstBuilder(); @@ -505,8 +505,8 @@ public class OF13MatchSerializer02Test { entryBuilder.setMatchEntryValue(ipv6DstCaseBuilder.build()); entries.add(entryBuilder.build()); entryBuilder = new MatchEntryBuilder(); - entryBuilder.setOxmClass(OpenflowBasicClass.class); - entryBuilder.setOxmMatchField(Ipv6Flabel.class); + entryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entryBuilder.setOxmMatchField(Ipv6Flabel.VALUE); entryBuilder.setHasMask(false); Ipv6FlabelCaseBuilder ipv6FlabelCaseBuilder = new Ipv6FlabelCaseBuilder(); Ipv6FlabelBuilder ipv6FlabelBuilder = new Ipv6FlabelBuilder(); @@ -515,8 +515,8 @@ public class OF13MatchSerializer02Test { entryBuilder.setMatchEntryValue(ipv6FlabelCaseBuilder.build()); entries.add(entryBuilder.build()); entryBuilder = new MatchEntryBuilder(); - entryBuilder.setOxmClass(OpenflowBasicClass.class); - entryBuilder.setOxmMatchField(Icmpv6Type.class); + entryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entryBuilder.setOxmMatchField(Icmpv6Type.VALUE); entryBuilder.setHasMask(false); Icmpv6TypeCaseBuilder icmpv6TypeCaseBuilder = new Icmpv6TypeCaseBuilder(); Icmpv6TypeBuilder icmpv6TypeBuilder = new Icmpv6TypeBuilder(); @@ -525,8 +525,8 @@ public class OF13MatchSerializer02Test { entryBuilder.setMatchEntryValue(icmpv6TypeCaseBuilder.build()); entries.add(entryBuilder.build()); entryBuilder = new MatchEntryBuilder(); - entryBuilder.setOxmClass(OpenflowBasicClass.class); - entryBuilder.setOxmMatchField(Icmpv6Code.class); + entryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entryBuilder.setOxmMatchField(Icmpv6Code.VALUE); entryBuilder.setHasMask(false); Icmpv6CodeCaseBuilder icmpv6CodeCaseBuilder = new Icmpv6CodeCaseBuilder(); Icmpv6CodeBuilder icmpv6CodeBuilder = new Icmpv6CodeBuilder(); @@ -534,8 +534,8 @@ public class OF13MatchSerializer02Test { icmpv6CodeCaseBuilder.setIcmpv6Code(icmpv6CodeBuilder.build()); entryBuilder.setMatchEntryValue(icmpv6CodeCaseBuilder.build()); entries.add(entryBuilder.build()); - entryBuilder.setOxmClass(OpenflowBasicClass.class); - entryBuilder.setOxmMatchField(Ipv6NdTarget.class); + entryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entryBuilder.setOxmMatchField(Ipv6NdTarget.VALUE); entryBuilder.setHasMask(false); Ipv6NdTargetCaseBuilder ipv6NdTargetCaseBuilder = new Ipv6NdTargetCaseBuilder(); Ipv6NdTargetBuilder ipv6NdTargetBuilder = new Ipv6NdTargetBuilder(); @@ -544,8 +544,8 @@ public class OF13MatchSerializer02Test { entryBuilder.setMatchEntryValue(ipv6NdTargetCaseBuilder.build()); entries.add(entryBuilder.build()); entryBuilder = new MatchEntryBuilder(); - entryBuilder.setOxmClass(OpenflowBasicClass.class); - entryBuilder.setOxmMatchField(Ipv6NdSll.class); + entryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entryBuilder.setOxmMatchField(Ipv6NdSll.VALUE); entryBuilder.setHasMask(false); Ipv6NdSllCaseBuilder ipv6NdSllCaseBuilder = new Ipv6NdSllCaseBuilder(); Ipv6NdSllBuilder ipv6NdSllBuilder = new Ipv6NdSllBuilder(); @@ -554,8 +554,8 @@ public class OF13MatchSerializer02Test { entryBuilder.setMatchEntryValue(ipv6NdSllCaseBuilder.build()); entries.add(entryBuilder.build()); entryBuilder = new MatchEntryBuilder(); - entryBuilder.setOxmClass(OpenflowBasicClass.class); - entryBuilder.setOxmMatchField(Ipv6NdTll.class); + entryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entryBuilder.setOxmMatchField(Ipv6NdTll.VALUE); entryBuilder.setHasMask(false); Ipv6NdTllCaseBuilder ipv6NdTllCaseBuilder = new Ipv6NdTllCaseBuilder(); Ipv6NdTllBuilder ipv6NdTllBuilder = new Ipv6NdTllBuilder(); @@ -564,8 +564,8 @@ public class OF13MatchSerializer02Test { entryBuilder.setMatchEntryValue(ipv6NdTllCaseBuilder.build()); entries.add(entryBuilder.build()); entryBuilder = new MatchEntryBuilder(); - entryBuilder.setOxmClass(OpenflowBasicClass.class); - entryBuilder.setOxmMatchField(MplsLabel.class); + entryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entryBuilder.setOxmMatchField(MplsLabel.VALUE); entryBuilder.setHasMask(false); MplsLabelCaseBuilder mplsLabelCaseBuilder = new MplsLabelCaseBuilder(); MplsLabelBuilder mplsLabelBuilder = new MplsLabelBuilder(); @@ -574,8 +574,8 @@ public class OF13MatchSerializer02Test { entryBuilder.setMatchEntryValue(mplsLabelCaseBuilder.build()); entries.add(entryBuilder.build()); entryBuilder = new MatchEntryBuilder(); - entryBuilder.setOxmClass(OpenflowBasicClass.class); - entryBuilder.setOxmMatchField(MplsTc.class); + entryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entryBuilder.setOxmMatchField(MplsTc.VALUE); entryBuilder.setHasMask(false); MplsTcCaseBuilder mplsTcCaseBuilder = new MplsTcCaseBuilder(); MplsTcBuilder mplsTcBuilder = new MplsTcBuilder(); @@ -584,8 +584,8 @@ public class OF13MatchSerializer02Test { entryBuilder.setMatchEntryValue(mplsTcCaseBuilder.build()); entries.add(entryBuilder.build()); entryBuilder = new MatchEntryBuilder(); - entryBuilder.setOxmClass(OpenflowBasicClass.class); - entryBuilder.setOxmMatchField(MplsBos.class); + entryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entryBuilder.setOxmMatchField(MplsBos.VALUE); entryBuilder.setHasMask(false); MplsBosCaseBuilder mplsBosCaseBuilder = new MplsBosCaseBuilder(); MplsBosBuilder mplsBosBuilder = new MplsBosBuilder(); @@ -594,8 +594,8 @@ public class OF13MatchSerializer02Test { entryBuilder.setMatchEntryValue(mplsBosCaseBuilder.build()); entries.add(entryBuilder.build()); entryBuilder = new MatchEntryBuilder(); - entryBuilder.setOxmClass(OpenflowBasicClass.class); - entryBuilder.setOxmMatchField(PbbIsid.class); + entryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entryBuilder.setOxmMatchField(PbbIsid.VALUE); entryBuilder.setHasMask(true); PbbIsidCaseBuilder pbbIsidCaseBuilder = new PbbIsidCaseBuilder(); PbbIsidBuilder pbbIsidBuilder = new PbbIsidBuilder(); @@ -605,8 +605,8 @@ public class OF13MatchSerializer02Test { entryBuilder.setMatchEntryValue(pbbIsidCaseBuilder.build()); entries.add(entryBuilder.build()); entryBuilder = new MatchEntryBuilder(); - entryBuilder.setOxmClass(OpenflowBasicClass.class); - entryBuilder.setOxmMatchField(TunnelId.class); + entryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entryBuilder.setOxmMatchField(TunnelId.VALUE); entryBuilder.setHasMask(true); TunnelIdCaseBuilder tunnelIdCaseBuilder = new TunnelIdCaseBuilder(); TunnelIdBuilder tunnelIdBuilder = new TunnelIdBuilder(); @@ -616,8 +616,8 @@ public class OF13MatchSerializer02Test { entryBuilder.setMatchEntryValue(tunnelIdCaseBuilder.build()); entries.add(entryBuilder.build()); entryBuilder = new MatchEntryBuilder(); - entryBuilder.setOxmClass(OpenflowBasicClass.class); - entryBuilder.setOxmMatchField(Ipv6Exthdr.class); + entryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entryBuilder.setOxmMatchField(Ipv6Exthdr.VALUE); entryBuilder.setHasMask(true); Ipv6ExthdrCaseBuilder ipv6ExthdrCaseBuilder = new Ipv6ExthdrCaseBuilder(); Ipv6ExthdrBuilder ipv6ExthdrBuilder = new Ipv6ExthdrBuilder(); @@ -628,8 +628,8 @@ public class OF13MatchSerializer02Test { entryBuilder.setMatchEntryValue(ipv6ExthdrCaseBuilder.build()); entries.add(entryBuilder.build()); entryBuilder = new MatchEntryBuilder(); - entryBuilder.setOxmClass(OpenflowBasicClass.class); - entryBuilder.setOxmMatchField(PacketType.class); + entryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entryBuilder.setOxmMatchField(PacketType.VALUE); entryBuilder.setHasMask(false); PacketTypeCaseBuilder packetTypeCaseBuilder = new PacketTypeCaseBuilder(); PacketTypeBuilder packetTypeBuilder = new PacketTypeBuilder(); 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 96e7e48f92..c0e2310126 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 @@ -83,11 +83,11 @@ public class OF13MatchSerializerTest { @Test public void testIpv4Src() { MatchBuilder builder = new MatchBuilder(); - builder.setType(OxmMatchType.class); + builder.setType(OxmMatchType.VALUE); final List entries = new ArrayList<>(); MatchEntryBuilder entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Ipv4Src.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Ipv4Src.VALUE); entriesBuilder.setHasMask(false); Ipv4SrcCaseBuilder ipv4SrcCaseBuilder = new Ipv4SrcCaseBuilder(); Ipv4SrcBuilder ipv4SrcBuilder = new Ipv4SrcBuilder(); @@ -118,12 +118,12 @@ public class OF13MatchSerializerTest { @Test public void testIpv6Various() { MatchBuilder builder = new MatchBuilder(); - builder.setType(OxmMatchType.class); + builder.setType(OxmMatchType.VALUE); final List entries = new ArrayList<>(); // ipv6 match entry with correct Ipv6 address MatchEntryBuilder entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Ipv6Src.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Ipv6Src.VALUE); entriesBuilder.setHasMask(false); Ipv6SrcCaseBuilder ipv6SrcCaseBuilder = new Ipv6SrcCaseBuilder(); Ipv6SrcBuilder ipv6SrcBuilder = new Ipv6SrcBuilder(); @@ -133,8 +133,8 @@ public class OF13MatchSerializerTest { entries.add(entriesBuilder.build()); // ipv6 match entry with abbreviated Ipv6 address entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Ipv6NdTarget.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Ipv6NdTarget.VALUE); entriesBuilder.setHasMask(false); Ipv6NdTargetCaseBuilder ipv6NdTargetCaseBuilder = new Ipv6NdTargetCaseBuilder(); Ipv6NdTargetBuilder ipv6NdTargetBuilder = new Ipv6NdTargetBuilder(); @@ -144,8 +144,8 @@ public class OF13MatchSerializerTest { entries.add(entriesBuilder.build()); // ipv6 match entry with abbreviated Ipv6 address entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Ipv6Dst.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Ipv6Dst.VALUE); entriesBuilder.setHasMask(false); Ipv6DstCaseBuilder ipv6DstCaseBuilder = new Ipv6DstCaseBuilder(); Ipv6DstBuilder ipv6DstBuilder = new Ipv6DstBuilder(); @@ -155,8 +155,8 @@ public class OF13MatchSerializerTest { entries.add(entriesBuilder.build()); // ipv6 match entry with abbreviated Ipv6 address entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Ipv6Dst.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Ipv6Dst.VALUE); entriesBuilder.setHasMask(false); ipv6DstCaseBuilder = new Ipv6DstCaseBuilder(); ipv6DstBuilder = new Ipv6DstBuilder(); @@ -166,8 +166,8 @@ public class OF13MatchSerializerTest { entries.add(entriesBuilder.build()); // ipv6 match entry with abbreviated Ipv6 address entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Ipv6Dst.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Ipv6Dst.VALUE); entriesBuilder.setHasMask(false); ipv6DstCaseBuilder = new Ipv6DstCaseBuilder(); ipv6DstBuilder = new Ipv6DstBuilder(); @@ -245,12 +245,12 @@ public class OF13MatchSerializerTest { @Test(expected = IllegalArgumentException.class) public void testIpv6Incorrect() { MatchBuilder builder = new MatchBuilder(); - builder.setType(OxmMatchType.class); + builder.setType(OxmMatchType.VALUE); final List entries = new ArrayList<>(); // ipv6 match entry with incorrect Ipv6 address MatchEntryBuilder entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Ipv6Src.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Ipv6Src.VALUE); entriesBuilder.setHasMask(false); Ipv6SrcCaseBuilder ipv6SrcCaseBuilder = new Ipv6SrcCaseBuilder(); Ipv6SrcBuilder ipv6SrcBuilder = new Ipv6SrcBuilder(); @@ -327,11 +327,11 @@ public class OF13MatchSerializerTest { private static Match buildIpv6FLabelMatch(final long labelValue, final boolean hasMask, final byte[] mask) { MatchBuilder builder = new MatchBuilder(); - builder.setType(OxmMatchType.class); + builder.setType(OxmMatchType.VALUE); final List entries = new ArrayList<>(); MatchEntryBuilder entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Ipv6Flabel.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Ipv6Flabel.VALUE); entriesBuilder.setHasMask(hasMask); Ipv6FlabelCaseBuilder ipv6FlabelCaseBuilder = new Ipv6FlabelCaseBuilder(); Ipv6FlabelBuilder ipv6FlabelBuilder = new Ipv6FlabelBuilder(); @@ -351,7 +351,7 @@ public class OF13MatchSerializerTest { @Test public void testStandardMatchType() { MatchBuilder builder = new MatchBuilder(); - builder.setType(StandardMatchType.class); + builder.setType(StandardMatchType.VALUE); Match match = builder.build(); ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer(); @@ -371,8 +371,8 @@ public class OF13MatchSerializerTest { public void testSerializeExperimenterMatchEntry() { final List entries = new ArrayList<>(); MatchEntryBuilder builder = new MatchEntryBuilder(); - builder.setOxmClass(ExperimenterClass.class); - builder.setOxmMatchField(OxmMatchFieldClass.class); + builder.setOxmClass(ExperimenterClass.VALUE); + builder.setOxmMatchField(OxmMatchFieldClass.VALUE); builder.setHasMask(true); ExperimenterIdCaseBuilder caseBuilder = new ExperimenterIdCaseBuilder(); ExperimenterBuilder expBuilder = new ExperimenterBuilder(); 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 249c23cbe1..afa8aad037 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 @@ -131,15 +131,15 @@ public class TypeKeyMakerFactoryTest { Assert.assertNotNull("Null keyMaker", keyMaker); MatchEntryBuilder builder = new MatchEntryBuilder(); - builder.setOxmClass(OpenflowBasicClass.class); - builder.setOxmMatchField(InPort.class); + builder.setOxmClass(OpenflowBasicClass.VALUE); + builder.setOxmMatchField(InPort.VALUE); builder.setHasMask(true); MatchEntry entry = builder.build(); MessageTypeKey key = keyMaker.make(entry); Assert.assertNotNull("Null key", key); MatchEntrySerializerKey comparationKey = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, - OpenflowBasicClass.class, InPort.class); + OpenflowBasicClass.VALUE, InPort.VALUE); Assert.assertEquals("Wrong key", comparationKey, key); } @@ -153,8 +153,8 @@ public class TypeKeyMakerFactoryTest { Assert.assertNotNull("Null keyMaker", keyMaker); MatchEntryBuilder builder = new MatchEntryBuilder(); - builder.setOxmClass(ExperimenterClass.class); - builder.setOxmMatchField(OxmMatchFieldClass.class); + builder.setOxmClass(ExperimenterClass.VALUE); + builder.setOxmMatchField(OxmMatchFieldClass.VALUE); builder.setHasMask(true); ExperimenterIdCaseBuilder caseBuilder = new ExperimenterIdCaseBuilder(); ExperimenterBuilder expBuilder = new ExperimenterBuilder(); @@ -166,7 +166,7 @@ public class TypeKeyMakerFactoryTest { Assert.assertNotNull("Null key", key); MatchEntrySerializerKey comparationKey = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, - ExperimenterClass.class, OxmMatchFieldClass.class); + ExperimenterClass.VALUE, OxmMatchFieldClass.VALUE); comparationKey.setExperimenterId(Uint32.valueOf(42L)); Assert.assertEquals("Wrong key", comparationKey, key); } 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 b9042b33e5..6901c38bb5 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 @@ -77,7 +77,7 @@ public abstract class ExperimenterSerializerKeyFactory { public static ExperimenterIdSerializerKey createMeterBandSerializerKey( final Uint8 msgVersion, final Uint32 experimenterId, - final Class meterSubType) { + final ExperimenterMeterBandSubType meterSubType) { return new ExperimenterIdMeterSubTypeSerializerKey<>(msgVersion, experimenterId, MeterBandExperimenterCase.class, meterSubType); } 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 cae8dd705c..f64c970816 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 @@ -84,17 +84,17 @@ public class ExperimenterSerializerKeyFactoryTest { final ExperimenterIdSerializerKey comparationKey5; createdKey = ExperimenterSerializerKeyFactory.createMeterBandSerializerKey(EncodeConstants.OF_VERSION_1_0, - Uint32.valueOf(43), ExperimenterMeterBandSubType.class); + Uint32.valueOf(43), ExperimenterMeterBandSubType.VALUE); comparationKey1 = new ExperimenterIdMeterSubTypeSerializerKey<>(EncodeConstants.OF_VERSION_1_3, - Uint32.valueOf(43), MeterBandExperimenterCase.class, ExperimenterMeterBandSubType.class); + Uint32.valueOf(43), MeterBandExperimenterCase.class, ExperimenterMeterBandSubType.VALUE); comparationKey2 = new ExperimenterIdMeterSubTypeSerializerKey<>(EncodeConstants.OF_VERSION_1_0, - Uint32.valueOf(42), MeterBandExperimenterCase.class, ExperimenterMeterBandSubType.class); + Uint32.valueOf(42), MeterBandExperimenterCase.class, ExperimenterMeterBandSubType.VALUE); comparationKey3 = new ExperimenterIdMeterSubTypeSerializerKey<>(EncodeConstants.OF_VERSION_1_0, - Uint32.valueOf(43), null, ExperimenterMeterBandSubType.class); + Uint32.valueOf(43), null, ExperimenterMeterBandSubType.VALUE); 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); + Uint32.valueOf(43), MeterBandExperimenterCase.class, ExperimenterMeterBandSubType.VALUE); 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-impl/pom.xml b/openflowplugin-impl/pom.xml index 17e0aed4c5..e54ace6de5 100644 --- a/openflowplugin-impl/pom.xml +++ b/openflowplugin-impl/pom.xml @@ -91,8 +91,8 @@ commons-lang3 - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api true 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 39403cf047..a50de47ed0 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 @@ -346,33 +346,33 @@ public final class MultipartReplyTranslatorUtil { .getMultipartReplyGroupFeatures(); final var replyTypes = replyBody.getTypes(); - final var supportedGroups = ImmutableSet.>builder(); + final var supportedGroups = ImmutableSet.builder(); if (replyTypes.getOFPGTALL()) { - supportedGroups.add(GroupAll.class); + supportedGroups.add(GroupAll.VALUE); } if (replyTypes.getOFPGTSELECT()) { - supportedGroups.add(GroupSelect.class); + supportedGroups.add(GroupSelect.VALUE); } if (replyTypes.getOFPGTINDIRECT()) { - supportedGroups.add(GroupIndirect.class); + supportedGroups.add(GroupIndirect.VALUE); } if (replyTypes.getOFPGTFF()) { - supportedGroups.add(GroupFf.class); + supportedGroups.add(GroupFf.VALUE); } final var replyCapabilities = replyBody.getCapabilities(); - final var supportedCapabilities = ImmutableSet.>builder(); + final var supportedCapabilities = ImmutableSet.builder(); if (replyCapabilities.getOFPGFCCHAINING()) { - supportedCapabilities.add(Chaining.class); + supportedCapabilities.add(Chaining.VALUE); } if (replyCapabilities.getOFPGFCCHAININGCHECKS()) { - supportedCapabilities.add(ChainingChecks.class); + supportedCapabilities.add(ChainingChecks.VALUE); } if (replyCapabilities.getOFPGFCSELECTLIVENESS()) { - supportedCapabilities.add(SelectLiveness.class); + supportedCapabilities.add(SelectLiveness.VALUE); } if (replyCapabilities.getOFPGFCSELECTWEIGHT()) { - supportedCapabilities.add(SelectWeight.class); + supportedCapabilities.add(SelectWeight.VALUE); } return new MultipartReplyGroupFeaturesBuilder() @@ -423,27 +423,27 @@ public final class MultipartReplyTranslatorUtil { MultipartReplyMeterFeatures replyBody = caseBody.getMultipartReplyMeterFeatures(); final var replyCapabilities = replyBody.getCapabilities(); - final var supportedCapabilities = ImmutableSet.>builder(); + final var supportedCapabilities = ImmutableSet.builder(); if (replyCapabilities.getOFPMFBURST()) { - supportedCapabilities.add(MeterBurst.class); + supportedCapabilities.add(MeterBurst.VALUE); } if (replyCapabilities.getOFPMFKBPS()) { - supportedCapabilities.add(MeterKbps.class); + supportedCapabilities.add(MeterKbps.VALUE); } if (replyCapabilities.getOFPMFPKTPS()) { - supportedCapabilities.add(MeterPktps.class); + supportedCapabilities.add(MeterPktps.VALUE); } if (replyCapabilities.getOFPMFSTATS()) { - supportedCapabilities.add(MeterStats.class); + supportedCapabilities.add(MeterStats.VALUE); } final var replyMeterBand = replyBody.getBandTypes(); - final var supportedMeterBand = ImmutableSet.>builder(); + final var supportedMeterBand = ImmutableSet.builder(); if (replyMeterBand.getOFPMBTDROP()) { - supportedMeterBand.add(MeterBandDrop.class); + supportedMeterBand.add(MeterBandDrop.VALUE); } if (replyMeterBand.getOFPMBTDSCPREMARK()) { - supportedMeterBand.add(MeterBandDscpRemark.class); + supportedMeterBand.add(MeterBandDscpRemark.VALUE); } return new MultipartReplyMeterFeaturesBuilder() 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 5419888e5b..759243c3cc 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 @@ -148,7 +148,7 @@ public final class MultipartRequestInputFactory { 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()); + multipartRequestFlowBuilder.setMatch(new MatchBuilder().setType(OxmMatchType.VALUE).build()); } else { throw new IllegalArgumentException("Unknown version " + 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 2c1798d983..9211867f39 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 @@ -17,11 +17,12 @@ import java.util.concurrent.Executor; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import org.eclipse.jdt.annotation.NonNull; +import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.mdsal.binding.api.NotificationPublishService; import org.opendaylight.openflowplugin.api.openflow.connection.ConnectionContext; import org.opendaylight.openflowplugin.api.openflow.device.Xid; +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.IpAddress; -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.node.ssl.connection.error.service.rev190723.SslErrorBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.node.ssl.connection.error.service.rev190723.SslErrorType; import org.opendaylight.yang.gen.v1.urn.opendaylight.node.ssl.connection.error.service.rev190723.ssl.error.SwitchCertificateBuilder; @@ -142,24 +143,28 @@ public class SystemNotificationsListenerImpl implements SystemNotificationsListe @Override public void onSslConnectionError(final SslConnectionError notification) { - final IpAddress ip; - if (connectionContext.getConnectionAdapter() != null - && connectionContext.getConnectionAdapter().getRemoteAddress() != null - && connectionContext.getConnectionAdapter().getRemoteAddress().getAddress() != null) { - ip = IpAddressBuilder.getDefaultInstance( - connectionContext.getConnectionAdapter().getRemoteAddress().getAddress().getHostAddress()); - } else { - ip = null; - } - final var switchCert = notification.getSwitchCertificate(); notificationPublishService.offerNotification(new SslErrorBuilder() .setType(SslErrorType.SslConFailed) .setCode(Uint16.valueOf(SslErrorType.SslConFailed.getIntValue())) - .setNodeIpAddress(ip) + .setNodeIpAddress(remoteAddress()) .setData(notification.getInfo()) .setSwitchCertificate(switchCert == null ? null : new SwitchCertificateBuilder(switchCert).build()) .build()); } + + private @Nullable IpAddress remoteAddress() { + final var connectionAdapter = connectionContext.getConnectionAdapter(); + if (connectionAdapter != null) { + final var remoteAddress = connectionAdapter.getRemoteAddress(); + if (remoteAddress != null) { + final var inetAddress = remoteAddress.getAddress(); + if (inetAddress != null) { + return IetfInetUtil.ipAddressFor(inetAddress.getHostAddress()); + } + } + } + return null; + } } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/BuildSwitchCapabilitiesOF10.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/BuildSwitchCapabilitiesOF10.java index 046c0046ff..2a62c8ab57 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/BuildSwitchCapabilitiesOF10.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/BuildSwitchCapabilitiesOF10.java @@ -48,30 +48,30 @@ public final class BuildSwitchCapabilitiesOF10 implements BuildSwitchFeatures { return null; } - final var builder = ImmutableSet.>builder(); + final var builder = ImmutableSet.builder(); if (capabilities.getOFPCARPMATCHIP()) { - builder.add(FlowFeatureCapabilityArpMatchIp.class); + builder.add(FlowFeatureCapabilityArpMatchIp.VALUE); } if (capabilities.getOFPCFLOWSTATS()) { - builder.add(FlowFeatureCapabilityFlowStats.class); + builder.add(FlowFeatureCapabilityFlowStats.VALUE); } if (capabilities.getOFPCIPREASM()) { - builder.add(FlowFeatureCapabilityIpReasm.class); + builder.add(FlowFeatureCapabilityIpReasm.VALUE); } if (capabilities.getOFPCPORTSTATS()) { - builder.add(FlowFeatureCapabilityPortStats.class); + builder.add(FlowFeatureCapabilityPortStats.VALUE); } if (capabilities.getOFPCQUEUESTATS()) { - builder.add(FlowFeatureCapabilityQueueStats.class); + builder.add(FlowFeatureCapabilityQueueStats.VALUE); } if (capabilities.getOFPCRESERVED()) { - builder.add(FlowFeatureCapabilityReserved.class); + builder.add(FlowFeatureCapabilityReserved.VALUE); } if (capabilities.getOFPCSTP()) { - builder.add(FlowFeatureCapabilityStp.class); + builder.add(FlowFeatureCapabilityStp.VALUE); } if (capabilities.getOFPCTABLESTATS()) { - builder.add(FlowFeatureCapabilityTableStats.class); + builder.add(FlowFeatureCapabilityTableStats.VALUE); } return new SwitchFeaturesBuilder() diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/BuildSwitchCapabilitiesOF13.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/BuildSwitchCapabilitiesOF13.java index b502cd2d9d..61639a8f0f 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/BuildSwitchCapabilitiesOF13.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/BuildSwitchCapabilitiesOF13.java @@ -47,27 +47,27 @@ public final class BuildSwitchCapabilitiesOF13 implements BuildSwitchFeatures { return null; } - final var builder = ImmutableSet.>builder(); + final var builder = ImmutableSet.builder(); if (capabilities.getOFPCFLOWSTATS()) { - builder.add(FlowFeatureCapabilityFlowStats.class); + builder.add(FlowFeatureCapabilityFlowStats.VALUE); } if (capabilities.getOFPCGROUPSTATS()) { - builder.add(FlowFeatureCapabilityGroupStats.class); + builder.add(FlowFeatureCapabilityGroupStats.VALUE); } if (capabilities.getOFPCIPREASM()) { - builder.add(FlowFeatureCapabilityIpReasm.class); + builder.add(FlowFeatureCapabilityIpReasm.VALUE); } if (capabilities.getOFPCPORTBLOCKED()) { - builder.add(FlowFeatureCapabilityPortBlocked.class); + builder.add(FlowFeatureCapabilityPortBlocked.VALUE); } if (capabilities.getOFPCPORTSTATS()) { - builder.add(FlowFeatureCapabilityPortStats.class); + builder.add(FlowFeatureCapabilityPortStats.VALUE); } if (capabilities.getOFPCQUEUESTATS()) { - builder.add(FlowFeatureCapabilityQueueStats.class); + builder.add(FlowFeatureCapabilityQueueStats.VALUE); } if (capabilities.getOFPCTABLESTATS()) { - builder.add(FlowFeatureCapabilityTableStats.class); + builder.add(FlowFeatureCapabilityTableStats.VALUE); } return new SwitchFeaturesBuilder() diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceContextImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceContextImpl.java index e6ebec0fca..51b08154c2 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceContextImpl.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceContextImpl.java @@ -180,28 +180,28 @@ public class DeviceContextImpl implements DeviceContext, ExtensionConverterProvi final NotificationManager queuedNotificationManager, final boolean isStatisticsPollingOn) { this.primaryConnectionContext = primaryConnectionContext; - this.deviceInfo = primaryConnectionContext.getDeviceInfo(); + deviceInfo = primaryConnectionContext.getDeviceInfo(); this.hashedWheelTimer = hashedWheelTimer; this.deviceInitializerProvider = deviceInitializerProvider; this.isFlowRemovedNotificationOn = isFlowRemovedNotificationOn; this.switchFeaturesMandatory = switchFeaturesMandatory; - this.deviceState = new DeviceStateImpl(); + deviceState = new DeviceStateImpl(); this.dataBroker = dataBroker; this.messageSpy = messageSpy; this.isStatisticsPollingOn = isStatisticsPollingOn; this.contextChainHolder = contextChainHolder; - this.packetInLimiter = new PacketInRateLimiter(primaryConnectionContext.getConnectionAdapter(), + packetInLimiter = new PacketInRateLimiter(primaryConnectionContext.getConnectionAdapter(), /*initial*/ LOW_WATERMARK, /*initial*/HIGH_WATERMARK, this.messageSpy, REJECTED_DRAIN_FACTOR); this.translatorLibrary = translatorLibrary; - this.portStatusTranslator = translatorLibrary.lookupTranslator( + portStatusTranslator = translatorLibrary.lookupTranslator( new TranslatorKey(deviceInfo.getVersion(), PortGrouping.class.getName())); - this.packetInTranslator = translatorLibrary.lookupTranslator( + packetInTranslator = translatorLibrary.lookupTranslator( new TranslatorKey(deviceInfo.getVersion(), org.opendaylight.yang.gen.v1.urn.opendaylight.openflow .protocol.rev130731 .PacketIn.class.getName())); - this.flowRemovedTranslator = translatorLibrary.lookupTranslator( + flowRemovedTranslator = translatorLibrary.lookupTranslator( new TranslatorKey(deviceInfo.getVersion(), FlowRemoved.class.getName())); this.convertorExecutor = convertorExecutor; @@ -578,7 +578,7 @@ public class DeviceContextImpl implements DeviceContext, ExtensionConverterProvi @VisibleForTesting TransactionChainManager getTransactionChainManager() { - return this.transactionChainManager; + return transactionChainManager; } @Override @@ -598,12 +598,12 @@ public class DeviceContextImpl implements DeviceContext, ExtensionConverterProvi @Override public DeviceInfo getDeviceInfo() { - return this.deviceInfo; + return deviceInfo; } @Override public void registerMastershipWatcher(@NonNull final ContextChainMastershipWatcher newWatcher) { - this.contextChainMastershipWatcher = newWatcher; + contextChainMastershipWatcher = newWatcher; } @Override @@ -672,7 +672,7 @@ public class DeviceContextImpl implements DeviceContext, ExtensionConverterProvi portStatusMessages.forEach(this::writePortStatusMessage); submitTransaction(); } catch (final Exception ex) { - throw new RuntimeException(String.format("Error processing port status messages from device %s: %s", + throw new IllegalStateException(String.format("Error processing port status messages from device %s: %s", deviceInfo.toString(), ex.toString()), ex); } @@ -688,14 +688,14 @@ public class DeviceContextImpl implements DeviceContext, ExtensionConverterProvi initialize.get(DEVICE_INIT_TIMEOUT, TimeUnit.MILLISECONDS); } catch (TimeoutException ex) { initialize.cancel(true); - throw new RuntimeException(String.format("Failed to initialize device %s in %ss: %s", + throw new IllegalStateException(String.format("Failed to initialize device %s in %ss: %s", deviceInfo.toString(), String.valueOf(DEVICE_INIT_TIMEOUT / 1000), ex.toString()), ex); } catch (ExecutionException | InterruptedException ex) { - throw new RuntimeException( + throw new IllegalStateException( String.format("Device %s cannot be initialized: %s", deviceInfo.toString(), ex.toString()), ex); } } else { - throw new RuntimeException(String.format("Unsupported version %s for device %s", + throw new IllegalStateException(String.format("Unsupported version %s for device %s", deviceInfo.getVersion(), deviceInfo.toString())); } @@ -709,15 +709,15 @@ public class DeviceContextImpl implements DeviceContext, ExtensionConverterProvi @VisibleForTesting void lazyTransactionManagerInitialization() { - if (!this.initialized.get()) { + if (!initialized.get()) { LOG.debug("Transaction chain manager for node {} created", deviceInfo); final NodeId nodeId = deviceInfo.getNodeId(); - this.transactionChainManager = new TransactionChainManager(dataBroker, nodeId.getValue()); - this.history = new FlowGroupInfoHistoryImpl(FLOWGROUP_CACHE_SIZE); - this.deviceFlowRegistry = new DeviceFlowRegistryImpl(deviceInfo.getVersion(), dataBroker, + transactionChainManager = new TransactionChainManager(dataBroker, nodeId.getValue()); + history = new FlowGroupInfoHistoryImpl(FLOWGROUP_CACHE_SIZE); + deviceFlowRegistry = new DeviceFlowRegistryImpl(deviceInfo.getVersion(), dataBroker, deviceInfo.getNodeInstanceIdentifier(), history); - this.deviceGroupRegistry = new DeviceGroupRegistryImpl(history); - this.deviceMeterRegistry = new DeviceMeterRegistryImpl(); + deviceGroupRegistry = new DeviceGroupRegistryImpl(history); + deviceMeterRegistry = new DeviceMeterRegistryImpl(); } transactionChainManager.activateTransactionManager(); diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyGroupFeaturesDeserializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyGroupFeaturesDeserializer.java index 9f51e39f3b..c0d71d79c0 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyGroupFeaturesDeserializer.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyGroupFeaturesDeserializer.java @@ -45,40 +45,40 @@ public class MultipartReplyGroupFeaturesDeserializer implements OFDeserializer> readGroupCapabilities(final ByteBuf message) { + private static Set readGroupCapabilities(final ByteBuf message) { final long capabilitiesMask = message.readUnsignedInt(); - final var builder = ImmutableSet.>builder(); + final var builder = ImmutableSet.builder(); if ((capabilitiesMask & 1 << 0) != 0) { - builder.add(SelectWeight.class); + builder.add(SelectWeight.VALUE); } if ((capabilitiesMask & 1 << 1) != 0) { - builder.add(SelectLiveness.class); + builder.add(SelectLiveness.VALUE); } if ((capabilitiesMask & 1 << 2) != 0) { - builder.add(Chaining.class); + builder.add(Chaining.VALUE); } if ((capabilitiesMask & 1 << 3) != 0) { - builder.add(ChainingChecks.class); + builder.add(ChainingChecks.VALUE); } return builder.build(); } - private static Set> readGroupTypes(final ByteBuf message) { + private static Set readGroupTypes(final ByteBuf message) { final long typesMask = message.readUnsignedInt(); - final var builder = ImmutableSet.>builder(); + final var builder = ImmutableSet.builder(); if ((typesMask & 1 << 0) != 0) { - builder.add(GroupAll.class); + builder.add(GroupAll.VALUE); } if ((typesMask & 1 << 1) != 0) { - builder.add(GroupSelect.class); + builder.add(GroupSelect.VALUE); } if ((typesMask & 1 << 2) != 0) { - builder.add(GroupIndirect.class); + builder.add(GroupIndirect.VALUE); } if ((typesMask & 1 << 3) != 0) { - builder.add(GroupFf.class); + builder.add(GroupFf.VALUE); } return builder.build(); } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyMeterFeaturesDeserializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyMeterFeaturesDeserializer.java index 4c24be8396..89dddab2f6 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyMeterFeaturesDeserializer.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyMeterFeaturesDeserializer.java @@ -39,34 +39,34 @@ public class MultipartReplyMeterFeaturesDeserializer implements OFDeserializer> readMeterBands(final ByteBuf message) { + private static Set readMeterBands(final ByteBuf message) { final long typesMask = message.readUnsignedInt(); - final var bandTypes = ImmutableSet.>builder(); + final var bandTypes = ImmutableSet.builder(); if ((typesMask & 1) != 0) { - bandTypes.add(MeterBandDrop.class); + bandTypes.add(MeterBandDrop.VALUE); } if ((typesMask & 1 << 1) != 0) { - bandTypes.add(MeterBandDscpRemark.class); + bandTypes.add(MeterBandDscpRemark.VALUE); } return bandTypes.build(); } - private static Set> readMeterCapabilities(final ByteBuf message) { + private static Set readMeterCapabilities(final ByteBuf message) { final long capabilitiesMask = message.readUnsignedInt(); - final var meterCapabilities = ImmutableSet.>builder(); + final var meterCapabilities = ImmutableSet.builder(); if ((capabilitiesMask & 1) != 0) { - meterCapabilities.add(MeterKbps.class); + meterCapabilities.add(MeterKbps.VALUE); } if ((capabilitiesMask & 1 << 1) != 0) { - meterCapabilities.add(MeterPktps.class); + meterCapabilities.add(MeterPktps.VALUE); } if ((capabilitiesMask & 1 << 2) != 0) { - meterCapabilities.add(MeterBurst.class); + meterCapabilities.add(MeterBurst.VALUE); } if ((capabilitiesMask & 1 << 3) != 0) { - meterCapabilities.add(MeterStats.class); + meterCapabilities.add(MeterStats.VALUE); } return meterCapabilities.build(); diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/TableFeaturesMatchFieldDeserializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/TableFeaturesMatchFieldDeserializer.java index 64080a2eea..b2a2429026 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/TableFeaturesMatchFieldDeserializer.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/TableFeaturesMatchFieldDeserializer.java @@ -9,7 +9,6 @@ package org.opendaylight.openflowplugin.impl.protocol.deserialization.multipart; import com.google.common.collect.ImmutableMap; import io.netty.buffer.ByteBuf; -import java.util.Map; import java.util.Optional; import org.opendaylight.openflowjava.protocol.api.keys.MatchEntryDeserializerKey; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; @@ -60,172 +59,171 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.set.f import org.opendaylight.yangtools.yang.common.Uint32; public class TableFeaturesMatchFieldDeserializer { - /** * Mapping of match entry code to match set field class. */ - private final Map> codeToFieldMap = ImmutableMap - .>builder() + private final ImmutableMap codeToFieldMap = ImmutableMap + .builder() .put(new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, - OxmMatchConstants.ARP_OP), ArpOp.class) + OxmMatchConstants.ARP_OP), ArpOp.VALUE) .put(new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, - OxmMatchConstants.ARP_SHA), ArpSha.class) + OxmMatchConstants.ARP_SHA), ArpSha.VALUE) .put(new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, - OxmMatchConstants.ARP_SPA), ArpSpa.class) + OxmMatchConstants.ARP_SPA), ArpSpa.VALUE) .put(new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, - OxmMatchConstants.ARP_THA), ArpTha.class) + OxmMatchConstants.ARP_THA), ArpTha.VALUE) .put(new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, - OxmMatchConstants.ARP_TPA), ArpTpa.class) + OxmMatchConstants.ARP_TPA), ArpTpa.VALUE) .put(new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, - OxmMatchConstants.ETH_DST), EthDst.class) + OxmMatchConstants.ETH_DST), EthDst.VALUE) .put(new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, - OxmMatchConstants.ETH_SRC), EthSrc.class) + OxmMatchConstants.ETH_SRC), EthSrc.VALUE) .put(new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, - OxmMatchConstants.ICMPV4_CODE), Icmpv4Code.class) + OxmMatchConstants.ICMPV4_CODE), Icmpv4Code.VALUE) .put(new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, - OxmMatchConstants.ICMPV4_TYPE), Icmpv4Type.class) + OxmMatchConstants.ICMPV4_TYPE), Icmpv4Type.VALUE) .put(new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, - OxmMatchConstants.ICMPV6_CODE), Icmpv6Code.class) + OxmMatchConstants.ICMPV6_CODE), Icmpv6Code.VALUE) .put(new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, - OxmMatchConstants.ICMPV6_TYPE), Icmpv6Type.class) + OxmMatchConstants.ICMPV6_TYPE), Icmpv6Type.VALUE) .put(new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, - OxmMatchConstants.IN_PHY_PORT), InPhyPort.class) + OxmMatchConstants.IN_PHY_PORT), InPhyPort.VALUE) .put(new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, - OxmMatchConstants.IN_PORT), InPort.class) + OxmMatchConstants.IN_PORT), InPort.VALUE) .put(new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, - OxmMatchConstants.IP_DSCP), IpDscp.class) + OxmMatchConstants.IP_DSCP), IpDscp.VALUE) .put(new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, - OxmMatchConstants.IP_ECN), IpEcn.class) + OxmMatchConstants.IP_ECN), IpEcn.VALUE) .put(new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, - OxmMatchConstants.IP_PROTO), IpProto.class) + OxmMatchConstants.IP_PROTO), IpProto.VALUE) .put(new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, - OxmMatchConstants.IPV4_DST), Ipv4Dst.class) + OxmMatchConstants.IPV4_DST), Ipv4Dst.VALUE) .put(new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, - OxmMatchConstants.IPV4_SRC), Ipv4Src.class) + OxmMatchConstants.IPV4_SRC), Ipv4Src.VALUE) .put(new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, - OxmMatchConstants.IPV6_DST), Ipv6Dst.class) + OxmMatchConstants.IPV6_DST), Ipv6Dst.VALUE) .put(new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, - OxmMatchConstants.IPV6_SRC), Ipv6Src.class) + OxmMatchConstants.IPV6_SRC), Ipv6Src.VALUE) .put(new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, - OxmMatchConstants.IPV6_EXTHDR), Ipv6Exthdr.class) + OxmMatchConstants.IPV6_EXTHDR), Ipv6Exthdr.VALUE) .put(new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, - OxmMatchConstants.IPV6_FLABEL), Ipv6Flabel.class) + OxmMatchConstants.IPV6_FLABEL), Ipv6Flabel.VALUE) .put(new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, - OxmMatchConstants.IPV6_ND_SLL), Ipv6NdSll.class) + OxmMatchConstants.IPV6_ND_SLL), Ipv6NdSll.VALUE) .put(new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, - OxmMatchConstants.IPV6_ND_TLL), Ipv6NdTll.class) + OxmMatchConstants.IPV6_ND_TLL), Ipv6NdTll.VALUE) .put(new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, - OxmMatchConstants.IPV6_ND_TARGET), Ipv6NdTarget.class) + OxmMatchConstants.IPV6_ND_TARGET), Ipv6NdTarget.VALUE) .put(new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, - OxmMatchConstants.METADATA), Metadata.class) + OxmMatchConstants.METADATA), Metadata.VALUE) .put(new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, - OxmMatchConstants.MPLS_BOS), MplsBos.class) + OxmMatchConstants.MPLS_BOS), MplsBos.VALUE) .put(new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, - OxmMatchConstants.MPLS_LABEL), MplsLabel.class) + OxmMatchConstants.MPLS_LABEL), MplsLabel.VALUE) .put(new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, - OxmMatchConstants.MPLS_TC), MplsTc.class) + OxmMatchConstants.MPLS_TC), MplsTc.VALUE) .put(new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, - OxmMatchConstants.PBB_ISID), PbbIsid.class) + OxmMatchConstants.PBB_ISID), PbbIsid.VALUE) .put(new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, - OxmMatchConstants.SCTP_DST), SctpDst.class) + OxmMatchConstants.SCTP_DST), SctpDst.VALUE) .put(new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, - OxmMatchConstants.SCTP_SRC), SctpSrc.class) + OxmMatchConstants.SCTP_SRC), SctpSrc.VALUE) .put(new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, - OxmMatchConstants.TCP_SRC), TcpSrc.class) + OxmMatchConstants.TCP_SRC), TcpSrc.VALUE) .put(new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, - OxmMatchConstants.TCP_DST), TcpDst.class) + OxmMatchConstants.TCP_DST), TcpDst.VALUE) .put(new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, - OxmMatchConstants.TUNNEL_ID), TunnelId.class) + OxmMatchConstants.TUNNEL_ID), TunnelId.VALUE) .put(new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, - OxmMatchConstants.UDP_SRC), UdpSrc.class) + OxmMatchConstants.UDP_SRC), UdpSrc.VALUE) .put(new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, - OxmMatchConstants.UDP_DST), UdpDst.class) + OxmMatchConstants.UDP_DST), UdpDst.VALUE) .put(new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, - OxmMatchConstants.VLAN_PCP), VlanPcp.class) + OxmMatchConstants.VLAN_PCP), VlanPcp.VALUE) .put(new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.OPENFLOW_BASIC_CLASS, - OxmMatchConstants.VLAN_VID), VlanVid.class) + OxmMatchConstants.VLAN_VID), VlanVid.VALUE) .put(new MatchEntryDeserializerKey( EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.EXPERIMENTER_CLASS, - OxmMatchConstants.NXM_NX_TCP_FLAG), TcpFlags.class) + OxmMatchConstants.NXM_NX_TCP_FLAG), TcpFlags.VALUE) .build(); /** @@ -261,7 +259,7 @@ public class TableFeaturesMatchFieldDeserializer { message.getUnsignedInt(message.readerIndex() + Short.BYTES + 2 * Byte.BYTES))); } - final Class clazz = codeToFieldMap.get(key); + final MatchField clazz = codeToFieldMap.get(key); return clazz == null ? Optional.empty() : Optional.of(processHeader(message).setMatchType(clazz).build()); } } 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 c3543e9b38..55f2459fcb 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 @@ -118,53 +118,53 @@ final class MultipartMatchFieldSerializerInjector { */ static void injectSerializers(final SerializerExtensionProvider provider) { // Inject new message serializers here using injector created by createInjector method - final Function, Consumer>> injector = + final Function>> injector = createInjector(provider, EncodeConstants.OF_VERSION_1_3); - injector.apply(ArpOp.class).accept(new ArpOpMatchFieldSerializer()); - injector.apply(ArpSha.class).accept(new ArpShaMatchFieldSerializer()); - injector.apply(ArpSpa.class).accept(new ArpSpaMatchFieldSerializer()); - injector.apply(ArpTha.class).accept(new ArpThaMatchFieldSerializer()); - injector.apply(ArpTpa.class).accept(new ArpTpaMatchFieldSerializer()); - injector.apply(EthDst.class).accept(new EthDstMatchFieldSerializer()); - injector.apply(EthSrc.class).accept(new EthSrcMatchFieldSerializer()); - injector.apply(EthType.class).accept(new EthTypeMatchFieldSerializer()); - injector.apply(Icmpv4Code.class).accept(new Icmpv4CodeMatchFieldSerializer()); - injector.apply(Icmpv4Type.class).accept(new Icmpv4TypeMatchFieldSerializer()); - injector.apply(Icmpv6Code.class).accept(new Icmpv6CodeMatchFieldSerializer()); - injector.apply(Icmpv6Type.class).accept(new Icmpv6TypeMatchFieldSerializer()); - injector.apply(InPhyPort.class).accept(new InPhyPortMatchFieldSerializer()); - injector.apply(InPort.class).accept(new InPortMatchFieldSerializer()); - injector.apply(IpDscp.class).accept(new IpDscpMatchFieldSerializer()); - injector.apply(IpEcn.class).accept(new IpEcnMatchFieldSerializer()); - injector.apply(IpProto.class).accept(new IpProtoMatchFieldSerializer()); - injector.apply(Ipv4Dst.class).accept(new Ipv4DstMatchFieldSerializer()); - injector.apply(Ipv4Src.class).accept(new Ipv4SrcMatchFieldSerializer()); - injector.apply(Ipv6Dst.class).accept(new Ipv6DstMatchFieldSerializer()); - injector.apply(Ipv6Exthdr.class).accept(new Ipv6ExtHdrMatchFieldSerializer()); - injector.apply(Ipv6Flabel.class).accept(new Ipv6FlabelMatchFieldSerializer()); - injector.apply(Ipv6NdSll.class).accept(new Ipv6NdSllMatchFieldSerializer()); - injector.apply(Ipv6NdTarget.class).accept(new Ipv6NdTargetMatchFieldSerializer()); - injector.apply(Ipv6NdTll.class).accept(new Ipv6NdTllMatchFieldSerializer()); - injector.apply(Ipv6Src.class).accept(new Ipv6SrcMatchFieldSerializer()); - injector.apply(Metadata.class).accept(new MetadataMatchFieldSerializer()); - injector.apply(MplsBos.class).accept(new MplsBosMatchFieldSerializer()); - injector.apply(MplsLabel.class).accept(new MplsLabelMatchFieldSerializer()); - injector.apply(MplsTc.class).accept(new MplsTcMatchFieldSerializer()); - injector.apply(PbbIsid.class).accept(new PbbIsidMatchFieldSerializer()); - injector.apply(SctpDst.class).accept(new SctpDstMatchFieldSerializer()); - injector.apply(SctpSrc.class).accept(new SctpSrcMatchFieldSerializer()); - injector.apply(TcpDst.class).accept(new TcpDstMatchFieldSerializer()); - injector.apply(TcpFlags.class).accept(new TcpFlagsMatchFieldSerializer()); - injector.apply(TcpSrc.class).accept(new TcpSrcMatchFieldSerializer()); - injector.apply(TunnelId.class).accept(new TunnelIdMatchFieldSerializer()); + injector.apply(ArpOp.VALUE).accept(new ArpOpMatchFieldSerializer()); + injector.apply(ArpSha.VALUE).accept(new ArpShaMatchFieldSerializer()); + injector.apply(ArpSpa.VALUE).accept(new ArpSpaMatchFieldSerializer()); + injector.apply(ArpTha.VALUE).accept(new ArpThaMatchFieldSerializer()); + injector.apply(ArpTpa.VALUE).accept(new ArpTpaMatchFieldSerializer()); + injector.apply(EthDst.VALUE).accept(new EthDstMatchFieldSerializer()); + injector.apply(EthSrc.VALUE).accept(new EthSrcMatchFieldSerializer()); + injector.apply(EthType.VALUE).accept(new EthTypeMatchFieldSerializer()); + injector.apply(Icmpv4Code.VALUE).accept(new Icmpv4CodeMatchFieldSerializer()); + injector.apply(Icmpv4Type.VALUE).accept(new Icmpv4TypeMatchFieldSerializer()); + injector.apply(Icmpv6Code.VALUE).accept(new Icmpv6CodeMatchFieldSerializer()); + injector.apply(Icmpv6Type.VALUE).accept(new Icmpv6TypeMatchFieldSerializer()); + injector.apply(InPhyPort.VALUE).accept(new InPhyPortMatchFieldSerializer()); + injector.apply(InPort.VALUE).accept(new InPortMatchFieldSerializer()); + injector.apply(IpDscp.VALUE).accept(new IpDscpMatchFieldSerializer()); + injector.apply(IpEcn.VALUE).accept(new IpEcnMatchFieldSerializer()); + injector.apply(IpProto.VALUE).accept(new IpProtoMatchFieldSerializer()); + injector.apply(Ipv4Dst.VALUE).accept(new Ipv4DstMatchFieldSerializer()); + injector.apply(Ipv4Src.VALUE).accept(new Ipv4SrcMatchFieldSerializer()); + injector.apply(Ipv6Dst.VALUE).accept(new Ipv6DstMatchFieldSerializer()); + injector.apply(Ipv6Exthdr.VALUE).accept(new Ipv6ExtHdrMatchFieldSerializer()); + injector.apply(Ipv6Flabel.VALUE).accept(new Ipv6FlabelMatchFieldSerializer()); + injector.apply(Ipv6NdSll.VALUE).accept(new Ipv6NdSllMatchFieldSerializer()); + injector.apply(Ipv6NdTarget.VALUE).accept(new Ipv6NdTargetMatchFieldSerializer()); + injector.apply(Ipv6NdTll.VALUE).accept(new Ipv6NdTllMatchFieldSerializer()); + injector.apply(Ipv6Src.VALUE).accept(new Ipv6SrcMatchFieldSerializer()); + injector.apply(Metadata.VALUE).accept(new MetadataMatchFieldSerializer()); + injector.apply(MplsBos.VALUE).accept(new MplsBosMatchFieldSerializer()); + injector.apply(MplsLabel.VALUE).accept(new MplsLabelMatchFieldSerializer()); + injector.apply(MplsTc.VALUE).accept(new MplsTcMatchFieldSerializer()); + injector.apply(PbbIsid.VALUE).accept(new PbbIsidMatchFieldSerializer()); + injector.apply(SctpDst.VALUE).accept(new SctpDstMatchFieldSerializer()); + injector.apply(SctpSrc.VALUE).accept(new SctpSrcMatchFieldSerializer()); + injector.apply(TcpDst.VALUE).accept(new TcpDstMatchFieldSerializer()); + injector.apply(TcpFlags.VALUE).accept(new TcpFlagsMatchFieldSerializer()); + injector.apply(TcpSrc.VALUE).accept(new TcpSrcMatchFieldSerializer()); + injector.apply(TunnelId.VALUE).accept(new TunnelIdMatchFieldSerializer()); // TODO: Finish implementation of Tunnel Ipv4 src and dst - injector.apply(TunnelIpv4Dst.class).accept(new Ipv4DstMatchFieldSerializer()); - injector.apply(TunnelIpv4Src.class).accept(new Ipv4SrcMatchFieldSerializer()); - injector.apply(UdpDst.class).accept(new UdpDstMatchFieldSerializer()); - injector.apply(UdpSrc.class).accept(new UdpSrcMatchFieldSerializer()); - injector.apply(VlanPcp.class).accept(new VlanPcpMatchFieldSerializer()); - injector.apply(VlanVid.class).accept(new VlanVidMatchFieldSerializer()); + injector.apply(TunnelIpv4Dst.VALUE).accept(new Ipv4DstMatchFieldSerializer()); + injector.apply(TunnelIpv4Src.VALUE).accept(new Ipv4SrcMatchFieldSerializer()); + injector.apply(UdpDst.VALUE).accept(new UdpDstMatchFieldSerializer()); + injector.apply(UdpSrc.VALUE).accept(new UdpSrcMatchFieldSerializer()); + injector.apply(VlanPcp.VALUE).accept(new VlanPcpMatchFieldSerializer()); + injector.apply(VlanVid.VALUE).accept(new VlanVidMatchFieldSerializer()); } /** @@ -176,9 +176,9 @@ final class MultipartMatchFieldSerializerInjector { * @return injector */ @VisibleForTesting - static Function, Consumer>> createInjector( + static Function>> createInjector( final SerializerExtensionProvider provider, final Uint8 version) { return type -> serializer -> - provider.registerSerializer(new MessageTypeKey<>(version, type), serializer); + provider.registerSerializer(new MessageTypeKey<>(version, type.implementedInterface()), serializer); } } 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 cd9283713e..46ecfead40 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 @@ -111,7 +111,7 @@ public class MatchSerializer implements OFSerializer, HeaderSerializer Preconditions.checkNotNull(registry) - .>getSerializer( - new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, setFieldMatch.getMatchType())) + .>getSerializer(new MessageTypeKey<>( + EncodeConstants.OF_VERSION_1_3, setFieldMatch.getMatchType().implementedInterface())) .serialize(setFieldMatch, byteBuf)); } 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 8d5efc79d8..da722f89c0 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 @@ -29,8 +29,8 @@ public class ApplySetfieldTablePropertySerializer extends AbstractTablePropertyS .getApplySetfield() .nonnullSetFieldMatch().values() .forEach(setFieldMatch -> Preconditions.checkNotNull(registry) - .>getSerializer( - new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, setFieldMatch.getMatchType())) + .>getSerializer(new MessageTypeKey<>( + EncodeConstants.OF_VERSION_1_3,setFieldMatch.getMatchType().implementedInterface())) .serialize(setFieldMatch, 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 324e8e7dc5..251e51cd4e 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 @@ -30,8 +30,8 @@ public class MatchTablePropertySerializer extends AbstractTablePropertySerialize .getMatchSetfield() .nonnullSetFieldMatch().values() .forEach(setFieldMatch -> Preconditions.checkNotNull(registry) - .>getSerializer( - new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, setFieldMatch.getMatchType())) + .>getSerializer(new MessageTypeKey<>( + EncodeConstants.OF_VERSION_1_3, setFieldMatch.getMatchType().implementedInterface())) .serialize(setFieldMatch, byteBuf)); } 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 8983a48a9f..3db83831fa 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 @@ -30,8 +30,8 @@ public class WildcardsTablePropertySerializer extends AbstractTablePropertySeria .getWildcardSetfield() .nonnullSetFieldMatch().values() .forEach(setFieldMatch -> Preconditions.checkNotNull(registry) - .>getSerializer( - new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, setFieldMatch.getMatchType())) + .>getSerializer(new MessageTypeKey<>( + EncodeConstants.OF_VERSION_1_3, setFieldMatch.getMatchType().implementedInterface())) .serialize(setFieldMatch, 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 d3d5efa4ad..2196b05ba4 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 @@ -29,8 +29,8 @@ public class WriteSetfieldMissTablePropertySerializer extends .getWriteSetfieldMiss() .nonnullSetFieldMatch().values() .forEach(setFieldMatch -> Preconditions.checkNotNull(registry) - .>getSerializer( - new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, setFieldMatch.getMatchType())) + .>getSerializer(new MessageTypeKey<>( + EncodeConstants.OF_VERSION_1_3, setFieldMatch.getMatchType().implementedInterface())) .serialize(setFieldMatch, byteBuf)); } 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 92ca92d224..f266b5cadb 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 @@ -30,8 +30,8 @@ public class WriteSetfieldTablePropertySerializer extends AbstractTablePropertyS .getWriteSetfield() .nonnullSetFieldMatch().values() .forEach(setFieldMatch -> Preconditions.checkNotNull(registry) - .>getSerializer( - new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, setFieldMatch.getMatchType())) + .>getSerializer(new MessageTypeKey<>( + EncodeConstants.OF_VERSION_1_3, setFieldMatch.getMatchType().implementedInterface())) .serialize(setFieldMatch, byteBuf)); } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/GroupFeaturesService.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/GroupFeaturesService.java index 12a03ea269..02cee3c8c1 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/GroupFeaturesService.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/GroupFeaturesService.java @@ -95,37 +95,37 @@ final class GroupFeaturesService } @VisibleForTesting - static Set> extractSupportedCapabilities(final GroupCapabilities capabilities) { - final var builder = ImmutableSet.>builder(); + static Set extractSupportedCapabilities(final GroupCapabilities capabilities) { + final var builder = ImmutableSet.builder(); if (capabilities.getOFPGFCCHAINING()) { - builder.add(Chaining.class); + builder.add(Chaining.VALUE); } if (capabilities.getOFPGFCCHAININGCHECKS()) { - builder.add(ChainingChecks.class); + builder.add(ChainingChecks.VALUE); } if (capabilities.getOFPGFCSELECTLIVENESS()) { - builder.add(SelectLiveness.class); + builder.add(SelectLiveness.VALUE); } if (capabilities.getOFPGFCSELECTWEIGHT()) { - builder.add(SelectWeight.class); + builder.add(SelectWeight.VALUE); } return builder.build(); } @VisibleForTesting - static Set> extractSupportedGroupTypes(final GroupTypes types) { - final var builder = ImmutableSet.>builder(); + static Set extractSupportedGroupTypes(final GroupTypes types) { + final var builder = ImmutableSet.builder(); if (types.getOFPGTALL()) { - builder.add(GroupAll.class); + builder.add(GroupAll.VALUE); } if (types.getOFPGTSELECT()) { - builder.add(GroupSelect.class); + builder.add(GroupSelect.VALUE); } if (types.getOFPGTINDIRECT()) { - builder.add(GroupIndirect.class); + builder.add(GroupIndirect.VALUE); } if (types.getOFPGTFF()) { - builder.add(GroupFf.class); + builder.add(GroupFf.VALUE); } return builder.build(); } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/MeterFeaturesService.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/MeterFeaturesService.java index fb01bda3d4..0818e94303 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/MeterFeaturesService.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/MeterFeaturesService.java @@ -92,32 +92,32 @@ final class MeterFeaturesService } @VisibleForTesting - protected static Set> extractSupportedMeterBand( + protected static Set extractSupportedMeterBand( final MultipartReplyMeterFeatures replyBody, final MeterBandTypeBitmap bandTypes) { - final var supportedMeterBand = ImmutableSet.>builder(); + final var supportedMeterBand = ImmutableSet.builder(); if (bandTypes.getOFPMBTDROP()) { - supportedMeterBand.add(MeterBandDrop.class); + supportedMeterBand.add(MeterBandDrop.VALUE); } if (replyBody.getBandTypes().getOFPMBTDSCPREMARK()) { - supportedMeterBand.add(MeterBandDscpRemark.class); + supportedMeterBand.add(MeterBandDscpRemark.VALUE); } return supportedMeterBand.build(); } @VisibleForTesting - protected static Set> extractMeterCapabilities(final MeterFlags capabilities) { - final var supportedCapabilities = ImmutableSet.>builder(); + protected static Set extractMeterCapabilities(final MeterFlags capabilities) { + final var supportedCapabilities = ImmutableSet.builder(); if (capabilities.getOFPMFBURST()) { - supportedCapabilities.add(MeterBurst.class); + supportedCapabilities.add(MeterBurst.VALUE); } if (capabilities.getOFPMFKBPS()) { - supportedCapabilities.add(MeterKbps.class); + supportedCapabilities.add(MeterKbps.VALUE); } if (capabilities.getOFPMFPKTPS()) { - supportedCapabilities.add(MeterPktps.class); + supportedCapabilities.add(MeterPktps.VALUE); } if (capabilities.getOFPMFSTATS()) { - supportedCapabilities.add(MeterStats.class); + supportedCapabilities.add(MeterStats.VALUE); } return supportedCapabilities.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 16671432cf..78b6b432eb 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 @@ -87,7 +87,7 @@ public final class FlowCreatorUtil { } public static Match createWildcardedMatch() { - return new MatchBuilder().setType(OxmMatchType.class).build(); + return new MatchBuilder().setType(OxmMatchType.VALUE).build(); } /** diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/PacketInUtil.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/PacketInUtil.java index 91c99ab727..5af74b50b7 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/PacketInUtil.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/PacketInUtil.java @@ -23,22 +23,23 @@ public final class PacketInUtil { * @param reason openflow java packet in reason * @return corresponding MD-SAL reason class for given OF-API reason */ - public static Class getMdSalPacketInReason( + public static PacketInReason getMdSalPacketInReason( org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PacketInReason reason) { - Class resultReason = PacketInReason.class; + // FIXME: use a switch expression + PacketInReason resultReason = PacketInReason.VALUE; if (reason .equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PacketInReason .OFPRNOMATCH)) { - resultReason = NoMatch.class; + resultReason = NoMatch.VALUE; } else if (reason .equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PacketInReason .OFPRINVALIDTTL)) { - resultReason = InvalidTtl.class; + resultReason = InvalidTtl.VALUE; } else if (reason .equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PacketInReason .OFPRACTION)) { - resultReason = SendToController.class; + resultReason = SendToController.VALUE; } return resultReason; } 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 059c19de21..2412f6d7df 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 @@ -81,7 +81,7 @@ public class MultipartRequestInputFactoryTest { Assert.assertNotNull(mpRq.getMatch()); Assert.assertNull(mpRq.getMatchV10()); - Assert.assertEquals(OxmMatchType.class, mpRq.getMatch().getType()); + Assert.assertEquals(OxmMatchType.VALUE, mpRq.getMatch().getType()); } @Test diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyGroupFeaturesDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyGroupFeaturesDeserializerTest.java index 22a929b835..a5dd2d103a 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyGroupFeaturesDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyGroupFeaturesDeserializerTest.java @@ -76,8 +76,8 @@ public class MultipartReplyGroupFeaturesDeserializerTest extends AbstractMultipa assertTrue(reply.getActions().containsAll(ACTIONS_LIST)); assertTrue(reply.getMaxGroups().containsAll(MAX_GROUPS_LIST)); - assertEquals(Set.of(GroupAll.class, GroupSelect.class, GroupIndirect.class), reply.getGroupTypesSupported()); - assertEquals(Set.of(Chaining.class, ChainingChecks.class), reply.getGroupCapabilitiesSupported()); + assertEquals(Set.of(GroupAll.VALUE, GroupSelect.VALUE, GroupIndirect.VALUE), reply.getGroupTypesSupported()); + assertEquals(Set.of(Chaining.VALUE, ChainingChecks.VALUE), reply.getGroupCapabilitiesSupported()); assertEquals(0, buffer.readableBytes()); } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyMeterFeaturesDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyMeterFeaturesDeserializerTest.java index db377096f8..74b3046d7a 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyMeterFeaturesDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyMeterFeaturesDeserializerTest.java @@ -13,15 +13,15 @@ import static org.junit.Assert.assertTrue; import io.netty.buffer.ByteBuf; import io.netty.buffer.UnpooledByteBufAllocator; -import java.util.Arrays; -import java.util.Collections; import java.util.List; import org.junit.Test; import org.opendaylight.openflowjava.util.ByteBufUtils; import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.multipart.reply.multipart.reply.body.MultipartReplyMeterFeatures; +import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterBand; import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterBandDrop; import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterBandDscpRemark; import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterBurst; +import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterCapability; import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterKbps; import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterPktps; import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterStats; @@ -29,8 +29,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev13 public class MultipartReplyMeterFeaturesDeserializerTest extends AbstractMultipartDeserializerTest { private static final int MAX_METER = 3; - private static final List BANDS_SUPPORTED = Collections.singletonList(MeterBandDrop.class); - private static final List CAPABILITIES_SUPPORTED = Arrays.asList(MeterKbps.class, MeterBurst.class); + private static final List BANDS_SUPPORTED = List.of(MeterBandDrop.VALUE); + private static final List CAPABILITIES_SUPPORTED = List.of(MeterKbps.VALUE, MeterBurst.VALUE); private static final byte MAX_BANDS = 56; private static final byte MAX_COLOR = 48; @@ -40,15 +40,15 @@ public class MultipartReplyMeterFeaturesDeserializerTest extends AbstractMultipa buffer.writeInt(MAX_METER); int bitMaskBands = ByteBufUtils.fillBitMask(0, - BANDS_SUPPORTED.contains(MeterBandDrop.class), - BANDS_SUPPORTED.contains(MeterBandDscpRemark.class)); + BANDS_SUPPORTED.contains(MeterBandDrop.VALUE), + BANDS_SUPPORTED.contains(MeterBandDscpRemark.VALUE)); buffer.writeInt(bitMaskBands); int bitMaskCapabilities = ByteBufUtils.fillBitMask(0, - CAPABILITIES_SUPPORTED.contains(MeterKbps.class), - CAPABILITIES_SUPPORTED.contains(MeterPktps.class), - CAPABILITIES_SUPPORTED.contains(MeterBurst.class), - CAPABILITIES_SUPPORTED.contains(MeterStats.class)); + CAPABILITIES_SUPPORTED.contains(MeterKbps.VALUE), + CAPABILITIES_SUPPORTED.contains(MeterPktps.VALUE), + CAPABILITIES_SUPPORTED.contains(MeterBurst.VALUE), + CAPABILITIES_SUPPORTED.contains(MeterStats.VALUE)); buffer.writeInt(bitMaskCapabilities); buffer.writeByte(MAX_BANDS); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/TableFeaturesMatchFieldDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/TableFeaturesMatchFieldDeserializerTest.java index 3ea4969315..02c60d93a7 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/TableFeaturesMatchFieldDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/TableFeaturesMatchFieldDeserializerTest.java @@ -65,159 +65,159 @@ public class TableFeaturesMatchFieldDeserializerTest { addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.ARP_OP); Optional fieldMatch = deserializer.deserialize(buffer); - assertEquals(ArpOp.class, fieldMatch.get().key().getMatchType()); + assertEquals(ArpOp.VALUE, fieldMatch.get().key().getMatchType()); addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.ARP_SHA); fieldMatch = deserializer.deserialize(buffer); - assertEquals(ArpSha.class, fieldMatch.get().key().getMatchType()); + assertEquals(ArpSha.VALUE, fieldMatch.get().key().getMatchType()); addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.ARP_SPA); fieldMatch = deserializer.deserialize(buffer); - assertEquals(ArpSpa.class, fieldMatch.get().key().getMatchType()); + assertEquals(ArpSpa.VALUE, fieldMatch.get().key().getMatchType()); addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.ARP_THA); fieldMatch = deserializer.deserialize(buffer); - assertEquals(ArpTha.class, fieldMatch.get().key().getMatchType()); + assertEquals(ArpTha.VALUE, fieldMatch.get().key().getMatchType()); addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.ARP_TPA); fieldMatch = deserializer.deserialize(buffer); - assertEquals(ArpTpa.class, fieldMatch.get().key().getMatchType()); + assertEquals(ArpTpa.VALUE, fieldMatch.get().key().getMatchType()); addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.ETH_DST); fieldMatch = deserializer.deserialize(buffer); - assertEquals(EthDst.class, fieldMatch.get().key().getMatchType()); + assertEquals(EthDst.VALUE, fieldMatch.get().key().getMatchType()); addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.ETH_SRC); fieldMatch = deserializer.deserialize(buffer); - assertEquals(EthSrc.class, fieldMatch.get().key().getMatchType()); + assertEquals(EthSrc.VALUE, fieldMatch.get().key().getMatchType()); addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.ICMPV4_CODE); fieldMatch = deserializer.deserialize(buffer); - assertEquals(Icmpv4Code.class, fieldMatch.get().key().getMatchType()); + assertEquals(Icmpv4Code.VALUE, fieldMatch.get().key().getMatchType()); addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.ICMPV4_TYPE); fieldMatch = deserializer.deserialize(buffer); - assertEquals(Icmpv4Type.class, fieldMatch.get().key().getMatchType()); + assertEquals(Icmpv4Type.VALUE, fieldMatch.get().key().getMatchType()); addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.ICMPV6_CODE); fieldMatch = deserializer.deserialize(buffer); - assertEquals(Icmpv6Code.class, fieldMatch.get().key().getMatchType()); + assertEquals(Icmpv6Code.VALUE, fieldMatch.get().key().getMatchType()); addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.ICMPV6_TYPE); fieldMatch = deserializer.deserialize(buffer); - assertEquals(Icmpv6Type.class, fieldMatch.get().key().getMatchType()); + assertEquals(Icmpv6Type.VALUE, fieldMatch.get().key().getMatchType()); addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.IN_PHY_PORT); fieldMatch = deserializer.deserialize(buffer); - assertEquals(InPhyPort.class, fieldMatch.get().key().getMatchType()); + assertEquals(InPhyPort.VALUE, fieldMatch.get().key().getMatchType()); addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.IN_PORT); fieldMatch = deserializer.deserialize(buffer); - assertEquals(InPort.class, fieldMatch.get().key().getMatchType()); + assertEquals(InPort.VALUE, fieldMatch.get().key().getMatchType()); addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.IP_DSCP); fieldMatch = deserializer.deserialize(buffer); - assertEquals(IpDscp.class, fieldMatch.get().key().getMatchType()); + assertEquals(IpDscp.VALUE, fieldMatch.get().key().getMatchType()); addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.IP_ECN); fieldMatch = deserializer.deserialize(buffer); - assertEquals(IpEcn.class, fieldMatch.get().key().getMatchType()); + assertEquals(IpEcn.VALUE, fieldMatch.get().key().getMatchType()); addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.IP_PROTO); fieldMatch = deserializer.deserialize(buffer); - assertEquals(IpProto.class, fieldMatch.get().key().getMatchType()); + assertEquals(IpProto.VALUE, fieldMatch.get().key().getMatchType()); addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.IPV4_SRC); fieldMatch = deserializer.deserialize(buffer); - assertEquals(Ipv4Src.class, fieldMatch.get().key().getMatchType()); + assertEquals(Ipv4Src.VALUE, fieldMatch.get().key().getMatchType()); addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.IPV4_DST); fieldMatch = deserializer.deserialize(buffer); - assertEquals(Ipv4Dst.class, fieldMatch.get().key().getMatchType()); + assertEquals(Ipv4Dst.VALUE, fieldMatch.get().key().getMatchType()); addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.IPV6_SRC); fieldMatch = deserializer.deserialize(buffer); - assertEquals(Ipv6Src.class, fieldMatch.get().key().getMatchType()); + assertEquals(Ipv6Src.VALUE, fieldMatch.get().key().getMatchType()); addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.IPV6_DST); fieldMatch = deserializer.deserialize(buffer); - assertEquals(Ipv6Dst.class, fieldMatch.get().key().getMatchType()); + assertEquals(Ipv6Dst.VALUE, fieldMatch.get().key().getMatchType()); addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.IPV6_EXTHDR); fieldMatch = deserializer.deserialize(buffer); - assertEquals(Ipv6Exthdr.class, fieldMatch.get().key().getMatchType()); + assertEquals(Ipv6Exthdr.VALUE, fieldMatch.get().key().getMatchType()); addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.IPV6_FLABEL); fieldMatch = deserializer.deserialize(buffer); - assertEquals(Ipv6Flabel.class, fieldMatch.get().key().getMatchType()); + assertEquals(Ipv6Flabel.VALUE, fieldMatch.get().key().getMatchType()); addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.IPV6_ND_SLL); fieldMatch = deserializer.deserialize(buffer); - assertEquals(Ipv6NdSll.class, fieldMatch.get().key().getMatchType()); + assertEquals(Ipv6NdSll.VALUE, fieldMatch.get().key().getMatchType()); addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.IPV6_ND_TLL); fieldMatch = deserializer.deserialize(buffer); - assertEquals(Ipv6NdTll.class, fieldMatch.get().key().getMatchType()); + assertEquals(Ipv6NdTll.VALUE, fieldMatch.get().key().getMatchType()); addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.IPV6_ND_TARGET); fieldMatch = deserializer.deserialize(buffer); - assertEquals(Ipv6NdTarget.class, fieldMatch.get().key().getMatchType()); + assertEquals(Ipv6NdTarget.VALUE, fieldMatch.get().key().getMatchType()); addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.METADATA); fieldMatch = deserializer.deserialize(buffer); - assertEquals(Metadata.class, fieldMatch.get().key().getMatchType()); + assertEquals(Metadata.VALUE, fieldMatch.get().key().getMatchType()); addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.MPLS_BOS); fieldMatch = deserializer.deserialize(buffer); - assertEquals(MplsBos.class, fieldMatch.get().key().getMatchType()); + assertEquals(MplsBos.VALUE, fieldMatch.get().key().getMatchType()); addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.MPLS_LABEL); fieldMatch = deserializer.deserialize(buffer); - assertEquals(MplsLabel.class, fieldMatch.get().key().getMatchType()); + assertEquals(MplsLabel.VALUE, fieldMatch.get().key().getMatchType()); addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.MPLS_TC); fieldMatch = deserializer.deserialize(buffer); - assertEquals(MplsTc.class, fieldMatch.get().key().getMatchType()); + assertEquals(MplsTc.VALUE, fieldMatch.get().key().getMatchType()); addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.PBB_ISID); fieldMatch = deserializer.deserialize(buffer); - assertEquals(PbbIsid.class, fieldMatch.get().key().getMatchType()); + assertEquals(PbbIsid.VALUE, fieldMatch.get().key().getMatchType()); addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.SCTP_SRC); fieldMatch = deserializer.deserialize(buffer); - assertEquals(SctpSrc.class, fieldMatch.get().key().getMatchType()); + assertEquals(SctpSrc.VALUE, fieldMatch.get().key().getMatchType()); addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.SCTP_DST); fieldMatch = deserializer.deserialize(buffer); - assertEquals(SctpDst.class, fieldMatch.get().key().getMatchType()); + assertEquals(SctpDst.VALUE, fieldMatch.get().key().getMatchType()); addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.TCP_SRC); fieldMatch = deserializer.deserialize(buffer); - assertEquals(TcpSrc.class, fieldMatch.get().key().getMatchType()); + assertEquals(TcpSrc.VALUE, fieldMatch.get().key().getMatchType()); addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.TCP_DST); fieldMatch = deserializer.deserialize(buffer); - assertEquals(TcpDst.class, fieldMatch.get().key().getMatchType()); + assertEquals(TcpDst.VALUE, fieldMatch.get().key().getMatchType()); addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.TUNNEL_ID); fieldMatch = deserializer.deserialize(buffer); - assertEquals(TunnelId.class, fieldMatch.get().key().getMatchType()); + assertEquals(TunnelId.VALUE, fieldMatch.get().key().getMatchType()); addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.UDP_SRC); fieldMatch = deserializer.deserialize(buffer); - assertEquals(UdpSrc.class, fieldMatch.get().key().getMatchType()); + assertEquals(UdpSrc.VALUE, fieldMatch.get().key().getMatchType()); addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.UDP_DST); fieldMatch = deserializer.deserialize(buffer); - assertEquals(UdpDst.class, fieldMatch.get().key().getMatchType()); + assertEquals(UdpDst.VALUE, fieldMatch.get().key().getMatchType()); addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.VLAN_PCP); fieldMatch = deserializer.deserialize(buffer); - assertEquals(VlanPcp.class, fieldMatch.get().key().getMatchType()); + assertEquals(VlanPcp.VALUE, fieldMatch.get().key().getMatchType()); addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.VLAN_VID); fieldMatch = deserializer.deserialize(buffer); - assertEquals(VlanVid.class, fieldMatch.get().key().getMatchType()); + assertEquals(VlanVid.VALUE, fieldMatch.get().key().getMatchType()); assertEquals(0, buffer.readableBytes()); } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplySetfieldMissTablePropertySerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplySetfieldMissTablePropertySerializerTest.java index 358b3ad900..b96caef98d 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplySetfieldMissTablePropertySerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplySetfieldMissTablePropertySerializerTest.java @@ -27,7 +27,7 @@ public class ApplySetfieldMissTablePropertySerializerTest extends AbstractTableP .table.types.rev131026.table.feature.prop.type.table.feature.prop.type.apply.setfield.miss .ApplySetfieldMissBuilder() .setSetFieldMatch(BindingMap.of(new SetFieldMatchBuilder() - .setMatchType(ArpOp.class) + .setMatchType(ArpOp.VALUE) .setHasMask(false) .build())) .build()) diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplySetfieldTablePropertySerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplySetfieldTablePropertySerializerTest.java index becc6c1c31..17ddd1c8fa 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplySetfieldTablePropertySerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplySetfieldTablePropertySerializerTest.java @@ -27,7 +27,7 @@ public class ApplySetfieldTablePropertySerializerTest extends AbstractTablePrope .prop.type.table.feature.prop.type.apply.setfield .ApplySetfieldBuilder() .setSetFieldMatch(BindingMap.of(new SetFieldMatchBuilder() - .setMatchType(ArpOp.class) + .setMatchType(ArpOp.VALUE) .setHasMask(false) .build())) .build()) diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/MatchTablePropertySerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/MatchTablePropertySerializerTest.java index 32e0dc1b11..0cf11054a4 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/MatchTablePropertySerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/MatchTablePropertySerializerTest.java @@ -26,7 +26,7 @@ public class MatchTablePropertySerializerTest extends AbstractTablePropertySeria final Match property = new MatchBuilder() .setMatchSetfield(new MatchSetfieldBuilder() .setSetFieldMatch(BindingMap.of(new SetFieldMatchBuilder() - .setMatchType(ArpOp.class) + .setMatchType(ArpOp.VALUE) .setHasMask(false) .build())) .build()) diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WildcardsTablePropertySerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WildcardsTablePropertySerializerTest.java index 26212125fb..9bb6bb6415 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WildcardsTablePropertySerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WildcardsTablePropertySerializerTest.java @@ -26,7 +26,7 @@ public class WildcardsTablePropertySerializerTest extends AbstractTablePropertyS final Wildcards property = new WildcardsBuilder() .setWildcardSetfield(new WildcardSetfieldBuilder() .setSetFieldMatch(BindingMap.of( - new SetFieldMatchBuilder().setMatchType(ArpOp.class).setHasMask(false).build())) + new SetFieldMatchBuilder().setMatchType(ArpOp.VALUE).setHasMask(false).build())) .build()) .build(); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WriteSetfieldMissTablePropertySerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WriteSetfieldMissTablePropertySerializerTest.java index 1d800538ae..6ccf288edd 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WriteSetfieldMissTablePropertySerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WriteSetfieldMissTablePropertySerializerTest.java @@ -27,7 +27,7 @@ public class WriteSetfieldMissTablePropertySerializerTest extends AbstractTableP .table.types.rev131026.table.feature.prop.type.table.feature.prop.type.write.setfield.miss .WriteSetfieldMissBuilder() .setSetFieldMatch(BindingMap.of(new SetFieldMatchBuilder() - .setMatchType(ArpOp.class) + .setMatchType(ArpOp.VALUE) .setHasMask(false) .build())) .build()) diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WriteSetfieldTablePropertySerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WriteSetfieldTablePropertySerializerTest.java index 57eea4d402..7800b1a8bb 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WriteSetfieldTablePropertySerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WriteSetfieldTablePropertySerializerTest.java @@ -26,7 +26,7 @@ public class WriteSetfieldTablePropertySerializerTest extends AbstractTablePrope .setWriteSetfield(new org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature .prop.type.table.feature.prop.type.write.setfield.WriteSetfieldBuilder() .setSetFieldMatch(BindingMap.of(new SetFieldMatchBuilder() - .setMatchType(ArpOp.class) + .setMatchType(ArpOp.VALUE) .setHasMask(false) .build())) .build()) diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/matchfield/MatchFieldSerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/matchfield/MatchFieldSerializerTest.java index 740c59facf..6985bcdeb0 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/matchfield/MatchFieldSerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/matchfield/MatchFieldSerializerTest.java @@ -68,47 +68,47 @@ public class MatchFieldSerializerTest extends AbstractTablePropertySerializerTes final Match property = new MatchBuilder() .setMatchSetfield(new MatchSetfieldBuilder() .setSetFieldMatch(BindingMap.ordered( - new SetFieldMatchBuilder().setMatchType(ArpOp.class).setHasMask(false).build(), - new SetFieldMatchBuilder().setMatchType(ArpSha.class).setHasMask(false).build(), - new SetFieldMatchBuilder().setMatchType(ArpSpa.class).setHasMask(false).build(), - new SetFieldMatchBuilder().setMatchType(ArpTha.class).setHasMask(false).build(), - new SetFieldMatchBuilder().setMatchType(ArpTpa.class).setHasMask(false).build(), - new SetFieldMatchBuilder().setMatchType(EthDst.class).setHasMask(false).build(), - new SetFieldMatchBuilder().setMatchType(EthSrc.class).setHasMask(false).build(), - new SetFieldMatchBuilder().setMatchType(EthType.class).setHasMask(false).build(), - new SetFieldMatchBuilder().setMatchType(Icmpv4Code.class).setHasMask(false).build(), - new SetFieldMatchBuilder().setMatchType(Icmpv4Type.class).setHasMask(false).build(), - new SetFieldMatchBuilder().setMatchType(Icmpv6Code.class).setHasMask(false).build(), - new SetFieldMatchBuilder().setMatchType(Icmpv6Type.class).setHasMask(false).build(), - new SetFieldMatchBuilder().setMatchType(InPhyPort.class).setHasMask(false).build(), - new SetFieldMatchBuilder().setMatchType(InPort.class).setHasMask(false).build(), - new SetFieldMatchBuilder().setMatchType(IpDscp.class).setHasMask(false).build(), - new SetFieldMatchBuilder().setMatchType(IpEcn.class).setHasMask(false).build(), - new SetFieldMatchBuilder().setMatchType(IpProto.class).setHasMask(false).build(), - new SetFieldMatchBuilder().setMatchType(Ipv4Dst.class).setHasMask(false).build(), - new SetFieldMatchBuilder().setMatchType(Ipv4Src.class).setHasMask(false).build(), - new SetFieldMatchBuilder().setMatchType(Ipv6Dst.class).setHasMask(false).build(), - new SetFieldMatchBuilder().setMatchType(Ipv6Exthdr.class).setHasMask(false).build(), - new SetFieldMatchBuilder().setMatchType(Ipv6Flabel.class).setHasMask(false).build(), - new SetFieldMatchBuilder().setMatchType(Ipv6NdSll.class).setHasMask(false).build(), - new SetFieldMatchBuilder().setMatchType(Ipv6NdTarget.class).setHasMask(false).build(), - new SetFieldMatchBuilder().setMatchType(Ipv6NdTll.class).setHasMask(false).build(), - new SetFieldMatchBuilder().setMatchType(Ipv6Src.class).setHasMask(false).build(), - new SetFieldMatchBuilder().setMatchType(Metadata.class).setHasMask(false).build(), - new SetFieldMatchBuilder().setMatchType(MplsBos.class).setHasMask(false).build(), - new SetFieldMatchBuilder().setMatchType(MplsLabel.class).setHasMask(false).build(), - new SetFieldMatchBuilder().setMatchType(MplsTc.class).setHasMask(false).build(), - new SetFieldMatchBuilder().setMatchType(PbbIsid.class).setHasMask(false).build(), - new SetFieldMatchBuilder().setMatchType(SctpDst.class).setHasMask(false).build(), - new SetFieldMatchBuilder().setMatchType(SctpSrc.class).setHasMask(false).build(), - new SetFieldMatchBuilder().setMatchType(TcpDst.class).setHasMask(false).build(), - new SetFieldMatchBuilder().setMatchType(TcpFlags.class).setHasMask(false).build(), - new SetFieldMatchBuilder().setMatchType(TcpSrc.class).setHasMask(true).build(), - new SetFieldMatchBuilder().setMatchType(TunnelId.class).setHasMask(false).build(), - new SetFieldMatchBuilder().setMatchType(UdpDst.class).setHasMask(false).build(), - new SetFieldMatchBuilder().setMatchType(UdpSrc.class).setHasMask(false).build(), - new SetFieldMatchBuilder().setMatchType(VlanPcp.class).setHasMask(false).build(), - new SetFieldMatchBuilder().setMatchType(VlanVid.class).setHasMask(false).build())) + new SetFieldMatchBuilder().setMatchType(ArpOp.VALUE).setHasMask(false).build(), + new SetFieldMatchBuilder().setMatchType(ArpSha.VALUE).setHasMask(false).build(), + new SetFieldMatchBuilder().setMatchType(ArpSpa.VALUE).setHasMask(false).build(), + new SetFieldMatchBuilder().setMatchType(ArpTha.VALUE).setHasMask(false).build(), + new SetFieldMatchBuilder().setMatchType(ArpTpa.VALUE).setHasMask(false).build(), + new SetFieldMatchBuilder().setMatchType(EthDst.VALUE).setHasMask(false).build(), + new SetFieldMatchBuilder().setMatchType(EthSrc.VALUE).setHasMask(false).build(), + new SetFieldMatchBuilder().setMatchType(EthType.VALUE).setHasMask(false).build(), + new SetFieldMatchBuilder().setMatchType(Icmpv4Code.VALUE).setHasMask(false).build(), + new SetFieldMatchBuilder().setMatchType(Icmpv4Type.VALUE).setHasMask(false).build(), + new SetFieldMatchBuilder().setMatchType(Icmpv6Code.VALUE).setHasMask(false).build(), + new SetFieldMatchBuilder().setMatchType(Icmpv6Type.VALUE).setHasMask(false).build(), + new SetFieldMatchBuilder().setMatchType(InPhyPort.VALUE).setHasMask(false).build(), + new SetFieldMatchBuilder().setMatchType(InPort.VALUE).setHasMask(false).build(), + new SetFieldMatchBuilder().setMatchType(IpDscp.VALUE).setHasMask(false).build(), + new SetFieldMatchBuilder().setMatchType(IpEcn.VALUE).setHasMask(false).build(), + new SetFieldMatchBuilder().setMatchType(IpProto.VALUE).setHasMask(false).build(), + new SetFieldMatchBuilder().setMatchType(Ipv4Dst.VALUE).setHasMask(false).build(), + new SetFieldMatchBuilder().setMatchType(Ipv4Src.VALUE).setHasMask(false).build(), + new SetFieldMatchBuilder().setMatchType(Ipv6Dst.VALUE).setHasMask(false).build(), + new SetFieldMatchBuilder().setMatchType(Ipv6Exthdr.VALUE).setHasMask(false).build(), + new SetFieldMatchBuilder().setMatchType(Ipv6Flabel.VALUE).setHasMask(false).build(), + new SetFieldMatchBuilder().setMatchType(Ipv6NdSll.VALUE).setHasMask(false).build(), + new SetFieldMatchBuilder().setMatchType(Ipv6NdTarget.VALUE).setHasMask(false).build(), + new SetFieldMatchBuilder().setMatchType(Ipv6NdTll.VALUE).setHasMask(false).build(), + new SetFieldMatchBuilder().setMatchType(Ipv6Src.VALUE).setHasMask(false).build(), + new SetFieldMatchBuilder().setMatchType(Metadata.VALUE).setHasMask(false).build(), + new SetFieldMatchBuilder().setMatchType(MplsBos.VALUE).setHasMask(false).build(), + new SetFieldMatchBuilder().setMatchType(MplsLabel.VALUE).setHasMask(false).build(), + new SetFieldMatchBuilder().setMatchType(MplsTc.VALUE).setHasMask(false).build(), + new SetFieldMatchBuilder().setMatchType(PbbIsid.VALUE).setHasMask(false).build(), + new SetFieldMatchBuilder().setMatchType(SctpDst.VALUE).setHasMask(false).build(), + new SetFieldMatchBuilder().setMatchType(SctpSrc.VALUE).setHasMask(false).build(), + new SetFieldMatchBuilder().setMatchType(TcpDst.VALUE).setHasMask(false).build(), + new SetFieldMatchBuilder().setMatchType(TcpFlags.VALUE).setHasMask(false).build(), + new SetFieldMatchBuilder().setMatchType(TcpSrc.VALUE).setHasMask(true).build(), + new SetFieldMatchBuilder().setMatchType(TunnelId.VALUE).setHasMask(false).build(), + new SetFieldMatchBuilder().setMatchType(UdpDst.VALUE).setHasMask(false).build(), + new SetFieldMatchBuilder().setMatchType(UdpSrc.VALUE).setHasMask(false).build(), + new SetFieldMatchBuilder().setMatchType(VlanPcp.VALUE).setHasMask(false).build(), + new SetFieldMatchBuilder().setMatchType(VlanVid.VALUE).setHasMask(false).build())) .build()) .build(); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/translator/PacketReceivedTranslatorTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/translator/PacketReceivedTranslatorTest.java index 95c083818b..97950db26c 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/translator/PacketReceivedTranslatorTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/translator/PacketReceivedTranslatorTest.java @@ -97,8 +97,9 @@ public class PacketReceivedTranslatorTest { final PacketReceived packetReceived = packetReceivedTranslator.translate(packetInMessage, deviceInfo, null); Assert.assertArrayEquals(packetInMessage.getData(), packetReceived.getPayload()); - Assert.assertEquals("org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.SendToController", - packetReceived.getPacketInReason().getName()); + Assert.assertEquals( + org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.SendToController.VALUE, + packetReceived.getPacketInReason()); Assert.assertEquals("openflow:10:" + PORT_NO, packetReceived.getIngress().getValue().firstKeyOf(NodeConnector.class).getId().getValue()); Assert.assertEquals(0L, packetReceived.getFlowCookie().getValue().longValue()); @@ -140,7 +141,7 @@ public class PacketReceivedTranslatorTest { } private static MatchEntryBuilder assembleMatchEntryBld(final long portNumValue) { - MatchEntryBuilder matchEntryBuilder = prepareHeader(InPort.class, false); + MatchEntryBuilder matchEntryBuilder = prepareHeader(InPort.VALUE, false); InPortBuilder inPortBld = new InPortBuilder().setPortNumber(new PortNumber(Uint32.valueOf(portNumValue))); InPortCaseBuilder caseBuilder = new InPortCaseBuilder(); caseBuilder.setInPort(inPortBld.build()); @@ -148,10 +149,10 @@ public class PacketReceivedTranslatorTest { return matchEntryBuilder; } - private static MatchEntryBuilder prepareHeader(final Class oxmMatchField, + private static MatchEntryBuilder prepareHeader(final MatchField oxmMatchField, final boolean hasMask) { MatchEntryBuilder builder = new MatchEntryBuilder(); - builder.setOxmClass(OpenflowBasicClass.class); + builder.setOxmClass(OpenflowBasicClass.VALUE); builder.setOxmMatchField(oxmMatchField); builder.setHasMask(hasMask); return builder; 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 ac27764307..90ecfc28e9 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 @@ -288,7 +288,7 @@ public class FlowCreatorUtilTest { } private static void assertMatch(final Match match) { - assertTrue(match.getType().getClass().isInstance(OxmMatchType.class)); + assertEquals(OxmMatchType.VALUE, match.getType()); } private static void assertMatch(final MatchV10 matchV10) { 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 5c246f04eb..a750fa7385 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 @@ -47,8 +47,8 @@ public class NodeConnectorRefToPortTranslatorTest extends TestCase { .setInPort(inPortBuilder.build()); MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder() - .setOxmClass(OpenflowBasicClass.class) - .setOxmMatchField(InPort.class) + .setOxmClass(OpenflowBasicClass.VALUE) + .setOxmMatchField(InPort.VALUE) .setHasMask(false) .setMatchEntryValue(caseBuilder.build()); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/PacketInUtilTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/PacketInUtilTest.java index 9f7edbcb93..2bab62fc51 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/PacketInUtilTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/PacketInUtilTest.java @@ -5,10 +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.util; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertEquals; import org.junit.Test; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PacketInReason; @@ -20,24 +19,14 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.Se * Created by Martin Bobak mbobak@cisco.com on 7/2/14. */ public class PacketInUtilTest { - /** * Test method for PacketInUtil#getMdSalPacketInReason(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow * .common.types.rev130731.PacketInReason). */ @Test public void testGetMdSalPacketInReason() { - Class - resultReason; - - resultReason = PacketInUtil.getMdSalPacketInReason(PacketInReason.OFPRACTION); - assertTrue(resultReason.getName().equals(SendToController.class.getName())); - - resultReason = PacketInUtil.getMdSalPacketInReason(PacketInReason.OFPRINVALIDTTL); - assertTrue(resultReason.getName().equals(InvalidTtl.class.getName())); - - resultReason = PacketInUtil.getMdSalPacketInReason(PacketInReason.OFPRNOMATCH); - assertTrue(resultReason.getName().equals(NoMatch.class.getName())); - + assertEquals(SendToController.VALUE, PacketInUtil.getMdSalPacketInReason(PacketInReason.OFPRACTION)); + assertEquals(InvalidTtl.VALUE, PacketInUtil.getMdSalPacketInReason(PacketInReason.OFPRINVALIDTTL)); + assertEquals(NoMatch.VALUE, PacketInUtil.getMdSalPacketInReason(PacketInReason.OFPRNOMATCH)); } } diff --git a/openflowplugin-it/pom.xml b/openflowplugin-it/pom.xml index 39f8cc3eea..b3a1d0e139 100644 --- a/openflowplugin-it/pom.xml +++ b/openflowplugin-it/pom.xml @@ -67,8 +67,8 @@ - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api true 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 efcb6e2ff3..dea045befd 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 @@ -154,7 +154,7 @@ public final class MatchExtensionHelper { matchEntry.getOxmMatchField()); // If entry is experimenter, set experimenter ID to key - if (matchEntry.getOxmClass().equals(ExperimenterClass.class)) { + if (ExperimenterClass.VALUE.equals(matchEntry.getOxmClass())) { key.setExperimenterId( ((ExperimenterIdCase) matchEntry.getMatchEntryValue()).getExperimenter().getExperimenter().getValue()); } diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/TableFeaturesConvertor.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/TableFeaturesConvertor.java index 397f86149c..6cc5fdf4b6 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/TableFeaturesConvertor.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/TableFeaturesConvertor.java @@ -8,10 +8,8 @@ package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableMap.Builder; import com.google.common.collect.Ordering; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.Map; @@ -125,6 +123,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.yang.gen.v1.urn.opendaylight.table.service.rev131026.table.update.UpdatedTable; +import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.MatchField; import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.set.field.match.SetFieldMatch; import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.set.field.match.SetFieldMatchKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.TableFeaturePropType; @@ -170,72 +169,71 @@ public class TableFeaturesConvertor extends Convertor< private static final Ordering TABLE_FEATURE_PROPS_ORDERING = Ordering.from(OrderComparator.build()); - private static final Map, Class> SAL_TO_OF_TABLE_FEATURES; - private static final List> TYPES = Arrays.asList(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types - .rev131026.TableFeatures.class, UpdatedTable.class); - - static { - Builder, Class> builder = ImmutableMap.builder(); - builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpOp.class, ArpOp.class); - builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpSha.class, ArpSha.class); - builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpSpa.class, ArpSpa.class); - builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpTha.class, ArpTha.class); - builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpTpa.class, ArpTpa.class); - builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthDst.class, EthDst.class); - builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthSrc.class, EthSrc.class); - builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthType.class, EthType.class); - builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv4Code.class, - Icmpv4Code.class); - builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv4Type.class, - Icmpv4Type.class); - builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv6Code.class, - Icmpv6Code.class); - builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv6Type.class, - Icmpv6Type.class); - builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.InPhyPort.class, - InPhyPort.class); - builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.InPort.class, InPort.class); - builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpDscp.class, IpDscp.class); - builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpEcn.class, IpEcn.class); - builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpProto.class, IpProto.class); - builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv4Dst.class, Ipv4Dst.class); - builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv4Src.class, Ipv4Src.class); - builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Dst.class, Ipv6Dst.class); - builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Exthdr.class, - Ipv6Exthdr.class); - builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Flabel.class, - Ipv6Flabel.class); - builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6NdSll.class, - Ipv6NdSll.class); - builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6NdTarget.class, - Ipv6NdTarget.class); - builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6NdTll.class, - Ipv6NdTll.class); - builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Src.class, Ipv6Src.class); - builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Metadata.class, Metadata.class); - builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.MplsBos.class, MplsBos.class); - builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.MplsLabel.class, - MplsLabel.class); - builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.MplsTc.class, MplsTc.class); - builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.PbbIsid.class, PbbIsid.class); - builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.SctpDst.class, SctpDst.class); - builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.SctpSrc.class, SctpSrc.class); - builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TcpDst.class, TcpDst.class); - builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TcpSrc.class, TcpSrc.class); - builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TunnelId.class, TunnelId.class); - builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.UdpDst.class, UdpDst.class); - builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.UdpSrc.class, UdpSrc.class); - builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.VlanPcp.class, VlanPcp.class); - builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.VlanVid.class, VlanVid.class); - builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TunnelIpv4Dst.class, - Ipv4Dst.class); - builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TunnelIpv4Src.class, - Ipv4Src.class); - builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TcpFlags.class, TcpFlags.class); - SAL_TO_OF_TABLE_FEATURES = builder.build(); - } + private static final List> TYPES = List.of( + org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TableFeatures.class, + UpdatedTable.class); + + private static final ImmutableMap SAL_TO_OF_TABLE_FEATURES = + ImmutableMap.builder() + .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpOp.VALUE, ArpOp.VALUE) + .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpSha.VALUE, ArpSha.VALUE) + .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpSpa.VALUE, ArpSpa.VALUE) + .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpTha.VALUE, ArpTha.VALUE) + .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpTpa.VALUE, ArpTpa.VALUE) + .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthDst.VALUE, EthDst.VALUE) + .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthSrc.VALUE, EthSrc.VALUE) + .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthType.VALUE, EthType.VALUE) + .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv4Code.VALUE, + Icmpv4Code.VALUE) + .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv4Type.VALUE, + Icmpv4Type.VALUE) + .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv6Code.VALUE, + Icmpv6Code.VALUE) + .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv6Type.VALUE, + Icmpv6Type.VALUE) + .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.InPhyPort.VALUE, + InPhyPort.VALUE) + .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.InPort.VALUE, InPort.VALUE) + .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpDscp.VALUE, IpDscp.VALUE) + .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpEcn.VALUE, IpEcn.VALUE) + .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpProto.VALUE, IpProto.VALUE) + .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv4Dst.VALUE, Ipv4Dst.VALUE) + .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv4Src.VALUE, Ipv4Src.VALUE) + .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Dst.VALUE, Ipv6Dst.VALUE) + .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Exthdr.VALUE, + Ipv6Exthdr.VALUE) + .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Flabel.VALUE, + Ipv6Flabel.VALUE) + .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6NdSll.VALUE, + Ipv6NdSll.VALUE) + .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6NdTarget.VALUE, + Ipv6NdTarget.VALUE) + .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6NdTll.VALUE, + Ipv6NdTll.VALUE) + .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Src.VALUE, Ipv6Src.VALUE) + .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Metadata.VALUE, Metadata.VALUE) + .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.MplsBos.VALUE, MplsBos.VALUE) + .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.MplsLabel.VALUE, + MplsLabel.VALUE) + .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.MplsTc.VALUE, MplsTc.VALUE) + .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.PbbIsid.VALUE, PbbIsid.VALUE) + .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.SctpDst.VALUE, SctpDst.VALUE) + .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.SctpSrc.VALUE, SctpSrc.VALUE) + .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TcpDst.VALUE, TcpDst.VALUE) + .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TcpSrc.VALUE, TcpSrc.VALUE) + .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TunnelId.VALUE, TunnelId.VALUE) + .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.UdpDst.VALUE, UdpDst.VALUE) + .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.UdpSrc.VALUE, UdpSrc.VALUE) + .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.VlanPcp.VALUE, VlanPcp.VALUE) + .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.VlanVid.VALUE, VlanVid.VALUE) + .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TunnelIpv4Dst.VALUE, + Ipv4Dst.VALUE) + .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TunnelIpv4Src.VALUE, + Ipv4Src.VALUE) + .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TcpFlags.VALUE, TcpFlags.VALUE) + .build(); private static List toTableProperties( final org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.features.table.features @@ -599,11 +597,11 @@ public class TableFeaturesConvertor extends Convertor< List matchEntriesList = new ArrayList<>(); for (SetFieldMatch currMatch : setFields.values()) { - Class - currMatchType = currMatch.getMatchType(); + org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.MatchField currMatchType = + currMatch.getMatchType(); MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder(); - Class - ofTableFeatureClass = SAL_TO_OF_TABLE_FEATURES.get(currMatchType); + org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.MatchField ofTableFeatureClass = + SAL_TO_OF_TABLE_FEATURES.get(currMatchType); setMatchEntry(matchEntryBuilder, ofTableFeatureClass, currMatch.getHasMask()); matchEntriesList.add(matchEntryBuilder.build()); } @@ -614,12 +612,12 @@ public class TableFeaturesConvertor extends Convertor< } private static void setMatchEntry(final MatchEntryBuilder builder, - final Class field, final Boolean hasMask) { - if (field == TcpFlags.class) { - builder.setOxmClass(ExperimenterClass.class); + final org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.MatchField field, + final Boolean hasMask) { + if (TcpFlags.VALUE.equals(field)) { + builder.setOxmClass(ExperimenterClass.VALUE); } else { - builder.setOxmClass(OpenflowBasicClass.class); + builder.setOxmClass(OpenflowBasicClass.VALUE); } builder.setOxmMatchField(field); builder.setHasMask(hasMask); diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/TableFeaturesResponseConvertor.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/TableFeaturesResponseConvertor.java index c05691eba6..8dc21703a9 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/TableFeaturesResponseConvertor.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/TableFeaturesResponseConvertor.java @@ -190,8 +190,8 @@ public class TableFeaturesResponseConvertor private static final Map TABLE_FEATURE_PROPERTY_TYPE_TO_ACTION; private static final Map, org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action> OF_TO_SAL_ACTION; - private static final Map, Class> OF_TO_SAL_TABLE_FEATURE_PROPERTIES; + private static final Map OF_TO_SAL_TABLE_FEATURE_PROPERTIES; private static final Set> TYPES = Collections.singleton(MultipartReplyTableFeatures.class); static { @@ -366,61 +366,61 @@ public class TableFeaturesResponseConvertor } static { - final Builder, Class> builder = ImmutableMap.builder(); - - builder.put(ArpOp.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpOp.class); - builder.put(ArpSha.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpSha.class); - builder.put(ArpSpa.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpSpa.class); - builder.put(ArpTha.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpTha.class); - builder.put(ArpTpa.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpTpa.class); - builder.put(EthDst.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthDst.class); - builder.put(EthSrc.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthSrc.class); - builder.put(EthType.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthType.class); - builder.put(Icmpv4Code.class, - org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv4Code.class); - builder.put(Icmpv4Type.class, - org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv4Type.class); - builder.put(Icmpv6Code.class, - org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv6Code.class); - builder.put(Icmpv6Type.class, - org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv6Type.class); - builder.put(InPhyPort.class, - org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.InPhyPort.class); - builder.put(InPort.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.InPort.class); - builder.put(IpDscp.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpDscp.class); - builder.put(IpEcn.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpEcn.class); - builder.put(IpProto.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpProto.class); - builder.put(Ipv4Dst.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv4Dst.class); - builder.put(Ipv4Src.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv4Src.class); - builder.put(Ipv6Dst.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Dst.class); - builder.put(Ipv6Exthdr.class, - org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Exthdr.class); - builder.put(Ipv6Flabel.class, - org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Flabel.class); - builder.put(Ipv6NdSll.class, - org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6NdSll.class); - builder.put(Ipv6NdTarget.class, - org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6NdTarget.class); - builder.put(Ipv6NdTll.class, - org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6NdTll.class); - builder.put(Ipv6Src.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Src.class); - builder.put(Metadata.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Metadata.class); - builder.put(MplsBos.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.MplsBos.class); - builder.put(MplsLabel.class, - org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.MplsLabel.class); - builder.put(MplsTc.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.MplsTc.class); - builder.put(PbbIsid.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.PbbIsid.class); - builder.put(SctpDst.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.SctpDst.class); - builder.put(SctpSrc.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.SctpSrc.class); - builder.put(TcpDst.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TcpDst.class); - builder.put(TcpSrc.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TcpSrc.class); - builder.put(TunnelId.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TunnelId.class); - builder.put(UdpDst.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.UdpDst.class); - builder.put(UdpSrc.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.UdpSrc.class); - builder.put(VlanPcp.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.VlanPcp.class); - builder.put(VlanVid.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.VlanVid.class); - builder.put(TcpFlags.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TcpFlags.class); + final Builder builder = ImmutableMap.builder(); + + builder.put(ArpOp.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpOp.VALUE); + builder.put(ArpSha.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpSha.VALUE); + builder.put(ArpSpa.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpSpa.VALUE); + builder.put(ArpTha.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpTha.VALUE); + builder.put(ArpTpa.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpTpa.VALUE); + builder.put(EthDst.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthDst.VALUE); + builder.put(EthSrc.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthSrc.VALUE); + builder.put(EthType.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthType.VALUE); + builder.put(Icmpv4Code.VALUE, + org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv4Code.VALUE); + builder.put(Icmpv4Type.VALUE, + org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv4Type.VALUE); + builder.put(Icmpv6Code.VALUE, + org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv6Code.VALUE); + builder.put(Icmpv6Type.VALUE, + org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv6Type.VALUE); + builder.put(InPhyPort.VALUE, + org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.InPhyPort.VALUE); + builder.put(InPort.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.InPort.VALUE); + builder.put(IpDscp.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpDscp.VALUE); + builder.put(IpEcn.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpEcn.VALUE); + builder.put(IpProto.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpProto.VALUE); + builder.put(Ipv4Dst.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv4Dst.VALUE); + builder.put(Ipv4Src.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv4Src.VALUE); + builder.put(Ipv6Dst.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Dst.VALUE); + builder.put(Ipv6Exthdr.VALUE, + org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Exthdr.VALUE); + builder.put(Ipv6Flabel.VALUE, + org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Flabel.VALUE); + builder.put(Ipv6NdSll.VALUE, + org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6NdSll.VALUE); + builder.put(Ipv6NdTarget.VALUE, + org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6NdTarget.VALUE); + builder.put(Ipv6NdTll.VALUE, + org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6NdTll.VALUE); + builder.put(Ipv6Src.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Src.VALUE); + builder.put(Metadata.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Metadata.VALUE); + builder.put(MplsBos.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.MplsBos.VALUE); + builder.put(MplsLabel.VALUE, + org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.MplsLabel.VALUE); + builder.put(MplsTc.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.MplsTc.VALUE); + builder.put(PbbIsid.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.PbbIsid.VALUE); + builder.put(SctpDst.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.SctpDst.VALUE); + builder.put(SctpSrc.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.SctpSrc.VALUE); + builder.put(TcpDst.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TcpDst.VALUE); + builder.put(TcpSrc.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TcpSrc.VALUE); + builder.put(TunnelId.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TunnelId.VALUE); + builder.put(UdpDst.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.UdpDst.VALUE); + builder.put(UdpSrc.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.UdpSrc.VALUE); + builder.put(VlanPcp.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.VlanPcp.VALUE); + builder.put(VlanVid.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.VlanVid.VALUE); + builder.put(TcpFlags.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TcpFlags.VALUE); OF_TO_SAL_TABLE_FEATURE_PROPERTIES = builder.build(); } @@ -554,7 +554,7 @@ public class TableFeaturesResponseConvertor // This handles only OpenflowBasicClass oxm class. for (MatchEntry currMatch : properties.augmentation(OxmRelatedTableFeatureProperty.class) .getMatchEntry()) { - Class ofMatchField = currMatch.getOxmMatchField(); + MatchField ofMatchField = currMatch.getOxmMatchField(); if (setHasMask) { setFieldMatchBuilder.setHasMask(currMatch.getHasMask()); diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetDlDstActionCase.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetDlDstActionCase.java index 1afdd50a3a..a4bf90fe12 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetDlDstActionCase.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetDlDstActionCase.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.openflow.md.core.sal.convertor.action.cases; import java.util.ArrayList; @@ -41,8 +40,8 @@ public class SalToOfSetDlDstActionCase extends ConvertorCase addressParts = PREFIX_SPLITTER.split(((Ipv4) address).getIpv4Address().getValue()); Ipv4Address result = new Ipv4Address(addressParts.iterator().next()); MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder(); - matchEntryBuilder.setOxmClass(OpenflowBasicClass.class); - matchEntryBuilder.setOxmMatchField(Ipv4Dst.class); + matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + matchEntryBuilder.setOxmMatchField(Ipv4Dst.VALUE); Ipv4DstCaseBuilder ipv4DstCaseBuilder = new Ipv4DstCaseBuilder(); Ipv4DstBuilder ipv4DstBuilder = new Ipv4DstBuilder(); @@ -81,8 +80,8 @@ public class SalToOfSetNwDstActionCase extends ConvertorCase addressParts = PREFIX_SPLITTER.split(((Ipv6) address).getIpv6Address().getValue()); Ipv6Address result = new Ipv6Address(addressParts.iterator().next()); MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder(); - matchEntryBuilder.setOxmClass(OpenflowBasicClass.class); - matchEntryBuilder.setOxmMatchField(Ipv6Dst.class); + matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + matchEntryBuilder.setOxmMatchField(Ipv6Dst.VALUE); Ipv6DstCaseBuilder ipv6DstCaseBuilder = new Ipv6DstCaseBuilder(); Ipv6DstBuilder ipv6DstBuilder = new Ipv6DstBuilder(); diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetNwSrcActionCase.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetNwSrcActionCase.java index 0b68813187..bc77aa806d 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetNwSrcActionCase.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetNwSrcActionCase.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.openflow.md.core.sal.convertor.action.cases; import com.google.common.base.Splitter; @@ -57,8 +56,8 @@ public class SalToOfSetNwSrcActionCase extends ConvertorCase process(final SetTpDstActionCase source, final ActionConvertorData data, final ConvertorExecutor convertorExecutor) { final MatchEntryBuilder matchBuilder = new MatchEntryBuilder() - .setOxmClass(OpenflowBasicClass.class) + .setOxmClass(OpenflowBasicClass.VALUE) .setHasMask(Boolean.FALSE); final Uint8 ipProtocol = data.getIpProtocol(); @@ -65,7 +65,7 @@ public class SalToOfSetTpDstActionCase extends ConvertorCase process(@NonNull final SetVlanIdActionCase source, final ActionConvertorData data, + public Optional process(final SetVlanIdActionCase source, final ActionConvertorData data, ConvertorExecutor convertorExecutor) { MatchEntryBuilder matchBuilder = new MatchEntryBuilder(); - matchBuilder.setOxmClass(OpenflowBasicClass.class); - matchBuilder.setOxmMatchField(VlanVid.class); + matchBuilder.setOxmClass(OpenflowBasicClass.VALUE); + matchBuilder.setOxmMatchField(VlanVid.VALUE); matchBuilder.setHasMask(false); VlanVidCaseBuilder vlanVidCaseBuilder = new VlanVidCaseBuilder(); VlanVidBuilder vlanVidBuilder = new VlanVidBuilder(); diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfStripVlanActionCase.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfStripVlanActionCase.java index a24b12a189..238dc1732c 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfStripVlanActionCase.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfStripVlanActionCase.java @@ -38,8 +38,8 @@ public class SalToOfStripVlanActionCase extends ConvertorCase process(@NonNull final StripVlanActionCase source, final ActionConvertorData data, ConvertorExecutor convertorExecutor) { MatchEntryBuilder matchBuilder = new MatchEntryBuilder(); - matchBuilder.setOxmClass(OpenflowBasicClass.class); - matchBuilder.setOxmMatchField(VlanVid.class); + matchBuilder.setOxmClass(OpenflowBasicClass.VALUE); + matchBuilder.setOxmMatchField(VlanVid.VALUE); matchBuilder.setHasMask(false); VlanVidCaseBuilder vlanVidCaseBuilder = new VlanVidCaseBuilder(); VlanVidBuilder vlanVidBuilder = new VlanVidBuilder(); diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/FlowConvertor.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/FlowConvertor.java index 0b14be3e17..7f0cbe2c71 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/FlowConvertor.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/FlowConvertor.java @@ -137,7 +137,7 @@ public class FlowConvertor extends Convertor, Ve /** * OxmMatch type. */ - public static final Class DEFAULT_MATCH_TYPE = OxmMatchType.class; + public static final MatchTypeBase DEFAULT_MATCH_TYPE = OxmMatchType.VALUE; /** * default match entries - empty. diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertor.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertor.java index 442855cbf2..af6c98d2e8 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertor.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertor.java @@ -189,9 +189,9 @@ public class MatchConvertor extends Convertor, VersionCo //TODO: currently this matchconverter is mapped to OF1.3 in MatchInjector. Will need to revisit during 1.4+ final Uint32 portNumber = InventoryDataServiceUtil.portNumberfromNodeConnectorId(OpenflowVersion.OF13, inPort); MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder(); - matchEntryBuilder.setOxmClass(OpenflowBasicClass.class); + matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE); matchEntryBuilder.setHasMask(false); - matchEntryBuilder.setOxmMatchField(InPort.class); + matchEntryBuilder.setOxmMatchField(InPort.VALUE); InPortCaseBuilder caseBuilder = new InPortCaseBuilder(); InPortBuilder portBuilder = new InPortBuilder(); portBuilder.setPortNumber(new PortNumber(portNumber)); @@ -209,9 +209,9 @@ public class MatchConvertor extends Convertor, VersionCo final Uint32 portNumber = InventoryDataServiceUtil.portNumberfromNodeConnectorId(OpenflowVersion.OF13, inPhyPort); MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder(); - matchEntryBuilder.setOxmClass(OpenflowBasicClass.class); + matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE); matchEntryBuilder.setHasMask(false); - matchEntryBuilder.setOxmMatchField(InPhyPort.class); + matchEntryBuilder.setOxmMatchField(InPhyPort.VALUE); InPhyPortCaseBuilder caseBuilder = new InPhyPortCaseBuilder(); InPhyPortBuilder portBuilder = new InPhyPortBuilder(); portBuilder.setPortNumber(new PortNumber(portNumber)); @@ -228,8 +228,8 @@ public class MatchConvertor extends Convertor, VersionCo MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder(); final boolean hasmask = metadata.getMetadataMask() != null; - matchEntryBuilder.setOxmClass(OpenflowBasicClass.class); - matchEntryBuilder.setOxmMatchField(Metadata.class); + matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + matchEntryBuilder.setOxmMatchField(Metadata.VALUE); MetadataCaseBuilder metadataCaseBuilder = new MetadataCaseBuilder(); org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry .value.metadata._case.MetadataBuilder metadataBuilder = new org.opendaylight.yang.gen.v1.urn.opendaylight @@ -252,8 +252,8 @@ public class MatchConvertor extends Convertor, VersionCo } MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder(); - matchEntryBuilder.setOxmClass(OpenflowBasicClass.class); - matchEntryBuilder.setOxmMatchField(PacketType.class); + matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + matchEntryBuilder.setOxmMatchField(PacketType.VALUE); matchEntryBuilder.setHasMask(false); PacketTypeCaseBuilder packetTypeCaseBuilder = new PacketTypeCaseBuilder(); PacketTypeBuilder packetTypeBuilder = new PacketTypeBuilder(); @@ -283,8 +283,8 @@ public class MatchConvertor extends Convertor, VersionCo MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder(); matchEntryBuilder.setMatchEntryValue(tunnelIdCaseBuilder.build()); matchEntryBuilder.setHasMask(hasMask); - matchEntryBuilder.setOxmMatchField(TunnelId.class); - matchEntryBuilder.setOxmClass(OpenflowBasicClass.class); + matchEntryBuilder.setOxmMatchField(TunnelId.VALUE); + matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE); matchEntryList.add(matchEntryBuilder.build()); } @@ -365,8 +365,8 @@ public class MatchConvertor extends Convertor, VersionCo if (vlanMatch.getVlanId() != null) { VlanId vlanId = vlanMatch.getVlanId(); MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder(); - matchEntryBuilder.setOxmClass(OpenflowBasicClass.class); - matchEntryBuilder.setOxmMatchField(VlanVid.class); + matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + matchEntryBuilder.setOxmMatchField(VlanVid.VALUE); VlanVidBuilder vlanVidBuilder = new VlanVidBuilder(); boolean setCfiBit = false; Uint16 vidEntryValue = Uint16.ZERO; @@ -406,8 +406,8 @@ public class MatchConvertor extends Convertor, VersionCo EthernetDestination ethernetDestination = ethernetMatch.getEthernetDestination(); if (ethernetDestination != null) { MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder(); - matchEntryBuilder.setOxmClass(OpenflowBasicClass.class); - matchEntryBuilder.setOxmMatchField(EthDst.class); + matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + matchEntryBuilder.setOxmMatchField(EthDst.VALUE); EthDstCaseBuilder ethDstCaseBuilder = new EthDstCaseBuilder(); EthDstBuilder ethDstBuilder = new EthDstBuilder(); ethDstBuilder.setMacAddress(ethernetDestination.getAddress()); @@ -426,8 +426,8 @@ public class MatchConvertor extends Convertor, VersionCo EthernetSource ethernetSource = ethernetMatch.getEthernetSource(); if (ethernetSource != null) { MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder(); - matchEntryBuilder.setOxmClass(OpenflowBasicClass.class); - matchEntryBuilder.setOxmMatchField(EthSrc.class); + matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + matchEntryBuilder.setOxmMatchField(EthSrc.VALUE); EthSrcCaseBuilder ethSrcCaseBuilder = new EthSrcCaseBuilder(); EthSrcBuilder ethDstBuilder = new EthSrcBuilder(); ethDstBuilder.setMacAddress(ethernetSource.getAddress()); @@ -451,10 +451,10 @@ public class MatchConvertor extends Convertor, VersionCo private static void tcpFlagsMatch(final List matchEntryList, final TcpFlagsMatch tcpFlagsMatch) { ExperimenterIdCaseBuilder expIdCaseBuilder = new ExperimenterIdCaseBuilder(); if (tcpFlagsMatch != null) { - MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder(); - matchEntryBuilder.setOxmClass(ExperimenterClass.class); - matchEntryBuilder.setHasMask(false); - matchEntryBuilder.setOxmMatchField(TcpFlags.class); + MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder() + .setOxmClass(ExperimenterClass.VALUE) + .setHasMask(false) + .setOxmMatchField(TcpFlags.VALUE); TcpFlagsContainerBuilder tcpFlagsContainerBuilder = new TcpFlagsContainerBuilder(); TcpFlagsBuilder tcpFlagsBuilder = new TcpFlagsBuilder(); @@ -479,8 +479,8 @@ public class MatchConvertor extends Convertor, VersionCo private static MatchEntry toOfMplsPbb(final Pbb pbb) { MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder(); final boolean hasmask = pbb.getPbbMask() != null; - matchEntryBuilder.setOxmClass(OpenflowBasicClass.class); - matchEntryBuilder.setOxmMatchField(PbbIsid.class); + matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE); + matchEntryBuilder.setOxmMatchField(PbbIsid.VALUE); PbbIsidCaseBuilder pbbIsidCaseBuilder = new PbbIsidCaseBuilder(); PbbIsidBuilder pbbIsidBuilder = new PbbIsidBuilder(); pbbIsidBuilder.setIsid(pbb.getPbbIsid()); @@ -497,9 +497,9 @@ public class MatchConvertor extends Convertor, VersionCo private static MatchEntry toOfMplsTc(final Uint8 mplsTc) { return new MatchEntryBuilder() - .setOxmClass(OpenflowBasicClass.class) + .setOxmClass(OpenflowBasicClass.VALUE) .setHasMask(Boolean.FALSE) - .setOxmMatchField(MplsTc.class) + .setOxmMatchField(MplsTc.VALUE) .setMatchEntryValue(new MplsTcCaseBuilder() .setMplsTc(new MplsTcBuilder().setTc(mplsTc).build()) .build()) @@ -508,9 +508,9 @@ public class MatchConvertor extends Convertor, VersionCo private static MatchEntry toOfMplsBos(final Uint8 mplsBos) { return new MatchEntryBuilder() - .setOxmClass(OpenflowBasicClass.class) + .setOxmClass(OpenflowBasicClass.VALUE) .setHasMask(Boolean.FALSE) - .setOxmMatchField(MplsBos.class) + .setOxmMatchField(MplsBos.VALUE) .setMatchEntryValue(new MplsBosCaseBuilder() .setMplsBos(new MplsBosBuilder().setBos(mplsBos.toJava() != 0).build()) .build()) @@ -519,9 +519,9 @@ public class MatchConvertor extends Convertor, VersionCo private static MatchEntry toOfMplsLabel(final Uint32 mplsLabel) { return new MatchEntryBuilder() - .setOxmClass(OpenflowBasicClass.class) + .setOxmClass(OpenflowBasicClass.VALUE) .setHasMask(Boolean.FALSE) - .setOxmMatchField(MplsLabel.class) + .setOxmMatchField(MplsLabel.VALUE) .setMatchEntryValue(new MplsLabelCaseBuilder() .setMplsLabel(new MplsLabelBuilder().setMplsLabel(mplsLabel).build()) .build()) @@ -530,9 +530,9 @@ public class MatchConvertor extends Convertor, VersionCo private static MatchEntry toOfEthernetType(final EthernetType ethernetType) { MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder(); - matchEntryBuilder.setOxmClass(OpenflowBasicClass.class); + matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE); matchEntryBuilder.setHasMask(false); - matchEntryBuilder.setOxmMatchField(EthType.class); + matchEntryBuilder.setOxmMatchField(EthType.VALUE); EthTypeCaseBuilder ethTypeCaseBuilder = new EthTypeCaseBuilder(); EthTypeBuilder ethTypeBuilder = new EthTypeBuilder(); EtherType etherType = new EtherType(ethernetType.getType().getValue().toUint16()); @@ -544,9 +544,9 @@ public class MatchConvertor extends Convertor, VersionCo private static MatchEntry toOfIcmpv4Type(final Uint8 icmpv4Type) { return new MatchEntryBuilder() - .setOxmClass(OpenflowBasicClass.class) + .setOxmClass(OpenflowBasicClass.VALUE) .setHasMask(Boolean.FALSE) - .setOxmMatchField(Icmpv4Type.class) + .setOxmMatchField(Icmpv4Type.VALUE) .setMatchEntryValue(new Icmpv4TypeCaseBuilder() .setIcmpv4Type(new Icmpv4TypeBuilder().setIcmpv4Type(icmpv4Type).build()) .build()) @@ -555,9 +555,9 @@ public class MatchConvertor extends Convertor, VersionCo private static MatchEntry toOfIcmpv4Code(final Uint8 icmpv4Code) { return new MatchEntryBuilder() - .setOxmClass(OpenflowBasicClass.class) + .setOxmClass(OpenflowBasicClass.VALUE) .setHasMask(Boolean.FALSE) - .setOxmMatchField(Icmpv4Code.class) + .setOxmMatchField(Icmpv4Code.VALUE) .setMatchEntryValue(new Icmpv4CodeCaseBuilder() .setIcmpv4Code(new Icmpv4CodeBuilder().setIcmpv4Code(icmpv4Code).build()).build()) .build(); @@ -565,9 +565,9 @@ public class MatchConvertor extends Convertor, VersionCo private static MatchEntry toOfIcmpv6Type(final Uint8 icmpv6Type) { return new MatchEntryBuilder() - .setOxmClass(OpenflowBasicClass.class) + .setOxmClass(OpenflowBasicClass.VALUE) .setHasMask(Boolean.FALSE) - .setOxmMatchField(Icmpv6Type.class) + .setOxmMatchField(Icmpv6Type.VALUE) .setMatchEntryValue(new Icmpv6TypeCaseBuilder() .setIcmpv6Type(new Icmpv6TypeBuilder().setIcmpv6Type(icmpv6Type).build()) .build()) @@ -576,9 +576,9 @@ public class MatchConvertor extends Convertor, VersionCo private static MatchEntry toOfIcmpv6Code(final Uint8 icmpv6Code) { return new MatchEntryBuilder() - .setOxmClass(OpenflowBasicClass.class) + .setOxmClass(OpenflowBasicClass.VALUE) .setHasMask(Boolean.FALSE) - .setOxmMatchField(Icmpv6Code.class) + .setOxmMatchField(Icmpv6Code.VALUE) .setMatchEntryValue(new Icmpv6CodeCaseBuilder() .setIcmpv6Code(new Icmpv6CodeBuilder().setIcmpv6Code(icmpv6Code).build()) .build()) @@ -587,9 +587,9 @@ public class MatchConvertor extends Convertor, VersionCo private static MatchEntry toOfIpProto(final Uint8 ipProtocol) { return new MatchEntryBuilder() - .setOxmClass(OpenflowBasicClass.class) + .setOxmClass(OpenflowBasicClass.VALUE) .setHasMask(Boolean.FALSE) - .setOxmMatchField(IpProto.class) + .setOxmMatchField(IpProto.VALUE) .setMatchEntryValue(new IpProtoCaseBuilder() .setIpProto(new IpProtoBuilder().setProtocolNumber(ipProtocol).build()) .build()) @@ -598,9 +598,9 @@ public class MatchConvertor extends Convertor, VersionCo private static MatchEntry toOfIpEcn(final Uint8 ipEcn) { return new MatchEntryBuilder() - .setOxmClass(OpenflowBasicClass.class) + .setOxmClass(OpenflowBasicClass.VALUE) .setHasMask(Boolean.FALSE) - .setOxmMatchField(IpEcn.class) + .setOxmMatchField(IpEcn.VALUE) .setMatchEntryValue(new IpEcnCaseBuilder().setIpEcn(new IpEcnBuilder().setEcn(ipEcn).build()).build()) .build(); } diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorUtil.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorUtil.java index 6df9cbb72a..ff9fda0c8a 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorUtil.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorUtil.java @@ -97,9 +97,9 @@ public final class MatchConvertorUtil { */ public static MatchEntry toOfIpDscp(final Dscp ipDscp) { MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder(); - matchEntryBuilder.setOxmClass(OpenflowBasicClass.class); + matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE); matchEntryBuilder.setHasMask(false); - matchEntryBuilder.setOxmMatchField(IpDscp.class); + matchEntryBuilder.setOxmMatchField(IpDscp.VALUE); IpDscpCaseBuilder ipDscpCaseBuilder = new IpDscpCaseBuilder(); IpDscpBuilder ipDscpBuilder = new IpDscpBuilder(); @@ -118,9 +118,9 @@ public final class MatchConvertorUtil { public static MatchEntry toOfVlanPcp( final org.opendaylight.yang.gen.v1.urn.opendaylight.l2.types.rev130827.VlanPcp vlanPcp) { MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder(); - matchEntryBuilder.setOxmClass(OpenflowBasicClass.class); + matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE); matchEntryBuilder.setHasMask(false); - matchEntryBuilder.setOxmMatchField(VlanPcp.class); + matchEntryBuilder.setOxmMatchField(VlanPcp.VALUE); VlanPcpCaseBuilder vlanPcpCaseBuilder = new VlanPcpCaseBuilder(); VlanPcpBuilder vlanPcpBuilder = new VlanPcpBuilder(); vlanPcpBuilder.setVlanPcp(vlanPcp.getValue()); diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchResponseConvertor.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchResponseConvertor.java index e410408297..c84162826a 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchResponseConvertor.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchResponseConvertor.java @@ -80,8 +80,6 @@ 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.MatchEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.MatchEntryValue; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.Match; -import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TunnelIpv4Dst; -import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TunnelIpv4Src; /** * Converts Openflow 1.3+ specific flow match to MD-SAL format flow match. @@ -179,23 +177,22 @@ public class MatchResponseConvertor extends Convertor oxmMatchField; + private MatchField oxmMatchField; /** * Instantiates a new Match convertor data. @@ -377,7 +377,7 @@ public class MatchResponseConvertorData extends VersionDatapathIdConvertorData { * * @param oxmMatchField the oxm match field */ - public void setOxmMatchField(final Class oxmMatchField) { + public void setOxmMatchField(final MatchField oxmMatchField) { this.oxmMatchField = oxmMatchField; } @@ -386,7 +386,7 @@ public class MatchResponseConvertorData extends VersionDatapathIdConvertorData { * * @return the oxm match field */ - public Class getOxmMatchField() { + public MatchField getOxmMatchField() { return oxmMatchField; } } diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/extension/ExtensionConverterManagerImplTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/extension/ExtensionConverterManagerImplTest.java index fabd7639fc..641b834d77 100644 --- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/extension/ExtensionConverterManagerImplTest.java +++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/extension/ExtensionConverterManagerImplTest.java @@ -51,7 +51,7 @@ public class ExtensionConverterManagerImplTest { @Before public void setUp() { manager = new ExtensionConverterManagerImpl(); - keyFromOFJava = new ExperimenterActionSerializerKey(Uint8.ONE, Uint32.valueOf(42), ExpSubType.class); + keyFromOFJava = new ExperimenterActionSerializerKey(Uint8.ONE, Uint32.valueOf(42), ExpSubType.VALUE); regFromOFJava = manager.registerActionConvertor(keyFromOFJava, extConvertorFromOFJava); keyToOFJava = new TypeVersionKey<>(ActionExpCase.class, Uint8.ONE); diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/extension/MatchExtensionHelperTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/extension/MatchExtensionHelperTest.java index ca3eca65d1..6958dffad7 100644 --- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/extension/MatchExtensionHelperTest.java +++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/extension/MatchExtensionHelperTest.java @@ -40,10 +40,10 @@ public class MatchExtensionHelperTest { @Mock private ExtensionConverterProvider extensionConverterProvider; - private static final MatchEntrySerializerKey KEY_1 = - new MatchEntrySerializerKey<>(OpenflowVersion.OF13.getVersion(), MockOxmClassBase.class, MockMatchField1.class); - private static final MatchEntrySerializerKey KEY_2 = - new MatchEntrySerializerKey<>(OpenflowVersion.OF13.getVersion(), MockOxmClassBase.class, MockMatchField2.class); + private static final MatchEntrySerializerKey KEY_1 = + new MatchEntrySerializerKey<>(OpenflowVersion.OF13.getVersion(), MockOxmClassBase.VALUE, MockMatchField1.VALUE); + private static final MatchEntrySerializerKey KEY_2 = + new MatchEntrySerializerKey<>(OpenflowVersion.OF13.getVersion(), MockOxmClassBase.VALUE, MockMatchField2.VALUE); @Before public void setup() { @@ -51,12 +51,12 @@ public class MatchExtensionHelperTest { when(extensionConverterProvider.getConverter(KEY_1)) .thenReturn((input, path) -> { MockAugmentation mockAugmentation = new MockAugmentation(); - return new ExtensionAugment<>(MockAugmentation.class, mockAugmentation, MockExtensionKey1.class); + return new ExtensionAugment<>(MockAugmentation.class, mockAugmentation, MockExtensionKey1.VALUE); }); when(extensionConverterProvider.getConverter(KEY_2)) .thenReturn((input, path) -> { MockAugmentation mockAugmentation = new MockAugmentation(); - return new ExtensionAugment<>(MockAugmentation.class, mockAugmentation, MockExtensionKey2.class); + return new ExtensionAugment<>(MockAugmentation.class, mockAugmentation, MockExtensionKey2.VALUE); }); } @@ -86,39 +86,41 @@ public class MatchExtensionHelperTest { private static List createMatchEntrieses() { MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder(); matchEntryBuilder.setHasMask(true); - matchEntryBuilder.setOxmClass(MockOxmClassBase.class); - matchEntryBuilder.setOxmMatchField(MockMatchField1.class); + matchEntryBuilder.setOxmClass(MockOxmClassBase.VALUE); + matchEntryBuilder.setOxmMatchField(MockMatchField1.VALUE); List matchEntries = new ArrayList<>(); matchEntries.add(matchEntryBuilder.build()); MatchEntryBuilder matchEntryBuilder1 = new MatchEntryBuilder(); matchEntryBuilder1.setHasMask(true); - matchEntryBuilder1.setOxmClass(MockOxmClassBase.class); - matchEntryBuilder1.setOxmMatchField(MockMatchField2.class); + matchEntryBuilder1.setOxmClass(MockOxmClassBase.VALUE); + matchEntryBuilder1.setOxmMatchField(MockMatchField2.VALUE); matchEntries.add(matchEntryBuilder1.build()); return matchEntries; } private interface MockOxmClassBase extends OxmClassBase { - + MockOxmClassBase VALUE = () -> MockOxmClassBase.class; } - private class MockMatchField1 implements MatchField { + private interface MockMatchField1 extends MatchField { + MockMatchField1 VALUE = () -> MockMatchField1.class; } - private class MockMatchField2 implements MatchField { + private interface MockMatchField2 extends MatchField { + MockMatchField2 VALUE = () -> MockMatchField2.class; } private interface MockExtensionKey1 extends ExtensionKey { - + MockExtensionKey1 VALUE = () -> MockExtensionKey1.class; } private interface MockExtensionKey2 extends ExtensionKey { - + MockExtensionKey2 VALUE = () -> MockExtensionKey2.class; } - private final class MockAugmentation implements Augmentation { + private static final class MockAugmentation implements Augmentation { @Override public Class implementedInterface() { return MockAugmentation.class; diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/TableFeaturesConvertorTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/TableFeaturesConvertorTest.java index 8f03fb82cb..56e3ed0ac6 100644 --- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/TableFeaturesConvertorTest.java +++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/TableFeaturesConvertorTest.java @@ -95,133 +95,133 @@ public class TableFeaturesConvertorTest { private static final Map FIELD_TABLE_FEATURES = BindingMap.ordered( new SetFieldMatchBuilder().setHasMask(true) - .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpOp.class) + .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpOp.VALUE) .build(), new SetFieldMatchBuilder().setHasMask(true) - .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpSha.class) + .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpSha.VALUE) .build(), new SetFieldMatchBuilder().setHasMask(true) - .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpSpa.class) + .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpSpa.VALUE) .build(), new SetFieldMatchBuilder().setHasMask(true) - .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpTha.class) + .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpTha.VALUE) .build(), new SetFieldMatchBuilder().setHasMask(true) - .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpTpa.class) + .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpTpa.VALUE) .build(), new SetFieldMatchBuilder().setHasMask(true) - .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthDst.class) + .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthDst.VALUE) .build(), new SetFieldMatchBuilder().setHasMask(true) - .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthSrc.class) + .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthSrc.VALUE) .build(), new SetFieldMatchBuilder().setHasMask(true) - .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthType.class) + .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthType.VALUE) .build(), new SetFieldMatchBuilder().setHasMask(true) - .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv4Code.class) + .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv4Code.VALUE) .build(), new SetFieldMatchBuilder().setHasMask(true) - .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv4Type.class) + .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv4Type.VALUE) .build(), new SetFieldMatchBuilder().setHasMask(true) - .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv6Code.class) + .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv6Code.VALUE) .build(), new SetFieldMatchBuilder().setHasMask(true) - .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv6Type.class) + .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv6Type.VALUE) .build(), new SetFieldMatchBuilder().setHasMask(true) - .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.InPhyPort.class) + .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.InPhyPort.VALUE) .build(), new SetFieldMatchBuilder().setHasMask(true) - .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.InPort.class) + .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.InPort.VALUE) .build(), new SetFieldMatchBuilder().setHasMask(true) - .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpDscp.class) + .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpDscp.VALUE) .build(), new SetFieldMatchBuilder().setHasMask(true) - .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpEcn.class) + .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpEcn.VALUE) .build(), new SetFieldMatchBuilder().setHasMask(true) - .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpProto.class) + .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpProto.VALUE) .build(), new SetFieldMatchBuilder().setHasMask(true) - .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv4Dst.class) + .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv4Dst.VALUE) .build(), new SetFieldMatchBuilder().setHasMask(true) - .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv4Src.class) + .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv4Src.VALUE) .build(), new SetFieldMatchBuilder().setHasMask(true) - .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Dst.class) + .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Dst.VALUE) .build(), new SetFieldMatchBuilder().setHasMask(true) - .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Exthdr.class) + .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Exthdr.VALUE) .build(), new SetFieldMatchBuilder().setHasMask(true) - .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Flabel.class) + .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Flabel.VALUE) .build(), new SetFieldMatchBuilder().setHasMask(true) - .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6NdSll.class) + .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6NdSll.VALUE) .build(), new SetFieldMatchBuilder().setHasMask(true) - .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6NdTarget.class) + .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6NdTarget.VALUE) .build(), new SetFieldMatchBuilder().setHasMask(true) - .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6NdTll.class) + .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6NdTll.VALUE) .build(), new SetFieldMatchBuilder().setHasMask(true) - .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Src.class) + .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Src.VALUE) .build(), new SetFieldMatchBuilder().setHasMask(true) - .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Metadata.class) + .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Metadata.VALUE) .build(), new SetFieldMatchBuilder().setHasMask(true) - .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.MplsBos.class) + .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.MplsBos.VALUE) .build(), new SetFieldMatchBuilder().setHasMask(true) - .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.MplsLabel.class) + .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.MplsLabel.VALUE) .build(), new SetFieldMatchBuilder().setHasMask(true) - .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.MplsTc.class) + .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.MplsTc.VALUE) .build(), new SetFieldMatchBuilder().setHasMask(true) - .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.PbbIsid.class) + .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.PbbIsid.VALUE) .build(), new SetFieldMatchBuilder().setHasMask(true) - .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.SctpDst.class) + .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.SctpDst.VALUE) .build(), new SetFieldMatchBuilder().setHasMask(true) - .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.SctpSrc.class) + .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.SctpSrc.VALUE) .build(), new SetFieldMatchBuilder().setHasMask(true) - .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TcpDst.class) + .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TcpDst.VALUE) .build(), new SetFieldMatchBuilder().setHasMask(true) - .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TcpSrc.class) + .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TcpSrc.VALUE) .build(), new SetFieldMatchBuilder().setHasMask(true) - .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TunnelId.class) + .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TunnelId.VALUE) .build(), new SetFieldMatchBuilder().setHasMask(true) - .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.UdpDst.class) + .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.UdpDst.VALUE) .build(), new SetFieldMatchBuilder().setHasMask(true) - .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.UdpSrc.class) + .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.UdpSrc.VALUE) .build(), new SetFieldMatchBuilder().setHasMask(true) - .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.VlanPcp.class) + .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.VlanPcp.VALUE) .build(), new SetFieldMatchBuilder().setHasMask(true) - .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.VlanVid.class) + .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.VlanVid.VALUE) .build(), new SetFieldMatchBuilder().setHasMask(true) - .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TcpFlags.class) + .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TcpFlags.VALUE) .build(), new SetFieldMatchBuilder().setHasMask(true) - .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TunnelIpv4Dst.class) + .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TunnelIpv4Dst.VALUE) .build(), new SetFieldMatchBuilder().setHasMask(true) - .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TunnelIpv4Src.class) + .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TunnelIpv4Src.VALUE) .build()); private static final Map, TableFeaturePropType> AUGMENTATIONS_MAP = diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/TableFeaturesResponseConvertorTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/TableFeaturesResponseConvertorTest.java index 49f7e114fe..a5e76bcf29 100644 --- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/TableFeaturesResponseConvertorTest.java +++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/TableFeaturesResponseConvertorTest.java @@ -298,15 +298,15 @@ public class TableFeaturesResponseConvertorTest { propBuilder = new TableFeaturePropertiesBuilder(); propBuilder.setType(TableFeaturesPropType.OFPTFPTMATCH); MatchEntryBuilder entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(InPhyPort.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(InPhyPort.VALUE); entriesBuilder.setHasMask(false); List entries = new ArrayList<>(); entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(InPort.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(InPort.VALUE); entriesBuilder.setHasMask(false); entries.add(entriesBuilder.build()); @@ -319,13 +319,13 @@ public class TableFeaturesResponseConvertorTest { propBuilder.setType(TableFeaturesPropType.OFPTFPTAPPLYSETFIELD); entries = new ArrayList<>(); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(IpProto.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(IpProto.VALUE); entriesBuilder.setHasMask(false); entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(IpEcn.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(IpEcn.VALUE); entriesBuilder.setHasMask(false); entries.add(entriesBuilder.build()); propBuilder.addAugmentation(new OxmRelatedTableFeaturePropertyBuilder().setMatchEntry(entries).build()); @@ -337,13 +337,13 @@ public class TableFeaturesResponseConvertorTest { propBuilder.setType(TableFeaturesPropType.OFPTFPTWRITESETFIELD); entries = new ArrayList<>(); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Ipv6Exthdr.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Ipv6Exthdr.VALUE); entriesBuilder.setHasMask(false); entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(VlanVid.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(VlanVid.VALUE); entriesBuilder.setHasMask(false); entries.add(entriesBuilder.build()); propBuilder.addAugmentation(new OxmRelatedTableFeaturePropertyBuilder().setMatchEntry(entries).build()); @@ -355,13 +355,13 @@ public class TableFeaturesResponseConvertorTest { propBuilder.setType(TableFeaturesPropType.OFPTFPTWRITESETFIELDMISS); entries = new ArrayList<>(); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(VlanPcp.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(VlanPcp.VALUE); entriesBuilder.setHasMask(false); entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(TcpSrc.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(TcpSrc.VALUE); entriesBuilder.setHasMask(false); entries.add(entriesBuilder.build()); propBuilder.addAugmentation(new OxmRelatedTableFeaturePropertyBuilder().setMatchEntry(entries).build()); @@ -373,14 +373,14 @@ public class TableFeaturesResponseConvertorTest { propBuilder.setType(TableFeaturesPropType.OFPTFPTAPPLYSETFIELDMISS); entries = new ArrayList<>(); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(UdpSrc.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(UdpSrc.VALUE); entriesBuilder.setHasMask(false); entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(UdpDst.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(UdpDst.VALUE); entriesBuilder.setHasMask(false); entries.add(entriesBuilder.build()); @@ -394,14 +394,14 @@ public class TableFeaturesResponseConvertorTest { entries = new ArrayList<>(); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(EthSrc.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(EthSrc.VALUE); entriesBuilder.setHasMask(false); entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(EthDst.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(EthDst.VALUE); entriesBuilder.setHasMask(false); entries.add(entriesBuilder.build()); @@ -599,10 +599,10 @@ public class TableFeaturesResponseConvertorTest { Collection fieldMatch = propType5.getMatchSetfield().nonnullSetFieldMatch().values(); Assert.assertEquals("Wrong match-entry-ids size", 2, fieldMatch.size()); Iterator fieldIt = fieldMatch.iterator(); - Assert.assertEquals("Wrong match-entry-id", "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types." - + "rev131026.InPhyPort", fieldIt.next().getMatchType().getName()); - Assert.assertEquals("Wrong match-entry-id", "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types." - + "rev131026.InPort", fieldIt.next().getMatchType().getName()); + Assert.assertEquals(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.InPhyPort.VALUE, + fieldIt.next().getMatchType()); + Assert.assertEquals(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.InPort.VALUE, + fieldIt.next().getMatchType()); property = featProps.next(); Assert.assertEquals("Wrong property type", "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types." + "rev131026.table.feature.prop.type.table.feature.prop.type.ApplySetfield", @@ -611,12 +611,10 @@ public class TableFeaturesResponseConvertorTest { fieldMatch = propType6.getApplySetfield().nonnullSetFieldMatch().values(); Assert.assertEquals("Wrong match-entry-ids size", 2, fieldMatch.size()); fieldIt = fieldMatch.iterator(); - Assert.assertEquals("Wrong match-entry-id", - "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpProto", - fieldIt.next().getMatchType().getName()); - Assert.assertEquals("Wrong match-entry-id", - "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpEcn", - fieldIt.next().getMatchType().getName()); + Assert.assertEquals(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpProto.VALUE, + fieldIt.next().getMatchType()); + Assert.assertEquals(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpEcn.VALUE, + fieldIt.next().getMatchType()); property = featProps.next(); Assert.assertEquals("Wrong property type", "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types." + "rev131026.table.feature.prop.type.table.feature.prop.type.WriteSetfield", @@ -625,12 +623,10 @@ public class TableFeaturesResponseConvertorTest { fieldMatch = propType7.getWriteSetfield().nonnullSetFieldMatch().values(); Assert.assertEquals("Wrong match-entry-ids size", 2, fieldMatch.size()); fieldIt = fieldMatch.iterator(); - Assert.assertEquals("Wrong match-entry-id", - "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Exthdr", - fieldIt.next().getMatchType().getName()); - Assert.assertEquals("Wrong match-entry-id", - "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.VlanVid", - fieldIt.next().getMatchType().getName()); + Assert.assertEquals(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Exthdr.VALUE, + fieldIt.next().getMatchType()); + Assert.assertEquals(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.VlanVid.VALUE, + fieldIt.next().getMatchType()); property = featProps.next(); Assert.assertEquals("Wrong property type", "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types." + "rev131026.table.feature.prop.type.table.feature.prop.type.WriteSetfieldMiss", @@ -639,12 +635,10 @@ public class TableFeaturesResponseConvertorTest { fieldMatch = propType8.getWriteSetfieldMiss().nonnullSetFieldMatch().values(); Assert.assertEquals("Wrong match-entry-ids size", 2, fieldMatch.size()); fieldIt = fieldMatch.iterator(); - Assert.assertEquals("Wrong match-entry-id", - "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.VlanPcp", - fieldIt.next().getMatchType().getName()); - Assert.assertEquals("Wrong match-entry-id", - "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TcpSrc", - fieldIt.next().getMatchType().getName()); + Assert.assertEquals(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.VlanPcp.VALUE, + fieldIt.next().getMatchType()); + Assert.assertEquals(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TcpSrc.VALUE, + fieldIt.next().getMatchType()); property = featProps.next(); Assert.assertEquals("Wrong property type", "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types." + "rev131026.table.feature.prop.type.table.feature.prop.type.ApplySetfieldMiss", @@ -653,12 +647,10 @@ public class TableFeaturesResponseConvertorTest { fieldMatch = propType9.getApplySetfieldMiss().nonnullSetFieldMatch().values(); Assert.assertEquals("Wrong match-entry-ids size", 2, fieldMatch.size()); fieldIt = fieldMatch.iterator(); - Assert.assertEquals("Wrong match-entry-id", - "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.UdpSrc", - fieldIt.next().getMatchType().getName()); - Assert.assertEquals("Wrong match-entry-id", - "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.UdpDst", - fieldIt.next().getMatchType().getName()); + Assert.assertEquals(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.UdpSrc.VALUE, + fieldIt.next().getMatchType()); + Assert.assertEquals(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.UdpDst.VALUE, + fieldIt.next().getMatchType()); property = featProps.next(); Assert.assertEquals("Wrong property type", "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types." + "rev131026.table.feature.prop.type.table.feature.prop.type.Wildcards", @@ -667,12 +659,10 @@ public class TableFeaturesResponseConvertorTest { fieldMatch = propType10.getWildcardSetfield().nonnullSetFieldMatch().values(); Assert.assertEquals("Wrong match-entry-ids size", 2, fieldMatch.size()); fieldIt = fieldMatch.iterator(); - Assert.assertEquals("Wrong match-entry-id", - "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthSrc", - fieldIt.next().getMatchType().getName()); - Assert.assertEquals("Wrong match-entry-id", - "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthDst", - fieldIt.next().getMatchType().getName()); + Assert.assertEquals(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthSrc.VALUE, + fieldIt.next().getMatchType()); + Assert.assertEquals(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthDst.VALUE, + fieldIt.next().getMatchType()); property = featProps.next(); Assert.assertEquals("Wrong property type", "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types." diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/ActionConvertorV13Test.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/ActionConvertorV13Test.java index d090cf83ed..027848246d 100644 --- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/ActionConvertorV13Test.java +++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/ActionConvertorV13Test.java @@ -8,7 +8,6 @@ package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Optional; import org.junit.Assert; @@ -143,7 +142,7 @@ public class ActionConvertorV13Test { Optional> mdSalActions = convertorManager.convert(actions, data); - Assert.assertEquals("Wrong number of output actions", 0, mdSalActions.orElse(Collections.emptyList()).size()); + Assert.assertEquals("Wrong number of output actions", 0, mdSalActions.orElse(List.of()).size()); } /** @@ -241,8 +240,8 @@ public class ActionConvertorV13Test { actionBuilder = new ActionBuilder(); MatchEntryBuilder matchBuilder = new MatchEntryBuilder(); - matchBuilder.setOxmClass(OpenflowBasicClass.class); - matchBuilder.setOxmMatchField(InPort.class); + matchBuilder.setOxmClass(OpenflowBasicClass.VALUE); + matchBuilder.setOxmMatchField(InPort.VALUE); matchBuilder.setHasMask(false); InPortCaseBuilder inPortCaseBuilder = new InPortCaseBuilder(); InPortBuilder inPortBuilder = new InPortBuilder(); @@ -289,7 +288,7 @@ public class ActionConvertorV13Test { .Action>> mdSalActionsOptional = convertorManager.convert(actions, data); List mdSalActions = mdSalActionsOptional.orElse(Collections.emptyList()); + .Action> mdSalActions = mdSalActionsOptional.orElse(List.of()); Assert.assertEquals("Wrong number of output actions", 16, mdSalActions.size()); org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action = mdSalActions.get(0); @@ -516,7 +515,7 @@ public class ActionConvertorV13Test { data.setIpProtocol(FlowConvertorUtil.getIpProtocolFromFlow(flow)); Optional> actionsOptional = convertorManager.convert(salActions, data); - List actions = actionsOptional.orElse(Collections.emptyList()); + List actions = actionsOptional.orElse(List.of()); Assert.assertEquals("Wrong number of actions", 12, actions.size()); Action action = actions.get(0); @@ -529,7 +528,7 @@ public class ActionConvertorV13Test { .action.choice.SetFieldCase) action.getActionChoice(); MatchEntry entry = setFieldCase.getSetFieldAction().getMatchEntry().get(0); checkEntryHeader(entry, - org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.VlanPcp.class, false); + org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.VlanPcp.VALUE, false); Assert.assertEquals("Wrong vlan pcp", 7, ((VlanPcpCase) entry.getMatchEntryValue()).getVlanPcp().getVlanPcp() .intValue()); @@ -541,7 +540,7 @@ public class ActionConvertorV13Test { .action.choice.SetFieldCase) action.getActionChoice(); entry = setFieldCase.getSetFieldAction().getMatchEntry().get(0); checkEntryHeader(entry, - org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.VlanVid.class, false); + org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.VlanVid.VALUE, false); Assert.assertEquals("Wrong vlan vid", 0, ((VlanVidCase) entry.getMatchEntryValue()).getVlanVid().getVlanVid() .intValue()); Assert.assertEquals("Wrong cfi bit", true, ((VlanVidCase) entry.getMatchEntryValue()).getVlanVid().getCfiBit()); @@ -554,7 +553,7 @@ public class ActionConvertorV13Test { .action.choice.SetFieldCase) action.getActionChoice(); entry = setFieldCase.getSetFieldAction().getMatchEntry().get(0); checkEntryHeader(entry, - org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.EthDst.class, false); + org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.EthDst.VALUE, false); Assert.assertEquals("Wrong dl dst", "00:00:00:00:00:06", ((EthDstCase) entry.getMatchEntryValue()).getEthDst() .getMacAddress().getValue()); @@ -566,7 +565,7 @@ public class ActionConvertorV13Test { action.getActionChoice().implementedInterface().getName()); entry = setFieldCase.getSetFieldAction().getMatchEntry().get(0); checkEntryHeader(entry, - org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.EthSrc.class, false); + org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.EthSrc.VALUE, false); Assert.assertEquals("Wrong dl src", "00:00:00:00:00:05", ((EthSrcCase) entry.getMatchEntryValue()).getEthSrc() .getMacAddress().getValue()); @@ -578,7 +577,7 @@ public class ActionConvertorV13Test { action.getActionChoice().implementedInterface().getName()); entry = setFieldCase.getSetFieldAction().getMatchEntry().get(0); checkEntryHeader(entry, - org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Ipv4Src.class, false); + org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Ipv4Src.VALUE, false); Assert.assertEquals("Wrong ipv4 src", "10.0.0.0", ((Ipv4SrcCase) entry.getMatchEntryValue()).getIpv4Src() .getIpv4Address().getValue()); @@ -590,7 +589,7 @@ public class ActionConvertorV13Test { action.getActionChoice().implementedInterface().getName()); entry = setFieldCase.getSetFieldAction().getMatchEntry().get(0); checkEntryHeader(entry, - org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Ipv4Dst.class, false); + org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Ipv4Dst.VALUE, false); Assert.assertEquals("Wrong ipv4 dst", "10.0.0.2", ((Ipv4DstCase) entry.getMatchEntryValue()).getIpv4Dst() .getIpv4Address().getValue()); @@ -602,7 +601,7 @@ public class ActionConvertorV13Test { action.getActionChoice().implementedInterface().getName()); entry = setFieldCase.getSetFieldAction().getMatchEntry().get(0); checkEntryHeader(entry, - org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.TcpSrc.class, false); + org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.TcpSrc.VALUE, false); Assert.assertEquals("Wrong tcp src", 54, ((TcpSrcCase) entry.getMatchEntryValue()).getTcpSrc() .getPort().getValue().intValue()); @@ -614,7 +613,7 @@ public class ActionConvertorV13Test { action.getActionChoice().implementedInterface().getName()); entry = setFieldCase.getSetFieldAction().getMatchEntry().get(0); checkEntryHeader(entry, - org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.TcpDst.class, false); + org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.TcpDst.VALUE, false); Assert.assertEquals("Wrong tcp dst", 45, ((TcpDstCase) entry.getMatchEntryValue()).getTcpDst() .getPort().getValue().intValue()); @@ -626,7 +625,7 @@ public class ActionConvertorV13Test { action.getActionChoice().implementedInterface().getName()); entry = setFieldCase.getSetFieldAction().getMatchEntry().get(0); checkEntryHeader(entry, - org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.IpDscp.class, false); + org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.IpDscp.VALUE, false); Assert.assertEquals("Wrong ip dscp", 4, ((IpDscpCase) entry.getMatchEntryValue()).getIpDscp() .getDscp().getValue().intValue()); @@ -638,7 +637,7 @@ public class ActionConvertorV13Test { action.getActionChoice().implementedInterface().getName()); entry = setFieldCase.getSetFieldAction().getMatchEntry().get(0); checkEntryHeader(entry, - org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.VlanVid.class, false); + org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.VlanVid.VALUE, false); Assert.assertEquals("Wrong vlan id", 22, ((VlanVidCase) entry.getMatchEntryValue()).getVlanVid() .getVlanVid().intValue()); Assert.assertEquals("Wrong cfi bit", true, ((VlanVidCase) entry.getMatchEntryValue()).getVlanVid() @@ -652,7 +651,7 @@ public class ActionConvertorV13Test { action.getActionChoice().implementedInterface().getName()); entry = setFieldCase.getSetFieldAction().getMatchEntry().get(0); checkEntryHeader(entry, - org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Ipv6Src.class, false); + org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Ipv6Src.VALUE, false); Assert.assertEquals("Wrong ipv6 src", "::5", ((Ipv6SrcCase) entry.getMatchEntryValue()).getIpv6Src().getIpv6Address().getValue()); @@ -664,14 +663,14 @@ public class ActionConvertorV13Test { action.getActionChoice().implementedInterface().getName()); entry = setFieldCase.getSetFieldAction().getMatchEntry().get(0); checkEntryHeader(entry, - org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Ipv6Dst.class, false); + org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Ipv6Dst.VALUE, false); Assert.assertEquals("Wrong ipv6 dst", "::", ((Ipv6DstCase) entry.getMatchEntryValue()).getIpv6Dst().getIpv6Address().getValue()); } - private static void checkEntryHeader(final MatchEntry entry, final Class field, + private static void checkEntryHeader(final MatchEntry entry, final MatchField field, final boolean hasMask) { - Assert.assertEquals("Wrong oxm class", OpenflowBasicClass.class, entry.getOxmClass()); + Assert.assertEquals("Wrong oxm class", OpenflowBasicClass.VALUE, entry.getOxmClass()); Assert.assertEquals("Wrong oxm field", field, entry.getOxmMatchField()); Assert.assertEquals("Wrong hasMask", hasMask, entry.getHasMask()); } diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/FlowConvertorTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/FlowConvertorTest.java index 5da9abe5c6..43effe89f8 100644 --- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/FlowConvertorTest.java +++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/FlowConvertorTest.java @@ -126,8 +126,8 @@ public class FlowConvertorTest { assertEquals("Wrong out group", 5000, flowMod.get(0).getOutGroup().intValue()); assertEquals("Wrong flags", new FlowModFlags(false, false, false, false, false), flowMod.get(0).getFlags()); assertEquals("Wrong match", - "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmMatchType", - flowMod.get(0).getMatch().getType().getName()); + org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmMatchType.VALUE, + flowMod.get(0).getMatch().getType()); assertEquals("Wrong match entries size", 0, flowMod.get(0).getMatch().nonnullMatchEntry().size()); } diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorTest.java index 1133d67477..7d4fd89495 100644 --- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorTest.java +++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorTest.java @@ -233,109 +233,109 @@ public class MatchConvertorTest { List entries = entriesOptional.get(); assertEquals("Wrong entries size", 24, entries.size()); MatchEntry entry = entries.get(0); - checkEntryHeader(entry, InPort.class, false); + checkEntryHeader(entry, InPort.VALUE, false); assertEquals("Wrong in port", 1, ((InPortCase) entry.getMatchEntryValue()).getInPort() .getPortNumber().getValue().intValue()); entry = entries.get(1); - checkEntryHeader(entry, InPhyPort.class, false); + checkEntryHeader(entry, InPhyPort.VALUE, false); assertEquals("Wrong in phy port", 2, ((InPhyPortCase) entry.getMatchEntryValue()) .getInPhyPort().getPortNumber().getValue().intValue()); entry = entries.get(2); - checkEntryHeader(entry, Metadata.class, false); + checkEntryHeader(entry, Metadata.VALUE, false); assertArrayEquals("Wrong metadata", new byte[]{0, 0, 0, 0, 0, 0, 0, 3}, ((MetadataCase) entry.getMatchEntryValue()).getMetadata().getMetadata()); entry = entries.get(3); - checkEntryHeader(entry, EthDst.class, false); + checkEntryHeader(entry, EthDst.VALUE, false); assertEquals("Wrong eth dst", new MacAddress("00:00:00:00:00:06"), ((EthDstCase) entry.getMatchEntryValue()).getEthDst().getMacAddress()); entry = entries.get(4); - checkEntryHeader(entry, EthSrc.class, false); + checkEntryHeader(entry, EthSrc.VALUE, false); assertEquals("Wrong eth src", new MacAddress("00:00:00:00:00:05"), ((EthSrcCase) entry.getMatchEntryValue()).getEthSrc().getMacAddress()); entry = entries.get(5); - checkEntryHeader(entry, EthType.class, false); + checkEntryHeader(entry, EthType.VALUE, false); assertEquals("Wrong eth type", 4, ((EthTypeCase) entry.getMatchEntryValue()) .getEthType().getEthType().getValue().intValue()); entry = entries.get(6); - checkEntryHeader(entry, VlanVid.class, false); + checkEntryHeader(entry, VlanVid.VALUE, false); assertEquals("Wrong vlan id", 7, ((VlanVidCase) entry.getMatchEntryValue()) .getVlanVid().getVlanVid().intValue()); assertEquals("Wrong cfi bit", true, ((VlanVidCase) entry.getMatchEntryValue()).getVlanVid().getCfiBit()); entry = entries.get(7); checkEntryHeader(entry, - org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.VlanPcp.class, false); + org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.VlanPcp.VALUE, false); assertEquals("Wrong vlan pcp", 7, ((VlanPcpCase) entry.getMatchEntryValue()) .getVlanPcp().getVlanPcp().intValue()); entry = entries.get(8); - checkEntryHeader(entry, IpDscp.class, false); + checkEntryHeader(entry, IpDscp.VALUE, false); assertEquals("Wrong ip dscp", 8, ((IpDscpCase) entry.getMatchEntryValue()) .getIpDscp().getDscp().getValue().intValue()); entry = entries.get(9); - checkEntryHeader(entry, IpEcn.class, false); + checkEntryHeader(entry, IpEcn.VALUE, false); assertEquals("Wrong ip ecn", 9, ((IpEcnCase) entry.getMatchEntryValue()) .getIpEcn().getEcn().intValue()); entry = entries.get(10); - checkEntryHeader(entry, IpProto.class, false); + checkEntryHeader(entry, IpProto.VALUE, false); assertEquals("Wrong ip proto", 10, ((IpProtoCase) entry.getMatchEntryValue()) .getIpProto().getProtocolNumber().intValue()); entry = entries.get(11); - checkEntryHeader(entry, TcpSrc.class, false); + checkEntryHeader(entry, TcpSrc.VALUE, false); assertEquals("Wrong tcp src", 11, ((TcpSrcCase) entry.getMatchEntryValue()) .getTcpSrc().getPort().getValue().intValue()); entry = entries.get(12); - checkEntryHeader(entry, TcpDst.class, false); + checkEntryHeader(entry, TcpDst.VALUE, false); assertEquals("Wrong tcp dst", 12, ((TcpDstCase) entry.getMatchEntryValue()) .getTcpDst().getPort().getValue().intValue()); entry = entries.get(13); - checkEntryHeader(entry, Icmpv4Type.class, false); + checkEntryHeader(entry, Icmpv4Type.VALUE, false); assertEquals("Wrong icmpv4 type", 13, ((Icmpv4TypeCase) entry.getMatchEntryValue()) .getIcmpv4Type().getIcmpv4Type().intValue()); entry = entries.get(14); - checkEntryHeader(entry, Icmpv4Code.class, false); + checkEntryHeader(entry, Icmpv4Code.VALUE, false); assertEquals("Wrong icmpv4 code", 14, ((Icmpv4CodeCase) entry.getMatchEntryValue()) .getIcmpv4Code().getIcmpv4Code().intValue()); entry = entries.get(15); - checkEntryHeader(entry, Icmpv6Type.class, false); + checkEntryHeader(entry, Icmpv6Type.VALUE, false); assertEquals("Wrong icmpv6 type", 15, ((Icmpv6TypeCase) entry.getMatchEntryValue()) .getIcmpv6Type().getIcmpv6Type().intValue()); entry = entries.get(16); - checkEntryHeader(entry, Icmpv6Code.class, false); + checkEntryHeader(entry, Icmpv6Code.VALUE, false); assertEquals("Wrong icmpv6 code", 16, ((Icmpv6CodeCase) entry.getMatchEntryValue()) .getIcmpv6Code().getIcmpv6Code().intValue()); entry = entries.get(17); - checkEntryHeader(entry, Ipv4Src.class, false); + checkEntryHeader(entry, Ipv4Src.VALUE, false); assertEquals("Wrong ipv4 src", "10.0.0.1", ((Ipv4SrcCase) entry.getMatchEntryValue()) .getIpv4Src().getIpv4Address().getValue()); entry = entries.get(18); - checkEntryHeader(entry, Ipv4Dst.class, false); + checkEntryHeader(entry, Ipv4Dst.VALUE, false); assertEquals("Wrong ipv4 dst", "10.0.0.2", ((Ipv4DstCase) entry.getMatchEntryValue()) .getIpv4Dst().getIpv4Address().getValue()); entry = entries.get(19); - checkEntryHeader(entry, MplsLabel.class, false); + checkEntryHeader(entry, MplsLabel.VALUE, false); assertEquals("Wrong mpls label", 17, ((MplsLabelCase) entry.getMatchEntryValue()) .getMplsLabel().getMplsLabel().intValue()); entry = entries.get(20); - checkEntryHeader(entry, MplsBos.class, false); + checkEntryHeader(entry, MplsBos.VALUE, false); assertEquals("Wrong mpls bos", true, ((MplsBosCase) entry.getMatchEntryValue()).getMplsBos().getBos()); entry = entries.get(21); - checkEntryHeader(entry, MplsTc.class, false); + checkEntryHeader(entry, MplsTc.VALUE, false); assertEquals("Wrong mpls tc", 18, ((MplsTcCase) entry.getMatchEntryValue()) .getMplsTc().getTc().intValue()); entry = entries.get(22); - checkEntryHeader(entry, PbbIsid.class, false); + checkEntryHeader(entry, PbbIsid.VALUE, false); assertEquals("Wrong pbb isid", 20, ((PbbIsidCase) entry.getMatchEntryValue()) .getPbbIsid().getIsid().intValue()); entry = entries.get(23); - checkEntryHeader(entry, TunnelId.class, false); + checkEntryHeader(entry, TunnelId.VALUE, false); assertArrayEquals("Wrong tunnel id", new byte[]{0, 0, 0, 0, 0, 0, 0, 21}, ((TunnelIdCase) entry.getMatchEntryValue()).getTunnelId().getTunnelId()); } - private static void checkEntryHeader(final MatchEntry entry, final Class field, + private static void checkEntryHeader(final MatchEntry entry, final MatchField field, final boolean hasMask) { - assertEquals("Wrong oxm class", OpenflowBasicClass.class, entry.getOxmClass()); + assertEquals("Wrong oxm class", OpenflowBasicClass.VALUE, entry.getOxmClass()); assertEquals("Wrong oxm field", field, entry.getOxmMatchField()); assertEquals("Wrong hasMask", hasMask, entry.getHasMask()); } @@ -355,11 +355,11 @@ public class MatchConvertorTest { assertEquals("Wrong entries size", 2, entries.size()); MatchEntry entry = entries.get(0); - checkEntryHeader(entry, Ipv4Src.class, false); + checkEntryHeader(entry, Ipv4Src.VALUE, false); assertEquals("wrong Ipv4Address source", "10.2.2.2", ((Ipv4SrcCase) entry.getMatchEntryValue()).getIpv4Src().getIpv4Address().getValue()); entry = entries.get(1); - checkEntryHeader(entry, Ipv4Dst.class, false); + checkEntryHeader(entry, Ipv4Dst.VALUE, false); assertEquals("wrong Ipv4Address destination", "10.1.1.1", ((Ipv4DstCase) entry.getMatchEntryValue()).getIpv4Dst().getIpv4Address().getValue()); } @@ -382,11 +382,11 @@ public class MatchConvertorTest { assertEquals("Wrong entries size", 2, entries.size()); MatchEntry entry = entries.get(0); - checkEntryHeader(entry, Ipv4Src.class, true); + checkEntryHeader(entry, Ipv4Src.VALUE, true); assertEquals("wrong Ipv4Address source", "10.2.2.2", ((Ipv4SrcCase) entry.getMatchEntryValue()).getIpv4Src().getIpv4Address().getValue()); entry = entries.get(1); - checkEntryHeader(entry, Ipv4Dst.class, true); + checkEntryHeader(entry, Ipv4Dst.VALUE, true); assertEquals("wrong Ipv4Adress destination", "10.1.1.1", ((Ipv4DstCase) entry.getMatchEntryValue()).getIpv4Dst().getIpv4Address().getValue()); } @@ -405,11 +405,11 @@ public class MatchConvertorTest { List entries = entriesOptional.get(); assertEquals("Wrong entries size", 2, entries.size()); MatchEntry entry = entries.get(0); - checkEntryHeader(entry, UdpSrc.class, false); + checkEntryHeader(entry, UdpSrc.VALUE, false); assertEquals("Wrong udp src", 11, ((UdpSrcCase) entry.getMatchEntryValue()).getUdpSrc() .getPort().getValue().intValue()); entry = entries.get(1); - checkEntryHeader(entry, UdpDst.class, false); + checkEntryHeader(entry, UdpDst.VALUE, false); assertEquals("Wrong udp dst", 12, ((UdpDstCase) entry.getMatchEntryValue()) .getUdpDst().getPort().getValue().intValue()); } @@ -428,11 +428,11 @@ public class MatchConvertorTest { List entries = entriesOptional.get(); assertEquals("Wrong entries size", 2, entries.size()); MatchEntry entry = entries.get(0); - checkEntryHeader(entry, Ipv4Src.class, false); + checkEntryHeader(entry, Ipv4Src.VALUE, false); assertEquals("Wrong ipv4 tunnel src", "10.0.0.1", ((Ipv4SrcCase) entry.getMatchEntryValue()).getIpv4Src() .getIpv4Address().getValue()); entry = entries.get(1); - checkEntryHeader(entry, Ipv4Dst.class, false); + checkEntryHeader(entry, Ipv4Dst.VALUE, false); assertEquals("Wrong ipv4 tunnel dst", "10.0.0.2", ((Ipv4DstCase) entry.getMatchEntryValue()).getIpv4Dst() .getIpv4Address().getValue()); } @@ -451,11 +451,11 @@ public class MatchConvertorTest { List entries = entriesOptional.get(); assertEquals("Wrong entries size", 2, entries.size()); MatchEntry entry = entries.get(0); - checkEntryHeader(entry, SctpSrc.class, false); + checkEntryHeader(entry, SctpSrc.VALUE, false); assertEquals("Wrong sctp src", 11, ((SctpSrcCase) entry.getMatchEntryValue()).getSctpSrc() .getPort().getValue().intValue()); entry = entries.get(1); - checkEntryHeader(entry, SctpDst.class, false); + checkEntryHeader(entry, SctpDst.VALUE, false); assertEquals("Wrong sctp dst", 12, ((SctpDstCase) entry.getMatchEntryValue()) .getSctpDst().getPort().getValue().intValue()); } @@ -482,23 +482,23 @@ public class MatchConvertorTest { List entries = entriesOptional.get(); assertEquals("Wrong entries size", 5, entries.size()); MatchEntry entry = entries.get(0); - checkEntryHeader(entry, ArpOp.class, false); + checkEntryHeader(entry, ArpOp.VALUE, false); assertEquals("Wrong arp op", 5, ((ArpOpCase) entry.getMatchEntryValue()) .getArpOp().getOpCode().intValue()); entry = entries.get(1); - checkEntryHeader(entry, ArpSpa.class, false); + checkEntryHeader(entry, ArpSpa.VALUE, false); assertEquals("Wrong arp spa", "10.0.0.3", ((ArpSpaCase) entry.getMatchEntryValue()) .getArpSpa().getIpv4Address().getValue()); entry = entries.get(2); - checkEntryHeader(entry, ArpTpa.class, false); + checkEntryHeader(entry, ArpTpa.VALUE, false); assertEquals("Wrong arp tpa", "10.0.0.4", ((ArpTpaCase) entry.getMatchEntryValue()) .getArpTpa().getIpv4Address().getValue()); entry = entries.get(3); - checkEntryHeader(entry, ArpSha.class, false); + checkEntryHeader(entry, ArpSha.VALUE, false); assertEquals("Wrong arp sha", "00:00:00:00:00:05", ((ArpShaCase) entry.getMatchEntryValue()) .getArpSha().getMacAddress().getValue()); entry = entries.get(4); - checkEntryHeader(entry, ArpTha.class, false); + checkEntryHeader(entry, ArpTha.VALUE, false); assertEquals("Wrong arp tha", "00:00:00:00:00:06", ((ArpThaCase) entry.getMatchEntryValue()) .getArpTha().getMacAddress().getValue()); } @@ -528,25 +528,25 @@ public class MatchConvertorTest { assertEquals("Wrong entries size", 4, entries.size()); MatchEntry entry = entries.get(0); entry = entries.get(0); - checkEntryHeader(entry, ArpSpa.class, true); + checkEntryHeader(entry, ArpSpa.VALUE, true); assertEquals("Wrong arp spa", "10.0.0.0", ((ArpSpaCase) entry.getMatchEntryValue()) .getArpSpa().getIpv4Address().getValue()); assertArrayEquals("Wrong arp spa mask", new byte[]{(byte) 255, 0, 0, 0}, ((ArpSpaCase) entry.getMatchEntryValue()).getArpSpa().getMask()); entry = entries.get(1); - checkEntryHeader(entry, ArpTpa.class, true); + checkEntryHeader(entry, ArpTpa.VALUE, true); assertEquals("Wrong arp tpa", "10.0.0.4", ((ArpTpaCase) entry.getMatchEntryValue()).getArpTpa() .getIpv4Address().getValue()); assertArrayEquals("Wrong arp tpa mask", new byte[]{(byte) 255, (byte) 255, (byte) 255, (byte) 254}, ((ArpTpaCase) entry.getMatchEntryValue()).getArpTpa().getMask()); entry = entries.get(2); - checkEntryHeader(entry, ArpSha.class, true); + checkEntryHeader(entry, ArpSha.VALUE, true); assertEquals("Wrong arp sha", "00:00:00:00:00:05", ((ArpShaCase) entry.getMatchEntryValue()) .getArpSha().getMacAddress().getValue()); assertArrayEquals("Wrong arp sha mask", new byte[]{0, 0, 0, 0, 0, 8}, ((ArpShaCase) entry.getMatchEntryValue()).getArpSha().getMask()); entry = entries.get(3); - checkEntryHeader(entry, ArpTha.class, true); + checkEntryHeader(entry, ArpTha.VALUE, true); assertEquals("Wrong arp tha", "00:00:00:00:00:06", ((ArpThaCase) entry.getMatchEntryValue()).getArpTha() .getMacAddress().getValue()); assertArrayEquals("Wrong arp tha mask", new byte[]{0, 0, 0, 0, 0, 9}, @@ -580,31 +580,31 @@ public class MatchConvertorTest { /* Due to conversion ambiguities, we always get "has mask" because * an ip with no mask and prefix with /128 (or 32 in v4) cannot * be distinguished */ - checkEntryHeader(entry, Ipv6Src.class, false); + checkEntryHeader(entry, Ipv6Src.VALUE, false); assertEquals("Wrong ipv6 src", "::1", ((Ipv6SrcCase) entry.getMatchEntryValue()).getIpv6Src().getIpv6Address().getValue()); entry = entries.get(1); - checkEntryHeader(entry, Ipv6Dst.class, false); + checkEntryHeader(entry, Ipv6Dst.VALUE, false); assertEquals("Wrong ipv6 dst", "::2", ((Ipv6DstCase) entry.getMatchEntryValue()).getIpv6Dst().getIpv6Address().getValue()); entry = entries.get(2); - checkEntryHeader(entry, Ipv6Flabel.class, false); + checkEntryHeader(entry, Ipv6Flabel.VALUE, false); assertEquals("Wrong ipv6 flabel", 3, ((Ipv6FlabelCase) entry.getMatchEntryValue()).getIpv6Flabel().getIpv6Flabel().getValue().intValue()); entry = entries.get(3); - checkEntryHeader(entry, Ipv6NdTarget.class, false); + checkEntryHeader(entry, Ipv6NdTarget.VALUE, false); assertEquals("Wrong ipv6 nd target", "::4", ((Ipv6NdTargetCase) entry.getMatchEntryValue()).getIpv6NdTarget().getIpv6Address().getValue()); entry = entries.get(4); - checkEntryHeader(entry, Ipv6NdSll.class, false); + checkEntryHeader(entry, Ipv6NdSll.VALUE, false); assertEquals("Wrong ipv6 nd sll", "00:00:00:00:00:05", ((Ipv6NdSllCase) entry.getMatchEntryValue()).getIpv6NdSll().getMacAddress().getValue()); entry = entries.get(5); - checkEntryHeader(entry, Ipv6NdTll.class, false); + checkEntryHeader(entry, Ipv6NdTll.VALUE, false); assertEquals("Wrong ipv6 nd tll", "00:00:00:00:00:06", ((Ipv6NdTllCase) entry.getMatchEntryValue()).getIpv6NdTll().getMacAddress().getValue()); entry = entries.get(6); - checkEntryHeader(entry, Ipv6Exthdr.class, false); + checkEntryHeader(entry, Ipv6Exthdr.VALUE, false); assertEquals("Wrong ipv6 ext hdr", new Ipv6ExthdrFlags(false, true, false, true, false, true, false, true, false), ((Ipv6ExthdrCase) entry.getMatchEntryValue()).getIpv6Exthdr().getPseudoField()); } @@ -623,13 +623,13 @@ public class MatchConvertorTest { List entries = entriesOptional.get(); assertEquals("Wrong entries size", 2, entries.size()); MatchEntry entry = entries.get(0); - checkEntryHeader(entry, Ipv6Src.class, true); + checkEntryHeader(entry, Ipv6Src.VALUE, true); assertEquals("Wrong ipv6 src", "::", ((Ipv6SrcCase) entry.getMatchEntryValue()).getIpv6Src().getIpv6Address().getValue()); assertArrayEquals("Wrong ipv6 src mask", new byte[]{(byte) 255, (byte) 255, (byte) 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, ((Ipv6SrcCase) entry.getMatchEntryValue()).getIpv6Src().getMask()); entry = entries.get(1); - checkEntryHeader(entry, Ipv6Dst.class, true); + checkEntryHeader(entry, Ipv6Dst.VALUE, true); assertEquals("Wrong ipv6 dst", "::", ((Ipv6DstCase) entry.getMatchEntryValue()).getIpv6Dst().getIpv6Address().getValue()); assertArrayEquals("Wrong ipv6 src mask", new byte[]{(byte) 255, (byte) 255, (byte) 255, (byte) 255, @@ -654,7 +654,7 @@ public class MatchConvertorTest { List entries = entriesOptional.get(); assertEquals("Wrong entries size", 1, entries.size()); MatchEntry entry = entries.get(0); - checkEntryHeader(entry, Ipv6Exthdr.class, true); + checkEntryHeader(entry, Ipv6Exthdr.VALUE, true); assertEquals("Wrong ipv6 ext hdr", new Ipv6ExthdrFlags(true, false, true, false, true, false, true, false, true), ((Ipv6ExthdrCase) entry.getMatchEntryValue()).getIpv6Exthdr().getPseudoField()); assertArrayEquals("Wrong ipv6 ext hdr mask", new byte[]{1, 2}, @@ -705,50 +705,50 @@ public class MatchConvertorTest { List entries = entriesOptional.get(); assertEquals("Wrong entries size", 8, entries.size()); MatchEntry entry = entries.get(0); - checkEntryHeader(entry, Metadata.class, true); + checkEntryHeader(entry, Metadata.VALUE, true); assertArrayEquals("Wrong metadata", new byte[]{0, 0, 0, 0, 0, 0, 0, 3}, ((MetadataCase) entry.getMatchEntryValue()).getMetadata().getMetadata()); assertArrayEquals("Wrong metadata mask", new byte[]{0, 0, 0, 0, 0, 0, 0, 15}, ((MetadataCase) entry.getMatchEntryValue()).getMetadata().getMask()); entry = entries.get(1); - checkEntryHeader(entry, EthDst.class, true); + checkEntryHeader(entry, EthDst.VALUE, true); assertEquals("Wrong eth dst", new MacAddress("00:00:00:00:00:06"), ((EthDstCase) entry.getMatchEntryValue()).getEthDst().getMacAddress()); assertArrayEquals("Wrong eth dst mask", new byte[]{0, 0, 0, 0, 0, 9}, ((EthDstCase) entry.getMatchEntryValue()).getEthDst().getMask()); entry = entries.get(2); - checkEntryHeader(entry, EthSrc.class, true); + checkEntryHeader(entry, EthSrc.VALUE, true); assertEquals("Wrong eth src", new MacAddress("00:00:00:00:00:05"), ((EthSrcCase) entry.getMatchEntryValue()).getEthSrc().getMacAddress()); assertArrayEquals("Wrong eth src mask", new byte[]{0, 0, 0, 0, 0, 8}, ((EthSrcCase) entry.getMatchEntryValue()).getEthSrc().getMask()); entry = entries.get(3); - checkEntryHeader(entry, VlanVid.class, true); + checkEntryHeader(entry, VlanVid.VALUE, true); assertEquals("Wrong vlan id", 0, ((VlanVidCase) entry.getMatchEntryValue()).getVlanVid() .getVlanVid().intValue()); assertEquals("Wrong cfi bit", true, ((VlanVidCase) entry.getMatchEntryValue()).getVlanVid().getCfiBit()); assertArrayEquals("Wrong vlanId mask", new byte[]{16, 0}, ((VlanVidCase) entry.getMatchEntryValue()).getVlanVid().getMask()); entry = entries.get(4); - checkEntryHeader(entry, Ipv4Src.class, true); + checkEntryHeader(entry, Ipv4Src.VALUE, true); assertEquals("Wrong ipv4 src", "10.0.0.0", ((Ipv4SrcCase) entry.getMatchEntryValue()) .getIpv4Src().getIpv4Address().getValue()); assertArrayEquals("Wrong ipv4 src mask", new byte[]{(byte) 255, (byte) 255, (byte) 255, 0}, ((Ipv4SrcCase) entry.getMatchEntryValue()).getIpv4Src().getMask()); entry = entries.get(5); - checkEntryHeader(entry, Ipv4Dst.class, true); + checkEntryHeader(entry, Ipv4Dst.VALUE, true); assertEquals("Wrong ipv4 dst", "10.0.0.0", ((Ipv4DstCase) entry.getMatchEntryValue()) .getIpv4Dst().getIpv4Address().getValue()); assertArrayEquals("Wrong ipv4 dst mask", new byte[]{(byte) 255, 0, 0, 0}, ((Ipv4DstCase) entry.getMatchEntryValue()).getIpv4Dst().getMask()); entry = entries.get(6); - checkEntryHeader(entry, PbbIsid.class, true); + checkEntryHeader(entry, PbbIsid.VALUE, true); assertEquals("Wrong pbb isid", 20, ((PbbIsidCase) entry.getMatchEntryValue()) .getPbbIsid().getIsid().intValue()); assertArrayEquals("Wrong pbb isid mask", new byte[]{0, 0, 8}, ((PbbIsidCase) entry.getMatchEntryValue()).getPbbIsid().getMask()); entry = entries.get(7); - checkEntryHeader(entry, TunnelId.class, true); + checkEntryHeader(entry, TunnelId.VALUE, true); assertArrayEquals("Wrong tunnel id", new byte[]{0, 0, 0, 0, 0, 0, 0, 21}, ((TunnelIdCase) entry.getMatchEntryValue()).getTunnelId().getTunnelId()); assertArrayEquals("Wrong tunnel id mask", new byte[]{0, 0, 0, 0, 0, 0, 0, 14}, @@ -777,11 +777,11 @@ public class MatchConvertorTest { assertEquals("Wrong entries size", 2, entries.size()); MatchEntry entry = entries.get(0); - checkEntryHeader(entry, Ipv6Src.class, true); + checkEntryHeader(entry, Ipv6Src.VALUE, true); assertEquals("wrong Ipv6Adress source", "fbA0:FFB6:FFF0:FFF0:FFF0:FFF0:FFF0:AFF0", ((Ipv6SrcCase) entry.getMatchEntryValue()).getIpv6Src().getIpv6Address().getValue()); entry = entries.get(1); - checkEntryHeader(entry, Ipv6Dst.class, true); + checkEntryHeader(entry, Ipv6Dst.VALUE, true); assertEquals("wrong Ipv6Adress destination", "fbA0:FFB6:FFF0:FFF0:FFF0:FFF0:FFF0:AFF0", ((Ipv6DstCase) entry.getMatchEntryValue()).getIpv6Dst().getIpv6Address().getValue()); } @@ -797,7 +797,7 @@ public class MatchConvertorTest { List entries = entriesOptional.get(); assertEquals("Wrong entries size", 1, entries.size()); MatchEntry entry = entries.get(0); - checkEntryHeader(entry, PacketType.class, false); + checkEntryHeader(entry, PacketType.VALUE, false); assertEquals("Wrong in port", 0x1894f, ((PacketTypeCase) entry.getMatchEntryValue()).getPacketType().getPacketType().longValue()); } diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchResponseConvertor2Test.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchResponseConvertor2Test.java index 73716df91a..2a19bb1cf4 100644 --- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchResponseConvertor2Test.java +++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchResponseConvertor2Test.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.openflow.md.core.sal.convertor.match; import java.util.ArrayList; @@ -198,7 +197,7 @@ public class MatchResponseConvertor2Test { public void testEmptyMatchEntry() { final MatchBuilder builder = new MatchBuilder(); - builder.setType(OxmMatchType.class); + builder.setType(OxmMatchType.VALUE); final List entries = new ArrayList<>(); builder.setMatchEntry(entries); final Match match = builder.build(); @@ -236,9 +235,9 @@ public class MatchResponseConvertor2Test { public void testWithMatchEntryNoMasks() { final List entries = new ArrayList<>(); MatchEntryBuilder entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); entriesBuilder.setOxmMatchField( - org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.InPort.class); + org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.InPort.VALUE); entriesBuilder.setHasMask(false); final InPortCaseBuilder caseBuilder = new InPortCaseBuilder(); final InPortBuilder portBuilder = new InPortBuilder(); @@ -249,9 +248,9 @@ public class MatchResponseConvertor2Test { final InPhyPortCaseBuilder inPhyPortCaseBuilder = new InPhyPortCaseBuilder(); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); entriesBuilder.setOxmMatchField( - org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.InPhyPort.class); + org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.InPhyPort.VALUE); entriesBuilder.setHasMask(false); final InPhyPortBuilder inPhyPortBuilder = new InPhyPortBuilder(); inPhyPortBuilder.setPortNumber(new PortNumber(Uint32.TWO)); @@ -260,9 +259,9 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); entriesBuilder.setOxmMatchField( - org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.class); + org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.VALUE); entriesBuilder.setHasMask(false); final MetadataCaseBuilder metadataCaseBuilder = new MetadataCaseBuilder(); final org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match @@ -275,8 +274,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(PacketType.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(PacketType.VALUE); entriesBuilder.setHasMask(false); final PacketTypeCaseBuilder packetTypeCaseBuilder = new PacketTypeCaseBuilder(); final PacketTypeBuilder packetTypeBuilder = new PacketTypeBuilder(); @@ -286,8 +285,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(EthDst.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(EthDst.VALUE); entriesBuilder.setHasMask(false); final EthDstCaseBuilder ethDstCaseBuilder = new EthDstCaseBuilder(); final EthDstBuilder ethDstBuilder = new EthDstBuilder(); @@ -297,8 +296,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(EthSrc.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(EthSrc.VALUE); entriesBuilder.setHasMask(false); final EthSrcCaseBuilder ethSrcCaseBuilder = new EthSrcCaseBuilder(); final EthSrcBuilder ethSrcBuilder = new EthSrcBuilder(); @@ -309,8 +308,8 @@ public class MatchResponseConvertor2Test { entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(EthType.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(EthType.VALUE); entriesBuilder.setHasMask(false); final EthTypeCaseBuilder ethTypeCaseBuilder = new EthTypeCaseBuilder(); @@ -322,8 +321,8 @@ public class MatchResponseConvertor2Test { entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(VlanVid.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(VlanVid.VALUE); final VlanVidCaseBuilder vlanVidCaseBuilder = new VlanVidCaseBuilder(); entriesBuilder.setHasMask(false); final VlanVidBuilder vlanVidBuilder = new VlanVidBuilder(); @@ -334,8 +333,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(VlanPcp.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(VlanPcp.VALUE); final VlanPcpCaseBuilder vlanPcpCaseBuilder = new VlanPcpCaseBuilder(); entriesBuilder.setHasMask(false); final VlanPcpBuilder vlanPcpBuilder = new VlanPcpBuilder(); @@ -346,8 +345,8 @@ public class MatchResponseConvertor2Test { entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(IpDscp.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(IpDscp.VALUE); entriesBuilder.setHasMask(false); final IpDscpCaseBuilder ipDscpCaseBuilder = new IpDscpCaseBuilder(); final IpDscpBuilder ipDscpBuilder = new IpDscpBuilder(); @@ -358,8 +357,8 @@ public class MatchResponseConvertor2Test { entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(IpEcn.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(IpEcn.VALUE); entriesBuilder.setHasMask(false); final IpEcnCaseBuilder ipEcnCaseBuilder = new IpEcnCaseBuilder(); final IpEcnBuilder ipEcnBuilder = new IpEcnBuilder(); @@ -370,8 +369,8 @@ public class MatchResponseConvertor2Test { entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(IpProto.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(IpProto.VALUE); final IpProtoCaseBuilder ipProtoCaseBuilder = new IpProtoCaseBuilder(); entriesBuilder.setHasMask(false); final IpProtoBuilder ipProtoBuilder = new IpProtoBuilder(); @@ -382,8 +381,8 @@ public class MatchResponseConvertor2Test { entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Ipv4Src.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Ipv4Src.VALUE); entriesBuilder.setHasMask(false); final Ipv4SrcCaseBuilder ipv4AddressBuilder = new Ipv4SrcCaseBuilder(); final Ipv4SrcBuilder ipv4SrcBuilder = new Ipv4SrcBuilder(); @@ -393,8 +392,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Ipv4Dst.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Ipv4Dst.VALUE); entriesBuilder.setHasMask(false); final Ipv4DstCaseBuilder ipv4DstCaseBuilder = new Ipv4DstCaseBuilder(); final Ipv4DstBuilder ipv4DstBuilder = new Ipv4DstBuilder(); @@ -404,8 +403,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(TcpSrc.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(TcpSrc.VALUE); entriesBuilder.setHasMask(false); final TcpSrcCaseBuilder tcpSrcCaseBuilder = new TcpSrcCaseBuilder(); final TcpSrcBuilder tcpSrcBuilder = new TcpSrcBuilder(); @@ -416,8 +415,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(TcpDst.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(TcpDst.VALUE); entriesBuilder.setHasMask(false); final TcpDstCaseBuilder tcpDstCaseBuilder = new TcpDstCaseBuilder(); final TcpDstBuilder tcpDstBuilder = new TcpDstBuilder(); @@ -428,8 +427,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Icmpv4Type.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Icmpv4Type.VALUE); entriesBuilder.setHasMask(false); final Icmpv4TypeCaseBuilder icmpv4TypeCaseBuilder = new Icmpv4TypeCaseBuilder(); final Icmpv4TypeBuilder icmpv4TypeBuilder = new Icmpv4TypeBuilder(); @@ -439,8 +438,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Icmpv4Code.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Icmpv4Code.VALUE); entriesBuilder.setHasMask(false); final Icmpv4CodeCaseBuilder icmpv4CodeCaseBuilder = new Icmpv4CodeCaseBuilder(); final Icmpv4CodeBuilder icmpv4CodeBuilder = new Icmpv4CodeBuilder(); @@ -450,8 +449,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Icmpv6Type.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Icmpv6Type.VALUE); entriesBuilder.setHasMask(false); final Icmpv6TypeCaseBuilder icmpv6TypeCaseBuilder = new Icmpv6TypeCaseBuilder(); final Icmpv6TypeBuilder icmpv6TypeBuilder = new Icmpv6TypeBuilder(); @@ -461,8 +460,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Icmpv6Code.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Icmpv6Code.VALUE); entriesBuilder.setHasMask(false); final Icmpv6CodeCaseBuilder icmpv6CodeCaseBuilder = new Icmpv6CodeCaseBuilder(); final Icmpv6CodeBuilder icmpv6CodeBuilder = new Icmpv6CodeBuilder(); @@ -472,8 +471,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(MplsLabel.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(MplsLabel.VALUE); entriesBuilder.setHasMask(false); final MplsLabelCaseBuilder mplsLabelCaseBuilder = new MplsLabelCaseBuilder(); @@ -484,8 +483,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(MplsTc.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(MplsTc.VALUE); entriesBuilder.setHasMask(false); final MplsTcCaseBuilder mplsTcCaseBuilder = new MplsTcCaseBuilder(); final MplsTcBuilder mplsTcBuilder = new MplsTcBuilder(); @@ -495,8 +494,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(MplsBos.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(MplsBos.VALUE); entriesBuilder.setHasMask(false); final MplsBosCaseBuilder mplsBosCaseBuilder = new MplsBosCaseBuilder(); final MplsBosBuilder mplsBosBuilder = new MplsBosBuilder(); @@ -506,8 +505,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(PbbIsid.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(PbbIsid.VALUE); entriesBuilder.setHasMask(false); final PbbIsidCaseBuilder pbbIsidCaseBuilder = new PbbIsidCaseBuilder(); final PbbIsidBuilder pbbIsidBuilder = new PbbIsidBuilder(); @@ -517,8 +516,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(TunnelId.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(TunnelId.VALUE); entriesBuilder.setHasMask(false); final TunnelIdCaseBuilder tunnelIdCaseBuilder = new TunnelIdCaseBuilder(); final TunnelIdBuilder tunnelIdBuilder = new TunnelIdBuilder(); @@ -586,12 +585,12 @@ public class MatchResponseConvertor2Test { @Test public void testWithMatchEntryWithMasks() { final MatchBuilder builder = new MatchBuilder(); - builder.setType(OxmMatchType.class); + builder.setType(OxmMatchType.VALUE); final List entries = new ArrayList<>(); MatchEntryBuilder entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); entriesBuilder.setOxmMatchField( - org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.class); + org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.VALUE); entriesBuilder.setHasMask(true); @@ -607,8 +606,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(EthDst.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(EthDst.VALUE); entriesBuilder.setHasMask(true); final EthDstCaseBuilder ethDstCaseBuilder = new EthDstCaseBuilder(); final EthDstBuilder ethDstBuilder = new EthDstBuilder(); @@ -619,8 +618,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(EthSrc.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(EthSrc.VALUE); entriesBuilder.setHasMask(true); final EthSrcCaseBuilder ethSrcCaseBuilder = new EthSrcCaseBuilder(); final EthSrcBuilder ethSrcBuilder = new EthSrcBuilder(); @@ -631,8 +630,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(VlanVid.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(VlanVid.VALUE); entriesBuilder.setHasMask(true); final VlanVidCaseBuilder vlanVidCaseBuilder = new VlanVidCaseBuilder(); final VlanVidBuilder vlanVidBuilder = new VlanVidBuilder(); @@ -644,8 +643,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Ipv4Src.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Ipv4Src.VALUE); entriesBuilder.setHasMask(true); final Ipv4SrcCaseBuilder ipv4SrcCaseBuilder = new Ipv4SrcCaseBuilder(); final Ipv4SrcBuilder ipv4SrcBuilder = new Ipv4SrcBuilder(); @@ -656,8 +655,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Ipv4Dst.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Ipv4Dst.VALUE); entriesBuilder.setHasMask(true); final Ipv4DstCaseBuilder ipv4DstCaseBuilder = new Ipv4DstCaseBuilder(); final Ipv4DstBuilder ipv4AddressBuilder = new Ipv4DstBuilder(); @@ -668,8 +667,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(PbbIsid.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(PbbIsid.VALUE); entriesBuilder.setHasMask(true); final PbbIsidCaseBuilder pbbIsidCaseBuilder = new PbbIsidCaseBuilder(); @@ -681,8 +680,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(TunnelId.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(TunnelId.VALUE); entriesBuilder.setHasMask(true); final TunnelIdCaseBuilder tunnelIdCaseBuilder = new TunnelIdCaseBuilder(); final TunnelIdBuilder tunnelIdBuilder = new TunnelIdBuilder(); @@ -732,17 +731,17 @@ public class MatchResponseConvertor2Test { @Test public void testWithMatchEntryWithArbitraryMasks() { final MatchBuilder builder = new MatchBuilder(); - builder.setType(OxmMatchType.class); + builder.setType(OxmMatchType.VALUE); final List entries = new ArrayList<>(); MatchEntryBuilder entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); entriesBuilder.setOxmMatchField( - org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.class); + org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.VALUE); entriesBuilder.setHasMask(true); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Ipv4Src.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Ipv4Src.VALUE); entriesBuilder.setHasMask(true); final Ipv4SrcCaseBuilder ipv4SrcCaseBuilder = new Ipv4SrcCaseBuilder(); final Ipv4SrcBuilder ipv4SrcBuilder = new Ipv4SrcBuilder(); @@ -753,8 +752,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Ipv4Dst.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Ipv4Dst.VALUE); entriesBuilder.setHasMask(true); final Ipv4DstCaseBuilder ipv4DstCaseBuilder = new Ipv4DstCaseBuilder(); final Ipv4DstBuilder ipv4AddressBuilder = new Ipv4DstBuilder(); @@ -789,18 +788,18 @@ public class MatchResponseConvertor2Test { */ @Test public void testWithMatchEntryWithSrcCidrMaskAndDstArbitraryBitMask() { - final MatchBuilder builder = new MatchBuilder(); - builder.setType(OxmMatchType.class); + final MatchBuilder builder = new MatchBuilder() + .setType(OxmMatchType.VALUE); final List entries = new ArrayList<>(); MatchEntryBuilder entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); entriesBuilder.setOxmMatchField( - org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.class); + org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.VALUE); entriesBuilder.setHasMask(true); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Ipv4Src.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Ipv4Src.VALUE); entriesBuilder.setHasMask(true); final Ipv4SrcCaseBuilder ipv4SrcCaseBuilder = new Ipv4SrcCaseBuilder(); final Ipv4SrcBuilder ipv4SrcBuilder = new Ipv4SrcBuilder(); @@ -811,8 +810,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Ipv4Dst.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Ipv4Dst.VALUE); entriesBuilder.setHasMask(true); final Ipv4DstCaseBuilder ipv4DstCaseBuilder = new Ipv4DstCaseBuilder(); final Ipv4DstBuilder ipv4AddressBuilder = new Ipv4DstBuilder(); @@ -847,18 +846,18 @@ public class MatchResponseConvertor2Test { */ @Test public void testWithMatchEntryWithSrcArbitraryBitMaskAndDstCidrMask() { - final MatchBuilder builder = new MatchBuilder(); - builder.setType(OxmMatchType.class); + final MatchBuilder builder = new MatchBuilder() + .setType(OxmMatchType.VALUE); final List entries = new ArrayList<>(); MatchEntryBuilder entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); entriesBuilder.setOxmMatchField( - org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.class); + org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.VALUE); entriesBuilder.setHasMask(true); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Ipv4Src.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Ipv4Src.VALUE); entriesBuilder.setHasMask(true); final Ipv4SrcCaseBuilder ipv4SrcCaseBuilder = new Ipv4SrcCaseBuilder(); final Ipv4SrcBuilder ipv4SrcBuilder = new Ipv4SrcBuilder(); @@ -869,8 +868,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Ipv4Dst.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Ipv4Dst.VALUE); entriesBuilder.setHasMask(true); final Ipv4DstCaseBuilder ipv4DstCaseBuilder = new Ipv4DstCaseBuilder(); final Ipv4DstBuilder ipv4AddressBuilder = new Ipv4DstBuilder(); @@ -906,18 +905,18 @@ public class MatchResponseConvertor2Test { */ @Test public void testWithMatchEntryWithDstArbitraryBitMaskAndSrcCidrMask() { - final MatchBuilder builder = new MatchBuilder(); - builder.setType(OxmMatchType.class); + final MatchBuilder builder = new MatchBuilder() + .setType(OxmMatchType.VALUE); final List entries = new ArrayList<>(); MatchEntryBuilder entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); entriesBuilder.setOxmMatchField( - org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.class); + org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.VALUE); entriesBuilder.setHasMask(true); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Ipv4Dst.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Ipv4Dst.VALUE); entriesBuilder.setHasMask(true); final Ipv4DstCaseBuilder ipv4DstCaseBuilder = new Ipv4DstCaseBuilder(); final Ipv4DstBuilder ipv4AddressBuilder = new Ipv4DstBuilder(); @@ -928,8 +927,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Ipv4Src.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Ipv4Src.VALUE); entriesBuilder.setHasMask(true); final Ipv4SrcCaseBuilder ipv4SrcCaseBuilder = new Ipv4SrcCaseBuilder(); final Ipv4SrcBuilder ipv4SrcBuilder = new Ipv4SrcBuilder(); @@ -964,18 +963,18 @@ public class MatchResponseConvertor2Test { */ @Test public void testWithMatchEntryWithDstCidrMaskAndSrcArbitraryBitMask() { - final MatchBuilder builder = new MatchBuilder(); - builder.setType(OxmMatchType.class); + final MatchBuilder builder = new MatchBuilder() + .setType(OxmMatchType.VALUE); final List entries = new ArrayList<>(); MatchEntryBuilder entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); entriesBuilder.setOxmMatchField( - org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.class); + org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.VALUE); entriesBuilder.setHasMask(true); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Ipv4Dst.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Ipv4Dst.VALUE); entriesBuilder.setHasMask(true); final Ipv4DstCaseBuilder ipv4DstCaseBuilder = new Ipv4DstCaseBuilder(); final Ipv4DstBuilder ipv4AddressBuilder = new Ipv4DstBuilder(); @@ -986,8 +985,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Ipv4Src.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Ipv4Src.VALUE); entriesBuilder.setHasMask(true); final Ipv4SrcCaseBuilder ipv4SrcCaseBuilder = new Ipv4SrcCaseBuilder(); final Ipv4SrcBuilder ipv4SrcBuilder = new Ipv4SrcBuilder(); @@ -1022,13 +1021,13 @@ public class MatchResponseConvertor2Test { */ @Test public void testLayer4MatchUdp() { - final MatchBuilder builder = new MatchBuilder(); - builder.setType(OxmMatchType.class); + final MatchBuilder builder = new MatchBuilder() + .setType(OxmMatchType.VALUE); final List entries = new ArrayList<>(); MatchEntryBuilder entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); entriesBuilder.setOxmMatchField( - org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.UdpSrc.class); + org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.UdpSrc.VALUE); entriesBuilder.setHasMask(false); final UdpSrcCaseBuilder udpSrcCaseBuilder = new UdpSrcCaseBuilder(); final UdpSrcBuilder portBuilder = new UdpSrcBuilder(); @@ -1040,8 +1039,8 @@ public class MatchResponseConvertor2Test { entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(UdpDst.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(UdpDst.VALUE); entriesBuilder.setHasMask(false); final UdpDstCaseBuilder udpDstCaseBuilder = new UdpDstCaseBuilder(); final UdpDstBuilder udpDstBuilder = new UdpDstBuilder(); @@ -1070,12 +1069,12 @@ public class MatchResponseConvertor2Test { */ @Test public void testLayer4MatchSctp() { - final MatchBuilder builder = new MatchBuilder(); - builder.setType(OxmMatchType.class); + final MatchBuilder builder = new MatchBuilder() + .setType(OxmMatchType.VALUE); final List entries = new ArrayList<>(); MatchEntryBuilder entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(SctpSrc.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(SctpSrc.VALUE); entriesBuilder.setHasMask(false); final SctpSrcCaseBuilder sctpSrcCaseBuilder = new SctpSrcCaseBuilder(); final SctpSrcBuilder portBuilder = new SctpSrcBuilder(); @@ -1087,8 +1086,8 @@ public class MatchResponseConvertor2Test { entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(SctpDst.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(SctpDst.VALUE); entriesBuilder.setHasMask(false); final SctpDstCaseBuilder sctpDstCaseBuilder = new SctpDstCaseBuilder(); final SctpDstBuilder sctpDstBuilder = new SctpDstBuilder(); @@ -1118,12 +1117,12 @@ public class MatchResponseConvertor2Test { */ @Test public void testLayer3MatchIpv6() { - final MatchBuilder builder = new MatchBuilder(); - builder.setType(OxmMatchType.class); + final MatchBuilder builder = new MatchBuilder() + .setType(OxmMatchType.VALUE); final List entries = new ArrayList<>(); MatchEntryBuilder entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Ipv6Src.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Ipv6Src.VALUE); entriesBuilder.setHasMask(false); final Ipv6SrcCaseBuilder ipv6SrcCaseBuilder = new Ipv6SrcCaseBuilder(); final Ipv6SrcBuilder ipv6AddressBuilder = new Ipv6SrcBuilder(); @@ -1133,8 +1132,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Ipv6Dst.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Ipv6Dst.VALUE); entriesBuilder.setHasMask(false); final Ipv6DstCaseBuilder ipv6DstCaseBuilder = new Ipv6DstCaseBuilder(); final Ipv6DstBuilder ipv6DstBuilder = new Ipv6DstBuilder(); @@ -1144,8 +1143,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Ipv6Flabel.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Ipv6Flabel.VALUE); entriesBuilder.setHasMask(false); final Ipv6FlabelCaseBuilder ipv6FlabelCaseBuilder = new Ipv6FlabelCaseBuilder(); final Ipv6FlabelBuilder ipv6FlabelBuilder = new Ipv6FlabelBuilder(); @@ -1155,8 +1154,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Ipv6NdTarget.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Ipv6NdTarget.VALUE); entriesBuilder.setHasMask(false); final Ipv6NdTargetCaseBuilder ipv6NdTargetCaseBuilder = new Ipv6NdTargetCaseBuilder(); final Ipv6NdTargetBuilder ipv6NdTargetBuilder = new Ipv6NdTargetBuilder(); @@ -1166,8 +1165,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Ipv6NdSll.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Ipv6NdSll.VALUE); entriesBuilder.setHasMask(false); final Ipv6NdSllCaseBuilder ipv6NdSllCaseBuilder = new Ipv6NdSllCaseBuilder(); final Ipv6NdSllBuilder ipv6NdSllBuilder = new Ipv6NdSllBuilder(); @@ -1177,8 +1176,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Ipv6NdTll.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Ipv6NdTll.VALUE); entriesBuilder.setHasMask(false); final Ipv6NdTllCaseBuilder ipv6NdTllCaseBuilder = new Ipv6NdTllCaseBuilder(); final Ipv6NdTllBuilder ipv6NdTllBuilder = new Ipv6NdTllBuilder(); @@ -1188,8 +1187,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Ipv6Exthdr.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Ipv6Exthdr.VALUE); entriesBuilder.setHasMask(false); final Ipv6ExthdrCaseBuilder ipv6ExthdrCaseBuilder = new Ipv6ExthdrCaseBuilder(); final Ipv6ExthdrBuilder ipv6ExthdrBuilder = new Ipv6ExthdrBuilder(); @@ -1226,12 +1225,12 @@ public class MatchResponseConvertor2Test { */ @Test public void testLayer3MatchIpv6ExtHeader2() { - final MatchBuilder builder = new MatchBuilder(); - builder.setType(OxmMatchType.class); + final MatchBuilder builder = new MatchBuilder() + .setType(OxmMatchType.VALUE); final List entries = new ArrayList<>(); final MatchEntryBuilder entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Ipv6Exthdr.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Ipv6Exthdr.VALUE); entriesBuilder.setHasMask(true); final Ipv6ExthdrCaseBuilder ipv6ExthdrCaseBuilder = new Ipv6ExthdrCaseBuilder(); final Ipv6ExthdrBuilder ipv6ExthdrBuilder = new Ipv6ExthdrBuilder(); @@ -1263,12 +1262,12 @@ public class MatchResponseConvertor2Test { */ @Test public void testLayer3MatchArp() { - final MatchBuilder builder = new MatchBuilder(); - builder.setType(OxmMatchType.class); + final MatchBuilder builder = new MatchBuilder() + .setType(OxmMatchType.VALUE); final List entries = new ArrayList<>(); MatchEntryBuilder entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(ArpOp.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(ArpOp.VALUE); entriesBuilder.setHasMask(false); final ArpOpCaseBuilder arpOpCaseBuilder = new ArpOpCaseBuilder(); final ArpOpBuilder arpOpBuilder = new ArpOpBuilder(); @@ -1278,8 +1277,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(ArpSpa.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(ArpSpa.VALUE); entriesBuilder.setHasMask(false); final ArpSpaCaseBuilder arpSpaCaseBuilder = new ArpSpaCaseBuilder(); final ArpSpaBuilder arpSpaBuilder = new ArpSpaBuilder(); @@ -1289,8 +1288,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(ArpTpa.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(ArpTpa.VALUE); entriesBuilder.setHasMask(false); final ArpTpaCaseBuilder arpTpaCaseBuilder = new ArpTpaCaseBuilder(); final ArpTpaBuilder arpTpaBuilder = new ArpTpaBuilder(); @@ -1300,8 +1299,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(ArpSha.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(ArpSha.VALUE); entriesBuilder.setHasMask(false); final ArpShaCaseBuilder arpShaCaseBuilder = new ArpShaCaseBuilder(); final ArpShaBuilder arpShaBuilder = new ArpShaBuilder(); @@ -1311,9 +1310,9 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); entriesBuilder.setOxmMatchField( - org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.ArpTha.class); + org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.ArpTha.VALUE); entriesBuilder.setHasMask(false); final ArpThaCaseBuilder arpThaCaseBuilder = new ArpThaCaseBuilder(); final ArpThaBuilder arpThaBuilder = new ArpThaBuilder(); @@ -1347,12 +1346,12 @@ public class MatchResponseConvertor2Test { */ @Test public void testLayer3MatchArpWithMasks() { - final MatchBuilder builder = new MatchBuilder(); - builder.setType(OxmMatchType.class); + final MatchBuilder builder = new MatchBuilder() + .setType(OxmMatchType.VALUE); final List entries = new ArrayList<>(); MatchEntryBuilder entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(ArpSpa.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(ArpSpa.VALUE); entriesBuilder.setHasMask(true); final ArpSpaCaseBuilder arpSpaCaseBuilder = new ArpSpaCaseBuilder(); final ArpSpaBuilder arpSpaBuilder = new ArpSpaBuilder(); @@ -1363,8 +1362,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(ArpTpa.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(ArpTpa.VALUE); entriesBuilder.setHasMask(true); final ArpTpaCaseBuilder arpTpaCaseBuilder = new ArpTpaCaseBuilder(); final ArpTpaBuilder arpTpaBuilder = new ArpTpaBuilder(); @@ -1375,8 +1374,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(ArpSha.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(ArpSha.VALUE); entriesBuilder.setHasMask(true); final ArpShaCaseBuilder arpShaCaseBuilder = new ArpShaCaseBuilder(); final ArpShaBuilder arpShaBuilder = new ArpShaBuilder(); @@ -1387,9 +1386,9 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); entriesBuilder.setOxmMatchField( - org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.ArpTha.class); + org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.ArpTha.VALUE); entriesBuilder.setHasMask(true); final ArpThaCaseBuilder arpThaCaseBuilder = new ArpThaCaseBuilder(); final ArpThaBuilder arpThaBuilder = new ArpThaBuilder(); @@ -1428,18 +1427,18 @@ public class MatchResponseConvertor2Test { */ @Test public void testWithMatchEntryWithIpv6ArbitraryMasks() { - final MatchBuilder builder = new MatchBuilder(); - builder.setType(OxmMatchType.class); + final MatchBuilder builder = new MatchBuilder() + .setType(OxmMatchType.VALUE); final List entries = new ArrayList<>(); MatchEntryBuilder entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); entriesBuilder.setOxmMatchField( - org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.class); + org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.VALUE); entriesBuilder.setHasMask(true); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Ipv6Src.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Ipv6Src.VALUE); entriesBuilder.setHasMask(true); final Ipv6SrcCaseBuilder ipv6SrcCaseBuilder = new Ipv6SrcCaseBuilder(); final Ipv6SrcBuilder ipv6SrcBuilder = new Ipv6SrcBuilder(); @@ -1450,8 +1449,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Ipv6Dst.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Ipv6Dst.VALUE); entriesBuilder.setHasMask(true); final Ipv6DstCaseBuilder ipv6DstCaseBuilder = new Ipv6DstCaseBuilder(); final Ipv6DstBuilder ipv6AddressBuilder = new Ipv6DstBuilder(); @@ -1486,18 +1485,18 @@ public class MatchResponseConvertor2Test { */ @Test public void testWithMatchEntryWithIpv6SrcCidrlMaskAndDstArbitraryBitMask() { - final MatchBuilder builder = new MatchBuilder(); - builder.setType(OxmMatchType.class); + final MatchBuilder builder = new MatchBuilder() + .setType(OxmMatchType.VALUE); final List entries = new ArrayList<>(); MatchEntryBuilder entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); entriesBuilder.setOxmMatchField( - org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.class); + org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.VALUE); entriesBuilder.setHasMask(true); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Ipv6Src.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Ipv6Src.VALUE); entriesBuilder.setHasMask(true); final Ipv6SrcCaseBuilder ipv6SrcCaseBuilder = new Ipv6SrcCaseBuilder(); final Ipv6SrcBuilder ipv6SrcBuilder = new Ipv6SrcBuilder(); @@ -1508,8 +1507,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Ipv6Dst.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Ipv6Dst.VALUE); entriesBuilder.setHasMask(true); final Ipv6DstCaseBuilder ipv6DstCaseBuilder = new Ipv6DstCaseBuilder(); final Ipv6DstBuilder ipv6AddressBuilder = new Ipv6DstBuilder(); @@ -1544,18 +1543,18 @@ public class MatchResponseConvertor2Test { */ @Test public void testWithMatchEntryWithIpv6SrcArbitraryBitMaskAndDstCidrMask() { - final MatchBuilder builder = new MatchBuilder(); - builder.setType(OxmMatchType.class); + final MatchBuilder builder = new MatchBuilder() + .setType(OxmMatchType.VALUE); final List entries = new ArrayList<>(); MatchEntryBuilder entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); entriesBuilder.setOxmMatchField( - org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.class); + org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.VALUE); entriesBuilder.setHasMask(true); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Ipv6Src.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Ipv6Src.VALUE); entriesBuilder.setHasMask(true); final Ipv6SrcCaseBuilder ipv6SrcCaseBuilder = new Ipv6SrcCaseBuilder(); final Ipv6SrcBuilder ipv6SrcBuilder = new Ipv6SrcBuilder(); @@ -1566,8 +1565,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Ipv6Dst.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Ipv6Dst.VALUE); entriesBuilder.setHasMask(true); final Ipv6DstCaseBuilder ipv6DstCaseBuilder = new Ipv6DstCaseBuilder(); final Ipv6DstBuilder ipv6AddressBuilder = new Ipv6DstBuilder(); @@ -1603,18 +1602,18 @@ public class MatchResponseConvertor2Test { */ @Test public void testWithMatchEntryWithIpv6DstArbitraryBitMaskAndSrcCidrMask() { - final MatchBuilder builder = new MatchBuilder(); - builder.setType(OxmMatchType.class); + final MatchBuilder builder = new MatchBuilder() + .setType(OxmMatchType.VALUE); final List entries = new ArrayList<>(); MatchEntryBuilder entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); entriesBuilder.setOxmMatchField( - org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.class); + org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.VALUE); entriesBuilder.setHasMask(true); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Ipv6Dst.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Ipv6Dst.VALUE); entriesBuilder.setHasMask(true); final Ipv6DstCaseBuilder ipv6DstCaseBuilder = new Ipv6DstCaseBuilder(); final Ipv6DstBuilder ipv6AddressBuilder = new Ipv6DstBuilder(); @@ -1625,8 +1624,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Ipv6Src.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Ipv6Src.VALUE); entriesBuilder.setHasMask(true); final Ipv6SrcCaseBuilder ipv6SrcCaseBuilder = new Ipv6SrcCaseBuilder(); final Ipv6SrcBuilder ipv6SrcBuilder = new Ipv6SrcBuilder(); @@ -1662,18 +1661,18 @@ public class MatchResponseConvertor2Test { */ @Test public void testWithMatchEntryWithIpv6DstCidrMaskAndSrcArbitraryBitMask() { - final MatchBuilder builder = new MatchBuilder(); - builder.setType(OxmMatchType.class); + final MatchBuilder builder = new MatchBuilder() + .setType(OxmMatchType.VALUE); final List entries = new ArrayList<>(); MatchEntryBuilder entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); entriesBuilder.setOxmMatchField( - org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.class); + org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.VALUE); entriesBuilder.setHasMask(true); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Ipv6Dst.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Ipv6Dst.VALUE); entriesBuilder.setHasMask(true); final Ipv6DstCaseBuilder ipv6DstCaseBuilder = new Ipv6DstCaseBuilder(); final Ipv6DstBuilder ipv6AddressBuilder = new Ipv6DstBuilder(); @@ -1684,8 +1683,8 @@ public class MatchResponseConvertor2Test { entries.add(entriesBuilder.build()); entriesBuilder = new MatchEntryBuilder(); - entriesBuilder.setOxmClass(OpenflowBasicClass.class); - entriesBuilder.setOxmMatchField(Ipv6Src.class); + entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE); + entriesBuilder.setOxmMatchField(Ipv6Src.VALUE); entriesBuilder.setHasMask(true); final Ipv6SrcCaseBuilder ipv6SrcCaseBuilder = new Ipv6SrcCaseBuilder(); final Ipv6SrcBuilder ipv6SrcBuilder = new Ipv6SrcBuilder(); diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchResponseConvertorTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchResponseConvertorTest.java index 8c96520c11..6c4b2c4656 100644 --- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchResponseConvertorTest.java +++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchResponseConvertorTest.java @@ -183,12 +183,12 @@ public class MatchResponseConvertorTest { createOFMatch(final List entries) { org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.MatchBuilder builder = new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.MatchBuilder(); - return builder.setType(OxmMatchType.class).setMatchEntry(entries).build(); + return builder.setType(OxmMatchType.VALUE).setMatchEntry(entries).build(); } private static List createDefaultMatchEntry() { List entries = new ArrayList<>(); - entries.add(toOfPort(InPort.class, IN_PORT)); + entries.add(toOfPort(InPort.VALUE, IN_PORT)); MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder(); EthSrcCaseBuilder ethSrcCaseBuilder = new EthSrcCaseBuilder(); @@ -197,7 +197,7 @@ public class MatchResponseConvertorTest { ethSrcBuilder.setMacAddress(MAC_SRC); ethSrcCaseBuilder.setEthSrc(ethSrcBuilder.build()); matchEntryBuilder.setMatchEntryValue(ethSrcCaseBuilder.build()); - matchEntryBuilder.setOxmMatchField(EthSrc.class); + matchEntryBuilder.setOxmMatchField(EthSrc.VALUE); entries.add(matchEntryBuilder.build()); @@ -206,7 +206,7 @@ public class MatchResponseConvertorTest { ethDstBuilder.setMacAddress(MAC_DST); ethDstCaseBuilder.setEthDst(ethDstBuilder.build()); matchEntryBuilder.setMatchEntryValue(ethDstCaseBuilder.build()); - matchEntryBuilder.setOxmMatchField(EthDst.class); + matchEntryBuilder.setOxmMatchField(EthDst.VALUE); entries.add(matchEntryBuilder.build()); entries.add(toOfEthernetType(ETHTYPE_IPV4)); @@ -215,9 +215,9 @@ public class MatchResponseConvertorTest { private static MatchEntry toOfEthernetType(final Uint16 ethType) { MatchEntryBuilder builder = new MatchEntryBuilder(); - builder.setOxmClass(OpenflowBasicClass.class); + builder.setOxmClass(OpenflowBasicClass.VALUE); builder.setHasMask(false); - builder.setOxmMatchField(EthType.class); + builder.setOxmMatchField(EthType.VALUE); EthTypeCaseBuilder ethTypeCaseBuilder = new EthTypeCaseBuilder(); EthTypeBuilder ethTypeBuilder = new EthTypeBuilder(); EtherType etherType = new EtherType(ethType); @@ -227,10 +227,9 @@ public class MatchResponseConvertorTest { return builder.build(); } - private static MatchEntry toOfPort(final Class field, - final Uint32 portNumber) { + private static MatchEntry toOfPort(final MatchField field, final Uint32 portNumber) { MatchEntryBuilder builder = new MatchEntryBuilder(); - builder.setOxmClass(OpenflowBasicClass.class); + builder.setOxmClass(OpenflowBasicClass.VALUE); builder.setHasMask(false); builder.setOxmMatchField(field); InPortCaseBuilder inPortCaseBuilder = new InPortCaseBuilder(); @@ -246,8 +245,8 @@ public class MatchResponseConvertorTest { boolean cfi = true; final Uint16 vidValue; byte[] mask = null; - builder.setOxmClass(OpenflowBasicClass.class); - builder.setOxmMatchField(VlanVid.class); + builder.setOxmClass(OpenflowBasicClass.VALUE); + builder.setOxmMatchField(VlanVid.VALUE); if (vid == 0) { // Match untagged frame. cfi = false; diff --git a/parent/pom.xml b/parent/pom.xml index 3638caa3b8..9f5c59ba75 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.mdsal binding-parent - 9.0.4 + 10.0.0 @@ -41,14 +41,14 @@ org.opendaylight.controller controller-artifacts - 5.0.5 + 6.0.0 pom import org.opendaylight.infrautils infrautils-artifacts - 3.0.1 + 4.0.0 pom import diff --git a/pom.xml b/pom.xml index 6a6941eac5..8fc5fdb2da 100644 --- a/pom.xml +++ b/pom.xml @@ -52,4 +52,17 @@ + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + 3.1.1 + + + + diff --git a/samples/pom.xml b/samples/pom.xml index f3f9e1eca8..2e8e2e63b4 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent-lite - 10.0.2 + 11.0.0 diff --git a/samples/sample-bundles/src/main/java/org/opendaylight/openflowplugin/samples/sample/bundles/SampleFlowCapableNodeListener.java b/samples/sample-bundles/src/main/java/org/opendaylight/openflowplugin/samples/sample/bundles/SampleFlowCapableNodeListener.java index d205cacbee..80b101932e 100644 --- a/samples/sample-bundles/src/main/java/org/opendaylight/openflowplugin/samples/sample/bundles/SampleFlowCapableNodeListener.java +++ b/samples/sample-bundles/src/main/java/org/opendaylight/openflowplugin/samples/sample/bundles/SampleFlowCapableNodeListener.java @@ -184,7 +184,7 @@ public class SampleFlowCapableNodeListener implements ClusteredDataTreeChangeLis try { return future.get(); } catch (InterruptedException | ExecutionException e) { - throw new RuntimeException(e); + throw new IllegalStateException(e); } }, EXECUTOR); } diff --git a/test-provider/pom.xml b/test-provider/pom.xml index 34e7f95992..1912acf1da 100644 --- a/test-provider/pom.xml +++ b/test-provider/pom.xml @@ -50,8 +50,8 @@ true - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api true diff --git a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginStatsTestCommandProvider.java b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginStatsTestCommandProvider.java index f598e1f3a9..8ef877f03b 100644 --- a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginStatsTestCommandProvider.java +++ b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginStatsTestCommandProvider.java @@ -474,7 +474,7 @@ public class OpenflowpluginStatsTestCommandProvider implements CommandProvider { InstanceIdentifier nodesID = InstanceIdentifier.create(Nodes.class); Nodes nodes = TestProviderTransactionUtil.getDataObject(readOnlyTransaction, nodesID); if (nodes == null) { - throw new RuntimeException("nodes are not found, pls add the node."); + throw new IllegalStateException("nodes are not found, pls add the node."); } return nodes.nonnullNode().values(); } diff --git a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTableFeaturesTestCommandProvider.java b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTableFeaturesTestCommandProvider.java index ade7753826..130a251eb5 100644 --- a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTableFeaturesTestCommandProvider.java +++ b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTableFeaturesTestCommandProvider.java @@ -294,7 +294,7 @@ public class OpenflowpluginTableFeaturesTestCommandProvider implements CommandPr .setMatchSetfield(new MatchSetfieldBuilder() .setSetFieldMatch(BindingMap.of(new SetFieldMatchBuilder() .setHasMask(false) - .setMatchType(MplsLabel.class) + .setMatchType(MplsLabel.VALUE) .build())) .build()) .build()) @@ -309,9 +309,10 @@ public class OpenflowpluginTableFeaturesTestCommandProvider implements CommandPr .setWriteSetfield(new org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature .prop.type.table.feature.prop.type.write.setfield.WriteSetfieldBuilder() .setSetFieldMatch(BindingMap.ordered( - new SetFieldMatchBuilder().setHasMask(false).setMatchType(MplsLabel.class).build(), - new SetFieldMatchBuilder().setHasMask(true).setMatchType(MplsBos.class).build(), - new SetFieldMatchBuilder().setHasMask(true).setMatchType(EthDst.class).build())).build()) + new SetFieldMatchBuilder().setHasMask(false).setMatchType(MplsLabel.VALUE).build(), + new SetFieldMatchBuilder().setHasMask(true).setMatchType(MplsBos.VALUE).build(), + new SetFieldMatchBuilder().setHasMask(true).setMatchType(EthDst.VALUE).build())) + .build()) .build()) .withKey(new TableFeaturePropertiesKey(0)) .setOrder(1); @@ -324,9 +325,9 @@ public class OpenflowpluginTableFeaturesTestCommandProvider implements CommandPr .setWriteSetfieldMiss(new org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature .prop.type.table.feature.prop.type.write.setfield.miss.WriteSetfieldMissBuilder() .setSetFieldMatch(BindingMap.ordered( - new SetFieldMatchBuilder().setHasMask(false).setMatchType(EthSrc.class).build(), - new SetFieldMatchBuilder().setHasMask(true).setMatchType(InPort.class).build(), - new SetFieldMatchBuilder().setHasMask(true).setMatchType(Ipv4Dst.class).build())) + new SetFieldMatchBuilder().setHasMask(false).setMatchType(EthSrc.VALUE).build(), + new SetFieldMatchBuilder().setHasMask(true).setMatchType(InPort.VALUE).build(), + new SetFieldMatchBuilder().setHasMask(true).setMatchType(Ipv4Dst.VALUE).build())) .build()) .build()) .withKey(new TableFeaturePropertiesKey(0)).setOrder(1); @@ -339,9 +340,9 @@ public class OpenflowpluginTableFeaturesTestCommandProvider implements CommandPr .setApplySetfield(new org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature .prop.type.table.feature.prop.type.apply.setfield.ApplySetfieldBuilder() .setSetFieldMatch(BindingMap.ordered( - new SetFieldMatchBuilder().setHasMask(false).setMatchType(ArpOp.class).build(), - new SetFieldMatchBuilder().setHasMask(true).setMatchType(InPort.class).build(), - new SetFieldMatchBuilder().setHasMask(true).setMatchType(Ipv4Dst.class).build())) + new SetFieldMatchBuilder().setHasMask(false).setMatchType(ArpOp.VALUE).build(), + new SetFieldMatchBuilder().setHasMask(true).setMatchType(InPort.VALUE).build(), + new SetFieldMatchBuilder().setHasMask(true).setMatchType(Ipv4Dst.VALUE).build())) .build()) .build()) .withKey(new TableFeaturePropertiesKey(0)) @@ -355,9 +356,9 @@ public class OpenflowpluginTableFeaturesTestCommandProvider implements CommandPr .setApplySetfieldMiss(new org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table .feature.prop.type.table.feature.prop.type.apply.setfield.miss.ApplySetfieldMissBuilder() .setSetFieldMatch(BindingMap.of( - new SetFieldMatchBuilder().setHasMask(false).setMatchType(ArpOp.class).build(), - new SetFieldMatchBuilder().setHasMask(true).setMatchType(InPort.class).build(), - new SetFieldMatchBuilder().setHasMask(true).setMatchType(Ipv4Dst.class).build())) + new SetFieldMatchBuilder().setHasMask(false).setMatchType(ArpOp.VALUE).build(), + new SetFieldMatchBuilder().setHasMask(true).setMatchType(InPort.VALUE).build(), + new SetFieldMatchBuilder().setHasMask(true).setMatchType(Ipv4Dst.VALUE).build())) .build()) .build()) .withKey(new TableFeaturePropertiesKey(0)) @@ -370,8 +371,8 @@ public class OpenflowpluginTableFeaturesTestCommandProvider implements CommandPr .setTableFeaturePropType(new WildcardsBuilder() .setWildcardSetfield(new WildcardSetfieldBuilder() .setSetFieldMatch(BindingMap.ordered( - new SetFieldMatchBuilder().setHasMask(false).setMatchType(ArpOp.class).build(), - new SetFieldMatchBuilder().setHasMask(true).setMatchType(InPort.class).build())) + new SetFieldMatchBuilder().setHasMask(false).setMatchType(ArpOp.VALUE).build(), + new SetFieldMatchBuilder().setHasMask(true).setMatchType(InPort.VALUE).build())) .build()) .build()) .withKey(new TableFeaturePropertiesKey(0)) -- 2.36.6