X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=extension%2Fopenflowjava-extension-nicira%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fopenflowjava%2Fnx%2FNiciraExtensionsRegistrator.java;h=6c2d28ceb50597cd8dedbf40775616856c8944f2;hb=refs%2Fchanges%2F91%2F72091%2F9;hp=761dc649cf880ccf6de44cad6339033db84e2e2c;hpb=513001ced86b008088b767994d0c83aacfa36863;p=openflowplugin.git diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/NiciraExtensionsRegistrator.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/NiciraExtensionsRegistrator.java index 761dc649cf..6c2d28ceb5 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/NiciraExtensionsRegistrator.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/NiciraExtensionsRegistrator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015 Cisco Systems, Inc. and others. All rights reserved. + * Copyright (c) 2014, 2017 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, @@ -8,36 +8,50 @@ package org.opendaylight.openflowjava.nx; +import com.google.common.base.Preconditions; import org.opendaylight.openflowjava.nx.api.NiciraExtensionCodecRegistrator; import org.opendaylight.openflowjava.nx.codec.action.ConntrackCodec; +import org.opendaylight.openflowjava.nx.codec.action.CtClearCodec; +import org.opendaylight.openflowjava.nx.codec.action.DecapCodec; +import org.opendaylight.openflowjava.nx.codec.action.EncapCodec; +import org.opendaylight.openflowjava.nx.codec.action.FinTimeoutCodec; +import org.opendaylight.openflowjava.nx.codec.action.LearnCodec; import org.opendaylight.openflowjava.nx.codec.action.MultipathCodec; import org.opendaylight.openflowjava.nx.codec.action.NiciraActionCodecs; import org.opendaylight.openflowjava.nx.codec.action.OutputRegCodec; +import org.opendaylight.openflowjava.nx.codec.action.PopNshCodec; +import org.opendaylight.openflowjava.nx.codec.action.PushNshCodec; import org.opendaylight.openflowjava.nx.codec.action.RegLoadCodec; import org.opendaylight.openflowjava.nx.codec.action.RegMoveCodec; import org.opendaylight.openflowjava.nx.codec.action.ResubmitCodec; -import org.opendaylight.openflowjava.nx.codec.action.SetNshc1Codec; -import org.opendaylight.openflowjava.nx.codec.action.SetNshc2Codec; -import org.opendaylight.openflowjava.nx.codec.action.SetNshc3Codec; -import org.opendaylight.openflowjava.nx.codec.action.SetNshc4Codec; -import org.opendaylight.openflowjava.nx.codec.action.SetNsiCodec; -import org.opendaylight.openflowjava.nx.codec.action.SetNspCodec; import org.opendaylight.openflowjava.nx.codec.match.ArpOpCodec; import org.opendaylight.openflowjava.nx.codec.match.ArpShaCodec; import org.opendaylight.openflowjava.nx.codec.match.ArpSpaCodec; import org.opendaylight.openflowjava.nx.codec.match.ArpThaCodec; import org.opendaylight.openflowjava.nx.codec.match.ArpTpaCodec; +import org.opendaylight.openflowjava.nx.codec.match.CtMarkCodec; import org.opendaylight.openflowjava.nx.codec.match.CtStateCodec; +import org.opendaylight.openflowjava.nx.codec.match.CtTpDstCodec; +import org.opendaylight.openflowjava.nx.codec.match.CtTpSrcCodec; import org.opendaylight.openflowjava.nx.codec.match.CtZoneCodec; +import org.opendaylight.openflowjava.nx.codec.match.EncapEthDstCodec; +import org.opendaylight.openflowjava.nx.codec.match.EncapEthSrcCodec; +import org.opendaylight.openflowjava.nx.codec.match.EncapEthTypeCodec; import org.opendaylight.openflowjava.nx.codec.match.EthDstCodec; import org.opendaylight.openflowjava.nx.codec.match.EthSrcCodec; import org.opendaylight.openflowjava.nx.codec.match.EthTypeCodec; +import org.opendaylight.openflowjava.nx.codec.match.InPortCodec; +import org.opendaylight.openflowjava.nx.codec.match.MplsLabelCodec; +import org.opendaylight.openflowjava.nx.codec.match.NiciraMatchCodecs; +import org.opendaylight.openflowjava.nx.codec.match.NshMdtypeCodec; +import org.opendaylight.openflowjava.nx.codec.match.NshNpCodec; import org.opendaylight.openflowjava.nx.codec.match.Nshc1Codec; import org.opendaylight.openflowjava.nx.codec.match.Nshc2Codec; import org.opendaylight.openflowjava.nx.codec.match.Nshc3Codec; import org.opendaylight.openflowjava.nx.codec.match.Nshc4Codec; import org.opendaylight.openflowjava.nx.codec.match.NsiCodec; import org.opendaylight.openflowjava.nx.codec.match.NspCodec; +import org.opendaylight.openflowjava.nx.codec.match.PktMarkCodec; import org.opendaylight.openflowjava.nx.codec.match.Reg0Codec; import org.opendaylight.openflowjava.nx.codec.match.Reg1Codec; import org.opendaylight.openflowjava.nx.codec.match.Reg2Codec; @@ -48,26 +62,19 @@ import org.opendaylight.openflowjava.nx.codec.match.Reg6Codec; import org.opendaylight.openflowjava.nx.codec.match.Reg7Codec; import org.opendaylight.openflowjava.nx.codec.match.TcpDstCodec; import org.opendaylight.openflowjava.nx.codec.match.TcpSrcCodec; +import org.opendaylight.openflowjava.nx.codec.match.TunGpeNpCodec; import org.opendaylight.openflowjava.nx.codec.match.TunIdCodec; import org.opendaylight.openflowjava.nx.codec.match.TunIpv4DstCodec; import org.opendaylight.openflowjava.nx.codec.match.TunIpv4SrcCodec; import org.opendaylight.openflowjava.nx.codec.match.UdpDstCodec; import org.opendaylight.openflowjava.nx.codec.match.UdpSrcCodec; -import com.google.common.base.Preconditions; - public class NiciraExtensionsRegistrator implements AutoCloseable { - private final NiciraExtensionCodecRegistrator registrator; - /** - * @param registrator cannot be null - */ public NiciraExtensionsRegistrator(NiciraExtensionCodecRegistrator registrator) { this.registrator = Preconditions.checkNotNull(registrator); - } - public void registerNiciraExtensions() { registrator.registerActionDeserializer(RegLoadCodec.DESERIALIZER_KEY, NiciraActionCodecs.REG_LOAD_CODEC); registrator.registerActionSerializer(RegLoadCodec.SERIALIZER_KEY, NiciraActionCodecs.REG_LOAD_CODEC); registrator.registerActionDeserializer(RegMoveCodec.DESERIALIZER_KEY, NiciraActionCodecs.REG_MOVE_CODEC); @@ -77,22 +84,26 @@ public class NiciraExtensionsRegistrator implements AutoCloseable { registrator.registerActionSerializer(ResubmitCodec.SERIALIZER_KEY, NiciraActionCodecs.RESUBMIT_CODEC); registrator.registerActionDeserializer(ResubmitCodec.DESERIALIZER_KEY, NiciraActionCodecs.RESUBMIT_CODEC); registrator.registerActionDeserializer(ResubmitCodec.TABLE_DESERIALIZER_KEY, NiciraActionCodecs.RESUBMIT_CODEC); + registrator.registerActionSerializer(FinTimeoutCodec.SERIALIZER_KEY, NiciraActionCodecs.FIN_TIMEOUT_CODEC); + registrator.registerActionDeserializer(FinTimeoutCodec.DESERIALIZER_KEY, NiciraActionCodecs.FIN_TIMEOUT_CODEC); registrator.registerActionSerializer(MultipathCodec.SERIALIZER_KEY, NiciraActionCodecs.MULTIPATH_CODEC); registrator.registerActionDeserializer(MultipathCodec.DESERIALIZER_KEY, NiciraActionCodecs.MULTIPATH_CODEC); - registrator.registerActionDeserializer(SetNspCodec.DESERIALIZER_KEY, NiciraActionCodecs.SET_NSP_CODEC); - registrator.registerActionSerializer(SetNspCodec.SERIALIZER_KEY, NiciraActionCodecs.SET_NSP_CODEC); - registrator.registerActionDeserializer(SetNshc1Codec.DESERIALIZER_KEY, NiciraActionCodecs.SET_NSC1_CODEC); - registrator.registerActionSerializer(SetNshc1Codec.SERIALIZER_KEY, NiciraActionCodecs.SET_NSC1_CODEC); - registrator.registerActionDeserializer(SetNshc2Codec.DESERIALIZER_KEY, NiciraActionCodecs.SET_NSC2_CODEC); - registrator.registerActionSerializer(SetNshc2Codec.SERIALIZER_KEY, NiciraActionCodecs.SET_NSC2_CODEC); - registrator.registerActionDeserializer(SetNshc3Codec.DESERIALIZER_KEY, NiciraActionCodecs.SET_NSC3_CODEC); - registrator.registerActionSerializer(SetNshc3Codec.SERIALIZER_KEY, NiciraActionCodecs.SET_NSC3_CODEC); - registrator.registerActionDeserializer(SetNshc4Codec.DESERIALIZER_KEY, NiciraActionCodecs.SET_NSC4_CODEC); - registrator.registerActionSerializer(SetNshc4Codec.SERIALIZER_KEY, NiciraActionCodecs.SET_NSC4_CODEC); - registrator.registerActionDeserializer(SetNsiCodec.DESERIALIZER_KEY, NiciraActionCodecs.SET_NSI_CODEC); - registrator.registerActionSerializer(SetNsiCodec.SERIALIZER_KEY, NiciraActionCodecs.SET_NSI_CODEC); + registrator.registerActionDeserializer(PushNshCodec.DESERIALIZER_KEY, NiciraActionCodecs.PUSH_NSH_CODEC); + registrator.registerActionSerializer(PushNshCodec.SERIALIZER_KEY, NiciraActionCodecs.PUSH_NSH_CODEC); + registrator.registerActionDeserializer(PopNshCodec.DESERIALIZER_KEY, NiciraActionCodecs.POP_NSH_CODEC); + registrator.registerActionSerializer(PopNshCodec.SERIALIZER_KEY, NiciraActionCodecs.POP_NSH_CODEC); + registrator.registerActionSerializer(ConntrackCodec.SERIALIZER_KEY, NiciraActionCodecs.CONNTRACK_CODEC); registrator.registerActionDeserializer(ConntrackCodec.DESERIALIZER_KEY, NiciraActionCodecs.CONNTRACK_CODEC); + registrator.registerActionSerializer(CtClearCodec.SERIALIZER_KEY, NiciraActionCodecs.CT_CLEAR_CODEC); + registrator.registerActionDeserializer(CtClearCodec.DESERIALIZER_KEY, NiciraActionCodecs.CT_CLEAR_CODEC); + registrator.registerActionSerializer(LearnCodec.SERIALIZER_KEY, NiciraActionCodecs.LEARN_CODEC); + registrator.registerActionDeserializer(LearnCodec.DESERIALIZER_KEY, NiciraActionCodecs.LEARN_CODEC); + registrator.registerActionDeserializer(EncapCodec.DESERIALIZER_KEY, NiciraActionCodecs.ENCAP_CODEC); + registrator.registerActionSerializer(EncapCodec.SERIALIZER_KEY, NiciraActionCodecs.ENCAP_CODEC); + registrator.registerActionDeserializer(DecapCodec.DESERIALIZER_KEY, NiciraActionCodecs.DECAP_CODEC); + registrator.registerActionSerializer(DecapCodec.SERIALIZER_KEY, NiciraActionCodecs.DECAP_CODEC); + // Continue registrator.registerMatchEntrySerializer(Reg0Codec.SERIALIZER_KEY, NiciraMatchCodecs.REG0_CODEC); registrator.registerMatchEntryDeserializer(Reg0Codec.DESERIALIZER_KEY, NiciraMatchCodecs.REG0_CODEC); @@ -122,6 +133,12 @@ public class NiciraExtensionsRegistrator implements AutoCloseable { registrator.registerMatchEntryDeserializer(ArpThaCodec.DESERIALIZER_KEY, NiciraMatchCodecs.ARP_THA_CODEC); registrator.registerMatchEntrySerializer(ArpTpaCodec.SERIALIZER_KEY, NiciraMatchCodecs.ARP_TPA_CODEC); registrator.registerMatchEntryDeserializer(ArpTpaCodec.DESERIALIZER_KEY, NiciraMatchCodecs.ARP_TPA_CODEC); + registrator.registerMatchEntrySerializer(InPortCodec.SERIALIZER_KEY, NiciraMatchCodecs.NXM_OF_IN_PORT_CODEC); + registrator.registerMatchEntryDeserializer(InPortCodec.DESERIALIZER_KEY, + NiciraMatchCodecs.NXM_OF_IN_PORT_CODEC); + registrator.registerMatchEntrySerializer(MplsLabelCodec.SERIALIZER_KEY, NiciraMatchCodecs.OXM_OF_MPLS_LABEL); + registrator.registerMatchEntryDeserializer(MplsLabelCodec.DESERIALIZER_KEY, + NiciraMatchCodecs.OXM_OF_MPLS_LABEL); registrator.registerMatchEntrySerializer(EthDstCodec.SERIALIZER_KEY, NiciraMatchCodecs.ETH_DST_CODEC); registrator.registerMatchEntryDeserializer(EthDstCodec.DESERIALIZER_KEY, NiciraMatchCodecs.ETH_DST_CODEC); registrator.registerMatchEntrySerializer(EthSrcCodec.SERIALIZER_KEY, NiciraMatchCodecs.ETH_SRC_CODEC); @@ -141,9 +158,29 @@ public class NiciraExtensionsRegistrator implements AutoCloseable { registrator.registerMatchEntrySerializer(NsiCodec.SERIALIZER_KEY, NiciraMatchCodecs.NSI_CODEC); registrator.registerMatchEntryDeserializer(NsiCodec.DESERIALIZER_KEY, NiciraMatchCodecs.NSI_CODEC); registrator.registerMatchEntrySerializer(TunIpv4DstCodec.SERIALIZER_KEY, NiciraMatchCodecs.TUN_IPV4_DST_CODEC); - registrator.registerMatchEntryDeserializer(TunIpv4DstCodec.DESERIALIZER_KEY, NiciraMatchCodecs.TUN_IPV4_DST_CODEC); + registrator.registerMatchEntryDeserializer(TunIpv4DstCodec.DESERIALIZER_KEY, + NiciraMatchCodecs.TUN_IPV4_DST_CODEC); registrator.registerMatchEntrySerializer(TunIpv4SrcCodec.SERIALIZER_KEY, NiciraMatchCodecs.TUN_IPV4_SRC_CODEC); - registrator.registerMatchEntryDeserializer(TunIpv4SrcCodec.DESERIALIZER_KEY, NiciraMatchCodecs.TUN_IPV4_SRC_CODEC); + registrator.registerMatchEntryDeserializer(TunIpv4SrcCodec.DESERIALIZER_KEY, + NiciraMatchCodecs.TUN_IPV4_SRC_CODEC); + registrator.registerMatchEntrySerializer(EncapEthTypeCodec.SERIALIZER_KEY, + NiciraMatchCodecs.ENCAP_ETH_TYPE_CODEC); + registrator.registerMatchEntryDeserializer(EncapEthTypeCodec.DESERIALIZER_KEY, + NiciraMatchCodecs.ENCAP_ETH_TYPE_CODEC); + registrator.registerMatchEntrySerializer(EncapEthSrcCodec.SERIALIZER_KEY, + NiciraMatchCodecs.ENCAP_ETH_SRC_CODEC); + registrator.registerMatchEntryDeserializer(EncapEthSrcCodec.DESERIALIZER_KEY, + NiciraMatchCodecs.ENCAP_ETH_SRC_CODEC); + registrator.registerMatchEntrySerializer(EncapEthDstCodec.SERIALIZER_KEY, + NiciraMatchCodecs.ENCAP_ETH_DST_CODEC); + registrator.registerMatchEntryDeserializer(EncapEthDstCodec.DESERIALIZER_KEY, + NiciraMatchCodecs.ENCAP_ETH_DST_CODEC); + registrator.registerMatchEntrySerializer(NshMdtypeCodec.SERIALIZER_KEY, NiciraMatchCodecs.NSH_MDTYPE_CODEC); + registrator.registerMatchEntryDeserializer(NshMdtypeCodec.DESERIALIZER_KEY, NiciraMatchCodecs.NSH_MDTYPE_CODEC); + registrator.registerMatchEntrySerializer(NshNpCodec.SERIALIZER_KEY, NiciraMatchCodecs.NSH_NP_CODEC); + registrator.registerMatchEntryDeserializer(NshNpCodec.DESERIALIZER_KEY, NiciraMatchCodecs.NSH_NP_CODEC); + registrator.registerMatchEntrySerializer(TunGpeNpCodec.SERIALIZER_KEY, NiciraMatchCodecs.TUN_GPE_NP_CODEC); + registrator.registerMatchEntryDeserializer(TunGpeNpCodec.DESERIALIZER_KEY, NiciraMatchCodecs.TUN_GPE_NP_CODEC); registrator.registerMatchEntrySerializer(TcpSrcCodec.SERIALIZER_KEY, NiciraMatchCodecs.TCP_SRC_CODEC); registrator.registerMatchEntryDeserializer(TcpSrcCodec.DESERIALIZER_KEY, NiciraMatchCodecs.TCP_SRC_CODEC); registrator.registerMatchEntrySerializer(TcpDstCodec.SERIALIZER_KEY, NiciraMatchCodecs.TCP_DST_CODEC); @@ -156,9 +193,18 @@ public class NiciraExtensionsRegistrator implements AutoCloseable { registrator.registerMatchEntryDeserializer(CtStateCodec.DESERIALIZER_KEY, NiciraMatchCodecs.CT_ST_CODEC); registrator.registerMatchEntrySerializer(CtZoneCodec.SERIALIZER_KEY, NiciraMatchCodecs.CT_ZONE_CODEC); registrator.registerMatchEntryDeserializer(CtZoneCodec.DESERIALIZER_KEY, NiciraMatchCodecs.CT_ZONE_CODEC); + registrator.registerMatchEntrySerializer(CtMarkCodec.SERIALIZER_KEY, NiciraMatchCodecs.CT_MARK_CODEC); + registrator.registerMatchEntryDeserializer(CtMarkCodec.DESERIALIZER_KEY, NiciraMatchCodecs.CT_MARK_CODEC); + registrator.registerMatchEntrySerializer(CtTpSrcCodec.SERIALIZER_KEY, NiciraMatchCodecs.CT_TP_SRC_CODEC); + registrator.registerMatchEntryDeserializer(CtTpSrcCodec.DESERIALIZER_KEY, NiciraMatchCodecs.CT_TP_SRC_CODEC); + registrator.registerMatchEntrySerializer(CtTpDstCodec.SERIALIZER_KEY, NiciraMatchCodecs.CT_TP_DST_CODEC); + registrator.registerMatchEntryDeserializer(CtTpDstCodec.DESERIALIZER_KEY, NiciraMatchCodecs.CT_TP_DST_CODEC); + registrator.registerMatchEntrySerializer(PktMarkCodec.SERIALIZER_KEY, NiciraMatchCodecs.PKT_MARK_CODEC); + registrator.registerMatchEntryDeserializer(PktMarkCodec.DESERIALIZER_KEY, NiciraMatchCodecs.PKT_MARK_CODEC); } - public void unregisterExtensions() { + @Override + public void close() throws Exception { registrator.unregisterActionDeserializer(RegLoadCodec.DESERIALIZER_KEY); registrator.unregisterActionSerializer(RegLoadCodec.SERIALIZER_KEY); registrator.unregisterActionDeserializer(RegMoveCodec.DESERIALIZER_KEY); @@ -168,22 +214,25 @@ public class NiciraExtensionsRegistrator implements AutoCloseable { registrator.unregisterActionSerializer(ResubmitCodec.SERIALIZER_KEY); registrator.unregisterActionDeserializer(ResubmitCodec.TABLE_DESERIALIZER_KEY); registrator.unregisterActionDeserializer(ResubmitCodec.DESERIALIZER_KEY); + registrator.unregisterActionSerializer(FinTimeoutCodec.SERIALIZER_KEY); + registrator.unregisterActionDeserializer(FinTimeoutCodec.DESERIALIZER_KEY); registrator.unregisterActionSerializer(MultipathCodec.SERIALIZER_KEY); registrator.unregisterActionDeserializer(MultipathCodec.DESERIALIZER_KEY); - registrator.unregisterActionDeserializer(SetNsiCodec.DESERIALIZER_KEY); - registrator.unregisterActionSerializer(SetNsiCodec.SERIALIZER_KEY); - registrator.unregisterActionDeserializer(SetNspCodec.DESERIALIZER_KEY); - registrator.unregisterActionSerializer(SetNspCodec.SERIALIZER_KEY); - registrator.unregisterActionSerializer(SetNshc1Codec.SERIALIZER_KEY); - registrator.unregisterActionDeserializer(SetNshc2Codec.DESERIALIZER_KEY); - registrator.unregisterActionSerializer(SetNshc2Codec.SERIALIZER_KEY); - registrator.unregisterActionDeserializer(SetNshc3Codec.DESERIALIZER_KEY); - registrator.unregisterActionSerializer(SetNshc3Codec.SERIALIZER_KEY); - registrator.unregisterActionDeserializer(SetNshc4Codec.DESERIALIZER_KEY); - registrator.unregisterActionSerializer(SetNshc4Codec.SERIALIZER_KEY); + registrator.unregisterActionDeserializer(PushNshCodec.DESERIALIZER_KEY); + registrator.unregisterActionSerializer(PushNshCodec.SERIALIZER_KEY); + registrator.unregisterActionDeserializer(PopNshCodec.DESERIALIZER_KEY); + registrator.unregisterActionSerializer(PopNshCodec.SERIALIZER_KEY); registrator.unregisterActionSerializer(ConntrackCodec.SERIALIZER_KEY); registrator.unregisterActionDeserializer(ConntrackCodec.DESERIALIZER_KEY); - + registrator.unregisterActionSerializer(CtClearCodec.SERIALIZER_KEY); + registrator.unregisterActionDeserializer(CtClearCodec.DESERIALIZER_KEY); + registrator.unregisterActionSerializer(LearnCodec.SERIALIZER_KEY); + registrator.unregisterActionDeserializer(LearnCodec.DESERIALIZER_KEY); + registrator.unregisterActionSerializer(EncapCodec.SERIALIZER_KEY); + registrator.unregisterActionDeserializer(EncapCodec.DESERIALIZER_KEY); + registrator.unregisterActionSerializer(DecapCodec.SERIALIZER_KEY); + registrator.unregisterActionDeserializer(DecapCodec.DESERIALIZER_KEY); + // CONTINUE registrator.unregisterMatchEntrySerializer(Reg0Codec.SERIALIZER_KEY); registrator.unregisterMatchEntryDeserializer(Reg0Codec.DESERIALIZER_KEY); registrator.unregisterMatchEntrySerializer(Reg1Codec.SERIALIZER_KEY); @@ -212,6 +261,10 @@ public class NiciraExtensionsRegistrator implements AutoCloseable { registrator.unregisterMatchEntryDeserializer(ArpThaCodec.DESERIALIZER_KEY); registrator.unregisterMatchEntrySerializer(ArpTpaCodec.SERIALIZER_KEY); registrator.unregisterMatchEntryDeserializer(ArpTpaCodec.DESERIALIZER_KEY); + registrator.unregisterMatchEntrySerializer(InPortCodec.SERIALIZER_KEY); + registrator.unregisterMatchEntryDeserializer(InPortCodec.DESERIALIZER_KEY); + registrator.unregisterMatchEntrySerializer(MplsLabelCodec.SERIALIZER_KEY); + registrator.unregisterMatchEntryDeserializer(MplsLabelCodec.DESERIALIZER_KEY); registrator.unregisterMatchEntrySerializer(EthDstCodec.SERIALIZER_KEY); registrator.unregisterMatchEntryDeserializer(EthDstCodec.DESERIALIZER_KEY); registrator.unregisterMatchEntrySerializer(EthSrcCodec.SERIALIZER_KEY); @@ -234,6 +287,18 @@ public class NiciraExtensionsRegistrator implements AutoCloseable { registrator.unregisterMatchEntryDeserializer(TunIpv4DstCodec.DESERIALIZER_KEY); registrator.unregisterMatchEntrySerializer(TunIpv4SrcCodec.SERIALIZER_KEY); registrator.unregisterMatchEntryDeserializer(TunIpv4SrcCodec.DESERIALIZER_KEY); + registrator.unregisterMatchEntrySerializer(EncapEthTypeCodec.SERIALIZER_KEY); + registrator.unregisterMatchEntryDeserializer(EncapEthTypeCodec.DESERIALIZER_KEY); + registrator.unregisterMatchEntrySerializer(EncapEthSrcCodec.SERIALIZER_KEY); + registrator.unregisterMatchEntryDeserializer(EncapEthSrcCodec.DESERIALIZER_KEY); + registrator.unregisterMatchEntrySerializer(EncapEthDstCodec.SERIALIZER_KEY); + registrator.unregisterMatchEntryDeserializer(EncapEthDstCodec.DESERIALIZER_KEY); + registrator.unregisterMatchEntrySerializer(NshMdtypeCodec.SERIALIZER_KEY); + registrator.unregisterMatchEntryDeserializer(NshMdtypeCodec.DESERIALIZER_KEY); + registrator.unregisterMatchEntrySerializer(NshNpCodec.SERIALIZER_KEY); + registrator.unregisterMatchEntryDeserializer(NshNpCodec.DESERIALIZER_KEY); + registrator.unregisterMatchEntrySerializer(TunGpeNpCodec.SERIALIZER_KEY); + registrator.unregisterMatchEntryDeserializer(TunGpeNpCodec.DESERIALIZER_KEY); registrator.unregisterMatchEntrySerializer(TcpSrcCodec.SERIALIZER_KEY); registrator.unregisterMatchEntryDeserializer(TcpSrcCodec.DESERIALIZER_KEY); registrator.unregisterMatchEntrySerializer(TcpDstCodec.SERIALIZER_KEY); @@ -246,11 +311,13 @@ public class NiciraExtensionsRegistrator implements AutoCloseable { registrator.unregisterMatchEntryDeserializer(CtStateCodec.DESERIALIZER_KEY); registrator.unregisterMatchEntrySerializer(CtZoneCodec.SERIALIZER_KEY); registrator.unregisterMatchEntryDeserializer(CtZoneCodec.DESERIALIZER_KEY); + registrator.unregisterMatchEntrySerializer(CtMarkCodec.SERIALIZER_KEY); + registrator.unregisterMatchEntryDeserializer(CtMarkCodec.DESERIALIZER_KEY); + registrator.unregisterMatchEntrySerializer(CtTpSrcCodec.SERIALIZER_KEY); + registrator.unregisterMatchEntryDeserializer(CtTpSrcCodec.DESERIALIZER_KEY); + registrator.unregisterMatchEntrySerializer(CtTpDstCodec.SERIALIZER_KEY); + registrator.unregisterMatchEntryDeserializer(CtTpDstCodec.DESERIALIZER_KEY); + registrator.unregisterMatchEntrySerializer(PktMarkCodec.SERIALIZER_KEY); + registrator.unregisterMatchEntryDeserializer(PktMarkCodec.DESERIALIZER_KEY); } - - @Override - public void close() throws Exception { - unregisterExtensions(); - } - }