[VOL-2225]Migration to BAL3.2.3.2

- Updates to test files to compile for BAL3.2.3.2
- Addressed various comments
- Test with two ONUs on same PON port.
- EAP/HSIA/DHCP working
-  Following test cases working
   1. Disable/Enable/Reboot ONU
   2. Disable/Enable OLT
   3. ONU disable -> subscriber unprovision ->
      enable -> subscriber provision
- Commented out UTs for FlowAdd and FlowRemove and
  will be addressed as part of another commit
- Fix tm_qmp creation for BAL3.2 (needed 1Tcont multi gem)
- Re-organize code after review comments
- Bump version to 2.1.0 (support for ACL and multicast group config)

Change-Id: I4245d14bba8878fdde6ee361ad54060068de205f
diff --git a/agent/common/core.h b/agent/common/core.h
index 1b2b3dd..dedc4c3 100644
--- a/agent/common/core.h
+++ b/agent/common/core.h
@@ -102,6 +102,19 @@
 // key for map used for tracking ITU PON Alloc Configuration results from BAL
 typedef std::tuple<uint32_t, uint32_t> alloc_cfg_compltd_key;
 
+// The elements in this acl_classifier_key structure constitute key to
+// acl_classifier_to_acl_id_map.
+// Fill invalid values in the acl_classifier_key structure to -1.
+typedef struct acl_classifier_key {
+    int32_t ether_type;
+    int16_t ip_proto;
+    int32_t src_port;
+    int32_t dst_port;
+    // Add more classifiers elements as needed here
+    // For now, ACLs will be classified only based on
+    // above elements.
+} acl_classifier_key;
+
 Status Enable_(int argc, char *argv[]);
 Status ActivateOnu_(uint32_t intf_id, uint32_t onu_id,
     const char *vendor_id, const char *vendor_specific, uint32_t pir);