From e6c181c1e8fdadaf60408b41f950c3bff7805666 Mon Sep 17 00:00:00 2001 From: Qiuzheng Date: Tue, 26 Jun 2018 14:17:46 +0800 Subject: [PATCH] The netviet sfc classifier get null vxlan-gpe port Sometimes the ovs has two vxlan-gpe ports, and one vxlan-gpe port number is null.The patch avoid to get the null vxlan-gpe port number. Change-Id: I02063a7227520b1a55ae11c8b8d87d6ee5f01f80 Signed-off-by: Qiuzheng --- .../netvirt/sfc/classifier/providers/GeniusProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/providers/GeniusProvider.java b/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/providers/GeniusProvider.java index 1645f4a219..144b7f677d 100644 --- a/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/providers/GeniusProvider.java +++ b/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/providers/GeniusProvider.java @@ -276,7 +276,7 @@ public class GeniusProvider { for (Options tpOption : tpOptions) { // From the VXLAN Tunnels, we want the one with the GPE option set if (tpOption.key().getOption().equals(OPTION_KEY_EXTS)) { - if (tpOption.getValue().equals(OPTION_VALUE_EXTS_GPE)) { + if (tpOption.getValue().equals(OPTION_VALUE_EXTS_GPE) && tp.getOfport() != null) { return Optional.ofNullable(tp.getOfport()); } } -- 2.36.6