Revert "SAI Proposal for Counter enhancement. (opencomputeproject#1941)"

This reverts commit f23185d.
dgodwin-nokia · Nov 5, 2024 · 7414c76 · 7414c76
1 parent 8b8fa85
commit 7414c76
Show file tree

Hide file tree

Showing 18 changed files with 0 additions and 1,960 deletions.
diff --git a/doc/SAI-Counter-enhancement-hld.md b/doc/SAI-Counter-enhancement-hld.md
diff --git a/inc/saibfd.h b/inc/saibfd.h
@@ -501,28 +501,6 @@ typedef enum _sai_bfd_session_attr_t
      */
     SAI_BFD_SESSION_ATTR_SRV6_SIDLIST_ID,
 
-    /**
-     * @brief Set BFD session statistics counting mode
-     *
-     * @type sai_stats_count_mode_t
-     * @flags CREATE_AND_SET
-     * @default SAI_STATS_COUNT_MODE_PACKET_AND_BYTE
-     */
-    SAI_BFD_SESSION_ATTR_STATS_COUNT_MODE,
-
-    /**
-     * @brief Attach counter object list
-     *
-     * Counter object should be of type Selective.
-     * Fill (#SAI_COUNTER_ATTR_TYPE with #SAI_COUNTER_TYPE_SELECTIVE).
-     *
-     * @type sai_object_list_t
-     * @flags CREATE_AND_SET
-     * @objects SAI_OBJECT_TYPE_COUNTER
-     * @default empty
-     */
-    SAI_BFD_SESSION_ATTR_SELECTIVE_COUNTER_LIST,
-
     /**
      * @brief End of attributes
      */

diff --git a/inc/saibridge.h b/inc/saibridge.h
@@ -259,28 +259,6 @@ typedef enum _sai_bridge_port_attr_t
      */
     SAI_BRIDGE_PORT_ATTR_ISOLATION_GROUP,
 
-    /**
-     * @brief Set bridge port statistics counting mode
-     *
-     * @type sai_stats_count_mode_t
-     * @flags CREATE_AND_SET
-     * @default SAI_STATS_COUNT_MODE_PACKET_AND_BYTE
-     */
-    SAI_BRIDGE_PORT_ATTR_STATS_COUNT_MODE,
-
-    /**
-     * @brief Attach counter object list
-     *
-     * Counter object should be of type Selective.
-     * Fill (#SAI_COUNTER_ATTR_TYPE with #SAI_COUNTER_TYPE_SELECTIVE).
-     *
-     * @type sai_object_list_t
-     * @flags CREATE_AND_SET
-     * @objects SAI_OBJECT_TYPE_COUNTER
-     * @default empty
-     */
-    SAI_BRIDGE_PORT_ATTR_SELECTIVE_COUNTER_LIST,
-
     /**
      * @brief End of attributes
      */
@@ -585,28 +563,6 @@ typedef enum _sai_bridge_attr_t
      */
     SAI_BRIDGE_ATTR_BROADCAST_FLOOD_GROUP,
 
-    /**
-     * @brief Set bridge statistics counting mode
-     *
-     * @type sai_stats_count_mode_t
-     * @flags CREATE_AND_SET
-     * @default SAI_STATS_COUNT_MODE_PACKET_AND_BYTE
-     */
-    SAI_BRIDGE_ATTR_STATS_COUNT_MODE,
-
-    /**
-     * @brief Attach counter object list
-     *
-     * Counter object should be of type Selective.
-     * Fill (#SAI_COUNTER_ATTR_TYPE with #SAI_COUNTER_TYPE_SELECTIVE).
-     *
-     * @type sai_object_list_t
-     * @flags CREATE_AND_SET
-     * @objects SAI_OBJECT_TYPE_COUNTER
-     * @default empty
-     */
-    SAI_BRIDGE_ATTR_SELECTIVE_COUNTER_LIST,
-
     /**
      * @brief End of attributes
      */

diff --git a/inc/saibuffer.h b/inc/saibuffer.h
@@ -83,28 +83,6 @@ typedef enum _sai_ingress_priority_group_attr_t
      */
     SAI_INGRESS_PRIORITY_GROUP_ATTR_INDEX,
 
-    /**
-     * @brief Set ingress priority group statistics counting mode
-     *
-     * @type sai_stats_count_mode_t
-     * @flags CREATE_AND_SET
-     * @default SAI_STATS_COUNT_MODE_PACKET_AND_BYTE
-     */
-    SAI_INGRESS_PRIORITY_GROUP_ATTR_STATS_COUNT_MODE,
-
-    /**
-     * @brief Attach counter object list
-     *
-     * Counter object should be of type Selective.
-     * Fill (#SAI_COUNTER_ATTR_TYPE with #SAI_COUNTER_TYPE_SELECTIVE).
-     *
-     * @type sai_object_list_t
-     * @flags CREATE_AND_SET
-     * @objects SAI_OBJECT_TYPE_COUNTER
-     * @default empty
-     */
-    SAI_INGRESS_PRIORITY_GROUP_ATTR_SELECTIVE_COUNTER_LIST,
-
     /**
      * @brief End of attributes
      */
