Renamed segmentroute to srv6 to avoid any confusion with sr-mpls. Als…

…o renamed local_sid to my_sid based on community feedback.

Signed-off-by: Ashutosh Agrawal <ashutosh.agrawal@intel.com>

inc/sai.h

@@ -55,7 +55,7 @@
 #include "saisamplepacket.h"
 #include "saischedulergroup.h"
 #include "saischeduler.h"
-#include "saisegmentroute.h"
+#include "saisrv6.h"
 #include "saistatus.h"
 #include "saistp.h"
 #include "saiswitch.h"
@@ -123,7 +123,7 @@ typedef enum _sai_api_t
     SAI_API_MCAST_FDB        = 32, /**< sai_mcast_fdb_api_t */
     SAI_API_BRIDGE           = 33, /**< sai_bridge_api_t */
     SAI_API_TAM              = 34, /**< sai_tam_api_t */
-    SAI_API_SEGMENTROUTE     = 35, /**< sai_segmentroute_api_t */
+    SAI_API_SRV6             = 35, /**< sai_srv6_api_t */
     SAI_API_MPLS             = 36, /**< sai_mpls_api_t */
     SAI_API_DTEL             = 37, /**< sai_dtel_api_t (experimental) */
     SAI_API_BFD              = 38, /**< sai_bfd_api_t */

inc/sainexthop.h

@@ -47,62 +47,11 @@ typedef enum _sai_next_hop_type_t
     /** Tunnel next hop */
     SAI_NEXT_HOP_TYPE_TUNNEL_ENCAP,
 
-    /** IPv6 Segment Route SID List */
-    SAI_NEXT_HOP_TYPE_SEGMENTROUTE_SIDLIST,
-
-    /** IPv6 Segment Route Endpoint Function. Deprecated and replaced by SAI_LOCAL_SID_ENTRY_ATTR object */
-    SAI_NEXT_HOP_TYPE_SEGMENTROUTE_ENDPOINT,
+    /** SRV6 SID List */
+    SAI_NEXT_HOP_TYPE_SRV6_SIDLIST,
 
 } sai_next_hop_type_t;
 
-/**
- * @brief Enum defining Endpoint Action types
- */
-typedef enum _sai_next_hop_endpoint_type_t
-{
-    /** Basic Endpoint */
-    SAI_NEXT_HOP_ENDPOINT_TYPE_E,
-
-    /** End.X Endpoint with Layer-3 Cross-connect */
-    SAI_NEXT_HOP_ENDPOINT_TYPE_X,
-
-    /** End.T Endpoint with specific IPv6 Table */
-    SAI_NEXT_HOP_ENDPOINT_TYPE_T,
-
-    /** Endpoint with decapsulation and Layer 2 Cross-connect */
-    SAI_NEXT_HOP_ENDPOINT_TYPE_DX2,
-
-    /** Endpoint with decapsulation and IPv6 Cross-connect */
-    SAI_NEXT_HOP_ENDPOINT_TYPE_DX6,
-
-    /** Endpoint with decapsulation and IPv4 Cross-connect */
-    SAI_NEXT_HOP_ENDPOINT_TYPE_DX4,
-
-    /** Endpoint with decapsulation and specific IPv6 */
-    SAI_NEXT_HOP_ENDPOINT_TYPE_DT6,
-
-    /** Endpoint with decapsulation and specific IPv6 */
-    SAI_NEXT_HOP_ENDPOINT_TYPE_DT4,
-
-    /** Custom range base value */
-    SAI_NEXT_HOP_ENDPOINT_TYPE_CUSTOM_RANGE_BASE = 0x10000000
-
-} sai_next_hop_endpoint_type_t;
-
-/**
- * @brief Enum defining Endpoint Segment Pop types for End, End.X and End.T. Deprecated
- *        and replaced by sai_local_sid_entry_endpoint_flavor_t
- */
-typedef enum _sai_next_hop_endpoint_pop_type_t
-{
-    /** Penultimate segment pop */
-    SAI_NEXT_HOP_ENDPOINT_POP_TYPE_PSP,
-
-    /** Ultimate Segment pop */
-    SAI_NEXT_HOP_ENDPOINT_POP_TYPE_USP,
-
-} sai_next_hop_endpoint_pop_type_t;
-
 /**
  * @brief Attribute id for next hop
  */
@@ -147,7 +96,7 @@ typedef enum _sai_next_hop_attr_t
      * @type sai_object_id_t
      * @flags MANDATORY_ON_CREATE | CREATE_ONLY
      * @objects SAI_OBJECT_TYPE_TUNNEL
