Freeze upstream versions

[netvirt.git] / aclservice / impl / src / main / java / org / opendaylight / netvirt / aclservice / utils / AclConstants.java

diff --git a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclConstants.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclConstants.java
index 06a51eec6109ddf613f3043ad7f3a41f43a6d930..032127ae9d6adc55e079b5223a1c45c6302b15c1 100644 (file)
--- a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclConstants.java
+++ b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclConstants.java
@@ -14,6 +14,7 @@ import java.util.ArrayList;
 import java.util.List;
 import org.opendaylight.genius.mdsalutil.NwConstants;
 import org.opendaylight.genius.mdsalutil.packet.IPProtocols;
+import org.opendaylight.yangtools.yang.common.Uint64;
 
 /**
  * The class to have ACL related constants.
@@ -27,6 +28,7 @@ public interface AclConstants {
     Integer PROTO_IPV6_DROP_PRIORITY = 63020;
     Integer PROTO_IPV6_ALLOWED_PRIORITY = 63010;
     Integer PROTO_DHCP_SERVER_MATCH_PRIORITY = 63010;
+    Integer PROTO_DHCP_SERVER_DROP_PRIORITY = 62020;
     Integer PROTO_DHCP_CLIENT_TRAFFIC_MATCH_PRIORITY = 63010;
     Integer PROTO_ARP_TRAFFIC_MATCH_PRIORITY = 63010;
     Integer PROTO_ARP_TRAFFIC_DROP_PRIORITY = 63009;
@@ -57,9 +59,9 @@ public interface AclConstants {
     short DHCP_CLIENT_PORT_IPV6 = 546;
     short DHCP_SERVER_PORT_IPV6 = 547;
 
-    BigInteger COOKIE_ACL_BASE = new BigInteger("6900000", 16);
-    BigInteger COOKIE_ACL_DROP_FLOW = new BigInteger("6900001", 16);
-    BigInteger METADATA_DROP_FLAG = BigInteger.ONE;
+    Uint64 COOKIE_ACL_BASE = Uint64.valueOf("6900000", 16).intern();
+    Uint64 COOKIE_ACL_DROP_FLOW = Uint64.valueOf("6900001", 16).intern();
+    Uint64 METADATA_DROP_FLAG = Uint64.valueOf(BigInteger.ONE).intern();
 
     int TRACKED_EST_CT_STATE = 0x22;
     int TRACKED_REL_CT_STATE = 0x24;
@@ -93,6 +95,10 @@ public interface AclConstants {
     int ALL_LAYER4_PORT_MASK = 0x0000;
 
     Short IP_PROT_ICMPV6 = 58;
+    int ICMPV4_TYPE_ECHO_REQUEST = 8;
+    int ICMPV4_TYPE_ECHO_REPLY = 0;
+    int ICMPV6_TYPE_ECHO_REQUEST = 128;
+    int ICMPV6_TYPE_ECHO_REPLY = 129;
     int ICMPV6_TYPE_MLD_QUERY = 130;
     int ICMPV6_TYPE_RS = 133;
     int ICMPV6_TYPE_RA = 134;
@@ -102,10 +108,6 @@ public interface AclConstants {
 
     int SECURITY_GROUP_ICMP_IDLE_TIME_OUT = 30;
 
-    String ACL_TAG_POOL_NAME = "ACL-TAG-POOL";
-    long ACL_TAG_POOL_START = 1L;
-    long ACL_TAG_POOL_END = 10000L;
-
     int SOURCE_LOWER_PORT_UNSPECIFIED = -1;
     int SOURCE_UPPER_PORT_UNSPECIFIED = -1;
     int DEST_LOWER_PORT_UNSPECIFIED = -1;
@@ -122,6 +124,11 @@ public interface AclConstants {
 
     String ACL_SYNC_KEY_EXT = "-acl";
     int JOB_MAX_RETRIES = 3;
+    int ACEDELETE_MAX_RETRIES = 3;
+    int FLOWS_PER_TRANSACTION = 30;
+    int ACES_PER_TRANSACTION = 30;
+
+    String ACL_JOB_KEY_PREFIX = "ACL-";
 
     List<IPProtocols> PROTOCOLS_SUPPORTED_BY_CONNTRACK =
             ImmutableList.of(IPProtocols.TCP, IPProtocols.UDP, IPProtocols.ICMP, IPProtocols.IPV6ICMP);