X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=neutron-ovsdb%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fgroupbasedpolicy%2Fneutron%2Fovsdb%2FVxlanGpeTunnelType.java;h=568faa86bc46240067c4454886e87924cc36ac78;hb=02dd576a2ff7d7a8c304bd74a239c150be1ddd2b;hp=0408db766d93c558b9e47198121e57a2c1e10a58;hpb=77c260b4a62b89e6f33cadedfebeef5e396b5ad8;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 0408db766..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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Cisco Systems, Inc. and others.  All rights reserved.
+ * 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,
@@ -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;
@@ -40,18 +40,18 @@ public class VxlanGpeTunnelType extends AbstractTunnelType {
     private static final String DESTPORT_KEY = "dst_port";
     private static final String DESTPORT_VALUE = VXLAN_GPE_PORT_NUMBER.toString();
 
-
-	private final PortNumber udpTunnelPort;
+    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(OPTS_MAP);
+        udpTunnelPort = new PortNumber(VXLAN_GPE_PORT_NUMBER);
+    }
 
-	public VxlanGpeTunnelType() {
-		optionsList = createOptionsList(optsMap);
-		udpTunnelPort = new PortNumber(VXLAN_GPE_PORT_NUMBER);
-	}
+    private static final Map<String, String> OPTS_MAP;
 
-	private static final Map<String, String> optsMap;
-	static {
+    static {
         Map<String, String> opts = new HashMap<String, String>();
         opts.put(VNID_KEY, VNID_VALUE);
         opts.put(REMOTE_IP_KEY, REMOTE_IP_VALUE);
@@ -62,42 +62,42 @@ 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
+    @Override
     public List<Options> getOptions() {
         return optionsList;
     }
 
-	@Override
+    @Override
     public Class<? extends TunnelTypeBase> getTunnelType() {
-        return tunnelType;
+        return TUNNEL_TYPE_VXLAN_GPE;
     }
 
-	@Override
+    @Override
     public PortNumber getPortNumber() {
         return udpTunnelPort;
     }
 
-	@Override
+    @Override
     public String getTunnelPrefix() {
         return VXLAN_GPE_TUNNEL_PREFIX;
-	}
+    }
 
-	/**
+    /**
      * Check if a TerminationPoint is a tunnel port that meets
      * requirements for the Service Function Chaining with NSH
      * encapsulation. The tunnel port must support setting the
      * VNID, destination Tunnel IP address, NSI, NSP, and all
      * four NSHC fields from flow-mods, and use VXLAN encapsulation.
      *
-     * @param tpAugmentation
+     * @param tpAugmentation the {@link OvsdbTerminationPointAugmentation}
      * @return true if it can be an SFC NSH tunnel port, false if not
      */
-	@Override
+    @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;