@@ -369,28 +347,6 @@ typedef enum _sai_buffer_pool_attr_t
      */
     SAI_BUFFER_POOL_ATTR_WRED_PROFILE_ID,
 
-    /**
-     * @brief Set buffer pool statistics counting mode
-     *
-     * @type sai_stats_count_mode_t
-     * @flags CREATE_AND_SET
-     * @default SAI_STATS_COUNT_MODE_PACKET_AND_BYTE
-     */
-    SAI_BUFFER_POOL_ATTR_STATS_COUNT_MODE,
-
-    /**
-     * @brief Attach counter object list
-     *
-     * Counter object should be of type Selective.
-     * Fill (#SAI_COUNTER_ATTR_TYPE with #SAI_COUNTER_TYPE_SELECTIVE).
-     *
-     * @type sai_object_list_t
-     * @flags CREATE_AND_SET
-     * @objects SAI_OBJECT_TYPE_COUNTER
-     * @default empty
-     */
-    SAI_BUFFER_POOL_ATTR_SELECTIVE_COUNTER_LIST,
-
     /**
      * @brief End of attributes
      */

diff --git a/inc/saicounter.h b/inc/saicounter.h
@@ -45,9 +45,6 @@ typedef enum _sai_counter_type_t
     /** Regular */
     SAI_COUNTER_TYPE_REGULAR,
 
-    /** Selective Counter */
-    SAI_COUNTER_TYPE_SELECTIVE,
-
 } sai_counter_type_t;
 
 /**
@@ -81,45 +78,6 @@ typedef enum _sai_counter_attr_t
      */
     SAI_COUNTER_ATTR_LABEL,
 
-    /**
-     * @brief Enable/disable packet count
-     *
-     * @type bool
-     * @flags CREATE_ONLY
-     * @default true
-     */
-    SAI_COUNTER_ATTR_ENABLE_PACKET_COUNT,
-
-    /**
-     * @brief Enable/disable byte count
-     *
-     * @type bool
-     * @flags CREATE_ONLY
-     * @default true
-     */
-    SAI_COUNTER_ATTR_ENABLE_BYTE_COUNT,
-
-    /**
-     * @brief Object Type of the stat-id
-     *
-     * @type sai_object_type_t
-     * @flags MANDATORY_ON_CREATE | CREATE_ONLY
-     * @condition SAI_COUNTER_ATTR_TYPE == SAI_COUNTER_TYPE_SELECTIVE
-     */
-    SAI_COUNTER_ATTR_OBJECT_TYPE,
-
-    /**
-     * @brief Stat id list
-     *
-     * List of statistics enum mapped to this counter
-     *
-     * @type sai_s32_list_t
-     * @flags CREATE_AND_SET
-     * @default empty
-     * @validonly SAI_COUNTER_ATTR_TYPE == SAI_COUNTER_TYPE_SELECTIVE
-     */
-    SAI_COUNTER_ATTR_STAT_ID_LIST,
-
     /**
      * @brief End of attributes
      */

diff --git a/inc/saiicmpecho.h b/inc/saiicmpecho.h
@@ -223,28 +223,6 @@ typedef enum _sai_icmp_echo_session_attr_t
      */
     SAI_ICMP_ECHO_SESSION_ATTR_STATE,
 
-    /**
-     * @brief Set ICMP echo session statistics counting mode
-     *
-     * @type sai_stats_count_mode_t
-     * @flags CREATE_AND_SET
-     * @default SAI_STATS_COUNT_MODE_PACKET_AND_BYTE
-     */
-    SAI_ICMP_ECHO_SESSION_ATTR_STATS_COUNT_MODE,
-
-    /**
-     * @brief Attach counter object list
-     *
-     * Counter object should be of type Selective.
-     * Fill (#SAI_COUNTER_ATTR_TYPE with #SAI_COUNTER_TYPE_SELECTIVE).
-     *
-     * @type sai_object_list_t
-     * @flags CREATE_AND_SET
-     * @objects SAI_OBJECT_TYPE_COUNTER
-     * @default empty
-     */
-    SAI_ICMP_ECHO_SESSION_ATTR_SELECTIVE_COUNTER_LIST,
-
     /**
      * @brief End of attributes
      */

diff --git a/inc/saiipsec.h b/inc/saiipsec.h
@@ -372,28 +372,6 @@ typedef enum _sai_ipsec_port_attr_t
      */
     SAI_IPSEC_PORT_ATTR_SWITCH_SWITCHING_MODE,
 
-    /**
-     * @brief Set IPSEC port statistics counting mode
-     *
-     * @type sai_stats_count_mode_t
-     * @flags CREATE_AND_SET
-     * @default SAI_STATS_COUNT_MODE_PACKET_AND_BYTE
-     */
-    SAI_IPSEC_PORT_ATTR_STATS_COUNT_MODE,
-
-    /**
-     * @brief Attach counter object list
-     *
-     * Counter object should be of type Selective.
-     * Fill (#SAI_COUNTER_ATTR_TYPE with #SAI_COUNTER_TYPE_SELECTIVE).
-     *
-     * @type sai_object_list_t
-     * @flags CREATE_AND_SET
-     * @objects SAI_OBJECT_TYPE_COUNTER
-     * @default empty
-     */
-    SAI_IPSEC_PORT_ATTR_SELECTIVE_COUNTER_LIST,
-
     /**
      * @brief End of IPsec Port attributes
      */
