[ONOS-6208]Implemention of onos and loxi for OVS NAT and connection tracking support
Change-Id: I782422d41fdacc805b523b57c3bd0b6e67e483a2
diff --git a/core/api/src/main/java/org/onosproject/net/flow/criteria/ExtensionSelectorType.java b/core/api/src/main/java/org/onosproject/net/flow/criteria/ExtensionSelectorType.java
index f65c168..e9715a6 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/criteria/ExtensionSelectorType.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/criteria/ExtensionSelectorType.java
@@ -39,6 +39,10 @@
NICIRA_MATCH_NSH_CH3(4),
NICIRA_MATCH_NSH_CH4(5),
NICIRA_MATCH_ENCAP_ETH_TYPE(6),
+ NICIRA_MATCH_CONNTRACK_STATE(7),
+ NICIRA_MATCH_CONNTRACK_ZONE(8),
+ NICIRA_MATCH_CONNTRACK_MARK(9),
+ NICIRA_MATCH_CONNTRACK_LABEL(10),
OFDPA_MATCH_VLAN_VID(16),
OFDPA_MATCH_OVID(17),
OFDPA_MATCH_MPLS_L2_PORT(18),
diff --git a/core/api/src/main/java/org/onosproject/net/flow/instructions/ExtensionTreatmentType.java b/core/api/src/main/java/org/onosproject/net/flow/instructions/ExtensionTreatmentType.java
index 1371e42..d11a9a9 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/instructions/ExtensionTreatmentType.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/instructions/ExtensionTreatmentType.java
@@ -48,6 +48,9 @@
NICIRA_RESUBMIT_TABLE(14),
NICIRA_PUSH_NSH(38),
NICIRA_POP_NSH(39),
+ NICIRA_CT(40),
+ NICIRA_NAT(41),
+ NICIRA_CT_CLEAR(42),
OFDPA_SET_VLAN_ID(64),
OFDPA_SET_MPLS_TYPE(65),
OFDPA_SET_OVID(66),