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%2FVxlanTunnelType.java;h=786db5ef6a207b92b20168b93cee07988fffd595;hb=02dd576a2ff7d7a8c304bd74a239c150be1ddd2b;hp=360b4becc00fa7b9409a1725e05cccd092314c1c;hpb=3e139b8bd0912a5b72cf49a54a48d32d21c5ae0a;p=groupbasedpolicy.git

diff --git a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/VxlanTunnelType.java b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/VxlanTunnelType.java
index 360b4becc..786db5ef6 100644
--- a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/VxlanTunnelType.java
+++ b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/VxlanTunnelType.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2015 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,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -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.TunnelTypeVxlan;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.InterfaceTypeVxlan;
@@ -22,8 +22,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.re
 
 public class VxlanTunnelType extends AbstractTunnelType {
 
-    private static final Map<String, String> optsMap;
-    private static final Class<? extends TunnelTypeBase> tunnelType = TunnelTypeVxlan.class;
+    private static final Map<String, String> OPTS_MAP;
+    private static final Class<? extends TunnelTypeBase> TUNNEL_TYPE_VXLAN = TunnelTypeVxlan.class;
     private static final Integer VXLAN_PORT_NUMBER = 4789;
     private static final String VXLAN_TUNNEL_PREFIX = "vxlan-";
     private final PortNumber udpTunnelPort;
@@ -33,11 +33,11 @@ public class VxlanTunnelType extends AbstractTunnelType {
         Map<String, String> opts = new HashMap<String, String>();
         opts.put(VNID_KEY, VNID_VALUE);
         opts.put(REMOTE_IP_KEY, REMOTE_IP_VALUE);
-        optsMap = Collections.unmodifiableMap(opts);
+        OPTS_MAP = Collections.unmodifiableMap(opts);
     }
 
     public VxlanTunnelType() {
-        optionsList = createOptionsList(optsMap);
+        optionsList = createOptionsList(OPTS_MAP);
         udpTunnelPort = new PortNumber(VXLAN_PORT_NUMBER);
     }
 
@@ -48,7 +48,7 @@ public class VxlanTunnelType extends AbstractTunnelType {
 
     @Override
     public Class<? extends TunnelTypeBase> getTunnelType() {
-        return tunnelType;
+        return TUNNEL_TYPE_VXLAN;
     }
 
     @Override
@@ -72,7 +72,7 @@ public class VxlanTunnelType extends AbstractTunnelType {
      */
     @Override
     public boolean isValidTunnelPort(OvsdbTerminationPointAugmentation tpAugmentation) {
-        if (hasTunnelOptions(tpAugmentation, optsMap)
+        if (hasTunnelOptions(tpAugmentation, OPTS_MAP)
                 && InterfaceTypeVxlan.class.equals(tpAugmentation.getInterfaceType())
                 && (getDestPort(tpAugmentation) == null || getDestPort(tpAugmentation).equals(
                         VXLAN_PORT_NUMBER.toString()))) {