X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=neutron-ovsdb%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fgroupbasedpolicy%2Fneutron%2Fovsdb%2FVxlanGpeTunnelType.java;h=568faa86bc46240067c4454886e87924cc36ac78;hb=02dd576a2ff7d7a8c304bd74a239c150be1ddd2b;hp=6f7155814b13cbf4ceefff9e6d2e7da859aee77f;hpb=afeada6760db5be76ba9f1f911e34b515dfd2fcd;p=groupbasedpolicy.git

diff --git a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/VxlanGpeTunnelType.java b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/VxlanGpeTunnelType.java
index 6f7155814..568faa86b 100644
--- a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/VxlanGpeTunnelType.java
+++ b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/VxlanGpeTunnelType.java
@@ -13,7 +13,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.PortNumber;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.overlay.rev150105.TunnelTypeBase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.overlay.rev150105.TunnelTypeVxlanGpe;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.InterfaceTypeVxlan;
@@ -42,14 +42,15 @@ public class VxlanGpeTunnelType extends AbstractTunnelType {
 
     private final PortNumber udpTunnelPort;
     private final List<Options> optionsList;
-    private static final Class<? extends TunnelTypeBase> tunnelType = TunnelTypeVxlanGpe.class;
+    private static final Class<? extends TunnelTypeBase> TUNNEL_TYPE_VXLAN_GPE = TunnelTypeVxlanGpe.class;
 
     public VxlanGpeTunnelType() {
-        optionsList = createOptionsList(optsMap);
+        optionsList = createOptionsList(OPTS_MAP);
         udpTunnelPort = new PortNumber(VXLAN_GPE_PORT_NUMBER);
     }
 
-    private static final Map<String, String> optsMap;
+    private static final Map<String, String> OPTS_MAP;
+
     static {
         Map<String, String> opts = new HashMap<String, String>();
         opts.put(VNID_KEY, VNID_VALUE);
@@ -61,7 +62,7 @@ public class VxlanGpeTunnelType extends AbstractTunnelType {
         opts.put(NSH_NSHC3_KEY, NSH_NSHC3_VALUE);
         opts.put(NSH_NSHC4_KEY, NSH_NSHC4_VALUE);
         opts.put(DESTPORT_KEY, DESTPORT_VALUE);
-        optsMap = Collections.unmodifiableMap(opts);
+        OPTS_MAP = Collections.unmodifiableMap(opts);
     }
 
     @Override
@@ -71,7 +72,7 @@ public class VxlanGpeTunnelType extends AbstractTunnelType {
 
     @Override
     public Class<? extends TunnelTypeBase> getTunnelType() {
-        return tunnelType;
+        return TUNNEL_TYPE_VXLAN_GPE;
     }
 
     @Override
@@ -96,7 +97,7 @@ public class VxlanGpeTunnelType extends AbstractTunnelType {
      */
     @Override
     public boolean isValidTunnelPort(OvsdbTerminationPointAugmentation tpAugmentation) {
-        if (hasTunnelOptions(tpAugmentation, optsMap)
+        if (hasTunnelOptions(tpAugmentation, OPTS_MAP)
                 && InterfaceTypeVxlan.class.equals(tpAugmentation.getInterfaceType())
                 && getDestPort(tpAugmentation).equals(VXLAN_GPE_PORT_NUMBER.toString())) {
             return true;