Code Review
/
netvirt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Global use of table ids from NwConstants.java
[netvirt.git]
/
vpnservice
/
natservice
/
natservice-impl
/
src
/
main
/
java
/
org
/
opendaylight
/
netvirt
/
natservice
/
internal
/
NatConstants.java
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 279bb8965b3fa139dd2a4aedf8492118836eb6e0..1a13692b04f9fcce01400548aa58eb3b57104720 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
@@
-12,10
+12,7
@@
import java.math.BigInteger;
public class NatConstants {
public class NatConstants {
- public static final short INBOUND_NAPT_TABLE = 44;
- public static final short OUTBOUND_NAPT_TABLE = 46;
- public static final short NAPT_PFIB_TABLE = 47;
- public static final short TERMINATING_SERVICE_TABLE = 36;
+
public static final short DEFAULT_NAPT_FLOW_PRIORITY = 10;
public static final String NAPT_FLOW_NAME = "SNAT";
public static BigInteger COOKIE_NAPT_BASE = new BigInteger("8000000", 16);
public static final short DEFAULT_NAPT_FLOW_PRIORITY = 10;
public static final String NAPT_FLOW_NAME = "SNAT";
public static BigInteger COOKIE_NAPT_BASE = new BigInteger("8000000", 16);
@@
-23,26
+20,17
@@
public class NatConstants {
public static final String FLOWID_SEPARATOR = ".";
public static final int DEFAULT_NAPT_IDLE_TIMEOUT = 300;
public static int EVENT_QUEUE_LENGTH = 1000000;
public static final String FLOWID_SEPARATOR = ".";
public static final int DEFAULT_NAPT_IDLE_TIMEOUT = 300;
public static int EVENT_QUEUE_LENGTH = 1000000;
- public static final short PDNAT_TABLE = 25;
- public static final short DNAT_TABLE = 27;
- public static final short SNAT_TABLE = 28;
- public static final short PSNAT_TABLE = 26;
- public static final short L3_FIB_TABLE = 21;
public static final String FLOWID_PREFIX = "L3.";
public static final int DEFAULT_DNAT_FLOW_PRIORITY = 10;
public static final String FLOWID_PREFIX = "L3.";
public static final int DEFAULT_DNAT_FLOW_PRIORITY = 10;
- public static final BigInteger COOKIE_DNAT_TABLE = new BigInteger("8000004", 16);
public static final long INVALID_ID = -1;
public static final long INVALID_ID = -1;
- public static final BigInteger COOKIE_OUTBOUND_NAPT_TABLE = new BigInteger("8000008", 16);
public static final short DEFAULT_SNAT_FLOW_PRIORITY = 10;
public static final short DEFAULT_PSNAT_FLOW_PRIORITY = 5;
public static final String SNAT_FLOW_NAME = "SNAT";
public static final String SNAT_FLOWID_PREFIX = "SNAT.";
public static final short DEFAULT_SNAT_FLOW_PRIORITY = 10;
public static final short DEFAULT_PSNAT_FLOW_PRIORITY = 5;
public static final String SNAT_FLOW_NAME = "SNAT";
public static final String SNAT_FLOWID_PREFIX = "SNAT.";
- public static final BigInteger COOKIE_SNAT_TABLE = new BigInteger("8000006", 16);
public static final String SNAT_IDPOOL_NAME = "snatGroupIdPool";
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 String SNAT_IDPOOL_NAME = "snatGroupIdPool";
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
public static final short DEFAULT_PREFIX = 32;
// Flow Actions