Global use of Table ids from NwConstants.java

In my previous patches for global use of table ids, I missed one table id
to remove from NATConstants.java.

Removing that particular table id in this patch and using directly from
NwConstants.java.

Change-Id: If143ee91576a85feeab806ed299649c8b359cbf3
Signed-off-by: Suraj Ranjan <suraj.ranjan@ericsson.com>

diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalRoutersListener.java b/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalRoutersListener.java
index 65d8f8b4650da14e8e6d58cf2e49d6283d77aa56..d8e4235ae35636fb42f8d4a9b30d3daca1cad50f 100644 (file)
--- a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalRoutersListener.java
+++ b/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalRoutersListener.java
@@ -772,7 +772,7 @@ public class ExternalRoutersListener extends AsyncDataTreeChangeListenerBase<Rou
         String flowRef = getFlowRefTs(dpId, NwConstants.INTERNAL_TUNNEL_TABLE, routerId.longValue());
         FlowEntity flowEntity = MDSALUtil.buildFlowEntity(dpId, NwConstants.INTERNAL_TUNNEL_TABLE, flowRef,
                 NatConstants.DEFAULT_TS_FLOW_PRIORITY, flowRef, 0, 0,
-                NatConstants.COOKIE_TS_TABLE, matches, instructions);
+                NwConstants.COOKIE_TS_TABLE, matches, instructions);
         return flowEntity;
     }
 
@@ -2222,7 +2222,7 @@ public class ExternalRoutersListener extends AsyncDataTreeChangeListenerBase<Rou
         String flowRef = getFlowRefTs(dpId, NwConstants.INTERNAL_TUNNEL_TABLE, routerId.longValue());
         FlowEntity flowEntity = MDSALUtil.buildFlowEntity(dpId, NwConstants.INTERNAL_TUNNEL_TABLE, flowRef,
                 NatConstants.DEFAULT_TS_FLOW_PRIORITY, flowRef, 0, 0,
-                NatConstants.COOKIE_TS_TABLE, matches, instructions);
+                NwConstants.COOKIE_TS_TABLE, matches, instructions);
         return flowEntity;
     }
 

diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatConstants.java b/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatConstants.java
index e6dcbee78947ab6d00d062576a541b549da1146a..0829b25c0b4530e99db75db2a1df620fcea01d11 100644 (file)
--- a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatConstants.java
+++ b/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatConstants.java
@@ -32,7 +32,6 @@ public class NatConstants {
     public static final long SNAT_ID_LOW_VALUE = 200000L;
     public static final long SNAT_ID_HIGH_VALUE = 225000L;
     public static final int DEFAULT_TS_FLOW_PRIORITY = 10;
-    public static final BigInteger COOKIE_TS_TABLE = new BigInteger("8000002", 16);
     public static final short DEFAULT_PREFIX = 32;
 
     // Flow Actions