@@ -653,28 +631,6 @@ typedef enum _sai_ipsec_sa_attr_t
      */
     SAI_IPSEC_SA_ATTR_MINIMUM_INGRESS_ESN,
 
-    /**
-     * @brief Set IPSEC SA statistics counting mode
-     *
-     * @type sai_stats_count_mode_t
-     * @flags CREATE_AND_SET
-     * @default SAI_STATS_COUNT_MODE_PACKET_AND_BYTE
-     */
-    SAI_IPSEC_SA_ATTR_STATS_COUNT_MODE,
-
-    /**
-     * @brief Attach counter object list
-     *
-     * Counter object should be of type Selective.
-     * Fill (#SAI_COUNTER_ATTR_TYPE with #SAI_COUNTER_TYPE_SELECTIVE).
-     *
-     * @type sai_object_list_t
-     * @flags CREATE_AND_SET
-     * @objects SAI_OBJECT_TYPE_COUNTER
-     * @default empty
-     */
-    SAI_IPSEC_SA_ATTR_SELECTIVE_COUNTER_LIST,
-
     /**
      * @brief End of IPsec Security Association attributes
      */

diff --git a/inc/saimacsec.h b/inc/saimacsec.h
@@ -385,28 +385,6 @@ typedef enum _sai_macsec_port_attr_t
      */
     SAI_MACSEC_PORT_ATTR_SWITCH_SWITCHING_MODE,
 
-    /**
-     * @brief Set MACSEC port statistics counting mode
-     *
-     * @type sai_stats_count_mode_t
-     * @flags CREATE_AND_SET
-     * @default SAI_STATS_COUNT_MODE_PACKET_AND_BYTE
-     */
-    SAI_MACSEC_PORT_ATTR_STATS_COUNT_MODE,
-
-    /**
-     * @brief Attach counter object list
-     *
-     * Counter object should be of type Selective.
-     * Fill (#SAI_COUNTER_ATTR_TYPE with #SAI_COUNTER_TYPE_SELECTIVE).
-     *
-     * @type sai_object_list_t
-     * @flags CREATE_AND_SET
-     * @objects SAI_OBJECT_TYPE_COUNTER
-     * @default empty
-     */
-    SAI_MACSEC_PORT_ATTR_SELECTIVE_COUNTER_LIST,
-
     /**
      * @brief End of MACsec Port attributes
      */
@@ -480,28 +458,6 @@ typedef enum _sai_macsec_flow_attr_t
      */
     SAI_MACSEC_FLOW_ATTR_SC_LIST,
 
-    /**
-     * @brief Set MACSEC flow statistics counting mode
-     *
-     * @type sai_stats_count_mode_t
-     * @flags CREATE_AND_SET
-     * @default SAI_STATS_COUNT_MODE_PACKET_AND_BYTE
-     */
-    SAI_MACSEC_FLOW_ATTR_STATS_COUNT_MODE,
-
-    /**
-     * @brief Attach counter object list
-     *
-     * Counter object should be of type Selective.
-     * Fill (#SAI_COUNTER_ATTR_TYPE with #SAI_COUNTER_TYPE_SELECTIVE).
-     *
-     * @type sai_object_list_t
-     * @flags CREATE_AND_SET
-     * @objects SAI_OBJECT_TYPE_COUNTER
-     * @default empty
-     */
-    SAI_MACSEC_FLOW_ATTR_SELECTIVE_COUNTER_LIST,
-
     /**
      * @brief End of MACsec Flow attributes
      */

diff --git a/inc/saipolicer.h b/inc/saipolicer.h
@@ -209,28 +209,6 @@ typedef enum _sai_policer_attr_t
      */
     SAI_POLICER_ATTR_OBJECT_STAGE = 0x0000000b,
 
-    /**
-     * @brief Set policer statistics counting mode
-     *
-     * @type sai_stats_count_mode_t
-     * @flags CREATE_AND_SET
-     * @default SAI_STATS_COUNT_MODE_PACKET_AND_BYTE
-     */
-    SAI_POLICER_ATTR_STATS_COUNT_MODE,
-
-    /**
-     * @brief Attach counter object list
-     *
-     * Counter object should be of type Selective.
-     * Fill (#SAI_COUNTER_ATTR_TYPE with #SAI_COUNTER_TYPE_SELECTIVE).
-     *
-     * @type sai_object_list_t
-     * @flags CREATE_AND_SET
-     * @objects SAI_OBJECT_TYPE_COUNTER
-     * @default empty
-     */
-    SAI_POLICER_ATTR_SELECTIVE_COUNTER_LIST,
-
     /**
      * @brief End of attributes
      */