-     * @condition SAI_NEXT_HOP_ATTR_TYPE == SAI_NEXT_HOP_TYPE_TUNNEL_ENCAP or SAI_NEXT_HOP_ATTR_TYPE == SAI_NEXT_HOP_TYPE_SEGMENTROUTE_SIDLIST
+     * @condition SAI_NEXT_HOP_ATTR_TYPE == SAI_NEXT_HOP_TYPE_TUNNEL_ENCAP or SAI_NEXT_HOP_ATTR_TYPE == SAI_NEXT_HOP_TYPE_SRV6_SIDLIST
      */
     SAI_NEXT_HOP_ATTR_TUNNEL_ID,
 
@@ -172,36 +121,14 @@ typedef enum _sai_next_hop_attr_t
     SAI_NEXT_HOP_ATTR_TUNNEL_MAC,
 
     /**
-     * @brief Next hop entry Segment Route SID List
+     * @brief Next hop entry SRV6 SID List
      *
      * @type sai_object_id_t
      * @flags MANDATORY_ON_CREATE | CREATE_ONLY
-     * @objects SAI_OBJECT_TYPE_SEGMENTROUTE_SIDLIST
-     * @condition SAI_NEXT_HOP_ATTR_TYPE == SAI_NEXT_HOP_TYPE_SEGMENTROUTE_SIDLIST
-     */
-    SAI_NEXT_HOP_ATTR_SEGMENTROUTE_SIDLIST_ID,
-
-    /**
-     * @brief Next hop entry Segment Route Endpoint Function. Deprecated and replaced
-     * with SAI_LOCAL_SID_ENTRY_ATTR_ENDPOINT_TYPE.
-     *
-     * @type sai_next_hop_endpoint_type_t
-     * @flags MANDATORY_ON_CREATE | CREATE_AND_SET
-     * @condition SAI_NEXT_HOP_ATTR_TYPE == SAI_NEXT_HOP_TYPE_SEGMENTROUTE_ENDPOINT
-     * @deprecated true
-     */
-    SAI_NEXT_HOP_ATTR_SEGMENTROUTE_ENDPOINT_TYPE,
-
-    /**
-     * @brief Next hop entry Segment Route Endpoint Pop Option. Deprecated and replaced
-     * with SAI_LOCAL_SID_ENTRY_ATTR_ENDPOINT_FLAVOR
-     *
-     * @type sai_next_hop_endpoint_pop_type_t
-     * @flags MANDATORY_ON_CREATE | CREATE_AND_SET
-     * @condition SAI_NEXT_HOP_ATTR_TYPE == SAI_NEXT_HOP_TYPE_SEGMENTROUTE_ENDPOINT
-     * @deprecated true
+     * @objects SAI_OBJECT_TYPE_SRV6_SIDLIST
+     * @condition SAI_NEXT_HOP_ATTR_TYPE == SAI_NEXT_HOP_TYPE_SRV6_SIDLIST
      */
-    SAI_NEXT_HOP_ATTR_SEGMENTROUTE_ENDPOINT_POP_TYPE,
+    SAI_NEXT_HOP_ATTR_SRV6_SIDLIST_ID,
 
     /**
      * @brief Push label

inc/saiobject.h

@@ -34,7 +34,7 @@
 #include <sairoute.h>
 #include <saimpls.h>
 #include <sainat.h>
-#include <saisegmentroute.h>
+#include <saisrv6.h>
 
 /**
  * @defgroup SAIOBJECT SAI - Object API definitions.
@@ -78,8 +78,8 @@ typedef union _sai_object_key_entry_t
     /** @validonly object_type == SAI_OBJECT_TYPE_NAT_ENTRY */
     sai_nat_entry_t           nat_entry;
 
-    /** @validonly object_type == SAI_OBJECT_TYPE_LOCAL_SID_ENTRY */
-    sai_local_sid_entry_t     local_sid_entry;
+    /** @validonly object_type == SAI_OBJECT_TYPE_MY_SID_ENTRY */
+    sai_my_sid_entry_t     my_sid_entry;
 
 } sai_object_key_entry_t;
 

inc/sairouterinterface.h

@@ -294,15 +294,6 @@ typedef enum _sai_router_interface_attr_t
      */
     SAI_ROUTER_INTERFACE_ATTR_ADMIN_MPLS_STATE,
 
-    /**
-     * @brief Admin SRV6 state
-     *
-     * @type bool
-     * @flags CREATE_AND_SET
-     * @default false
-     */
-    SAI_ROUTER_INTERFACE_ATTR_ADMIN_SRV6_STATE,
-
     /**
      * @brief End of attributes
      */