1 files changed, 37 insertions, 49 deletions

diff --git a/src/vnet/srv6/sr.api b/src/vnet/srv6/sr.api
index 543f3fd7d00..75a23b06e04 100644
--- a/src/vnet/srv6/sr.api
+++ b/src/vnet/srv6/sr.api
@@ -14,20 +14,18 @@
  * limitations under the License.
  */
 
-option version = "1.2.1";
+option version = "2.0.0";
+
+import "vnet/interface_types.api";
+import "vnet/ip/ip_types.api";
+import "vnet/srv6/sr_types.api";
 
-/** \brief SRv6 SID
-*/
-typedef srv6_sid
-{
-  u8 addr[16];
-};
 
 typedef srv6_sid_list
 {
   u8 num_sids;
   u32 weight;
-  vl_api_srv6_sid_t sids[16];
+  vl_api_ip6_address_t sids[16];
 };
 
 /** \brief IPv6 SR LocalSID add/del request
@@ -41,27 +39,20 @@ typedef srv6_sid_list
      fib_table.
     @param vlan_index Only for L2 xconnect. Outgoing VLAN tag.
     @param fib_table  FIB table in which we should install the localsid entry
-    @param nh_addr6 Next Hop IPv6 address. Only for L2/L3 xconnect.
-    @param nh_addr4 Next Hop IPv4 address. Only for L2/L3 xconnect.
+    @param nh_addr Next Hop IPv46 address. Only for L2/L3 xconnect.
 */
 autoreply define sr_localsid_add_del
 {
   u32 client_index;
   u32 context;
-  u8 is_del;
-  vl_api_srv6_sid_t localsid;
-  u8 end_psp;
-  u8 behavior;
-  u32 sw_if_index;
+  bool is_del [default=false];
+  vl_api_ip6_address_t localsid;
+  bool end_psp;
+  vl_api_sr_behavior_t behavior;
+  vl_api_interface_index_t sw_if_index;
   u32 vlan_index;
   u32 fib_table;
-  u8 nh_addr6[16];
-  u8 nh_addr4[4];
-};
-
-typedef sr_ip6_address
-{
-  u8 data[16];
+  vl_api_address_t nh_addr;
 };
 
 /** \brief IPv6 SR policy add
@@ -70,7 +61,7 @@ typedef sr_ip6_address
     @param bsid is the bindingSID of the SR Policy
     @param weight is the weight of the sid list. optional.
     @param is_encap is the behavior of the SR policy. (0.SRH insert // 1.Encapsulation)
-    @param type is the type of the SR policy. (0.Default // 1.Spray)
+    @param is_spray is the type of the SR policy. (0.Default // 1.Spray)
     @param fib_table is the VRF where to install the FIB entry for the BSID
     @param sids is a srv6_sid_list object
 */
@@ -78,10 +69,10 @@ autoreply define sr_policy_add
 {
   u32 client_index;
   u32 context;
-  u8 bsid_addr[16];
+  vl_api_ip6_address_t bsid_addr;
   u32 weight;
-  u8 is_encap;
-  u8 type;
+  bool is_encap;
+  bool is_spray;
   u32 fib_table;
   vl_api_srv6_sid_list_t sids;
 };
@@ -101,10 +92,10 @@ autoreply define sr_policy_mod
 {
   u32 client_index;
   u32 context;
-  u8 bsid_addr[16];
+  vl_api_ip6_address_t bsid_addr;
   u32 sr_policy_index;
   u32 fib_table;
-  u8 operation;
+  vl_api_sr_policy_op_t operation;
   u32 sl_index;
   u32 weight;
   vl_api_srv6_sid_list_t sids;
@@ -120,7 +111,7 @@ autoreply define sr_policy_del
 {
   u32 client_index;
   u32 context;
-  vl_api_srv6_sid_t bsid_addr;
+  vl_api_ip6_address_t bsid_addr;
   u32 sr_policy_index;
 };
 
@@ -134,7 +125,7 @@ autoreply define sr_set_encap_source
 {
   u32 client_index;
   u32 context;
-  u8 encaps_source[16];
+  vl_api_ip6_address_t encaps_source;
 };
 
 /** \brief IPv6 SR Set SRv6 encapsulation hop-limit
@@ -165,14 +156,13 @@ autoreply define sr_steering_add_del
 {
   u32 client_index;
   u32 context;
-  u8 is_del;
-  u8 bsid_addr[16];
+  bool is_del [default=false];
+  vl_api_ip6_address_t bsid_addr;
   u32 sr_policy_index;
   u32 table_id;
-  u8 prefix_addr[16];
-  u32 mask_width;
-  u32 sw_if_index;
-  u8 traffic_type;
+  vl_api_prefix_t prefix;
+  vl_api_interface_index_t sw_if_index;
+  vl_api_sr_steer_t traffic_type;
 };
 
 /** \brief Dump the list of SR LocalSIDs
@@ -188,13 +178,12 @@ define sr_localsids_dump
 define sr_localsids_details
 {
   u32 context;
-  vl_api_srv6_sid_t addr;
-  u8 end_psp;
-  u16 behavior;
+  vl_api_ip6_address_t addr;
+  bool end_psp;
+  vl_api_sr_behavior_t behavior;
   u32 fib_table;
   u32 vlan_index;
-  u8 xconnect_nh_addr6[16];
-  u8 xconnect_nh_addr4[4];
+  vl_api_address_t xconnect_nh_addr;
   u32 xconnect_iface_or_vrf_table;
 };
 
@@ -211,9 +200,9 @@ define sr_policies_dump
 define sr_policies_details
 {
   u32 context;
-  vl_api_srv6_sid_t bsid;
-  u8 type;
-  u8 is_encap;
+  vl_api_ip6_address_t bsid;
+  bool is_spray;
+  bool is_encap;
   u32 fib_table;
   u8 num_sid_lists;
   vl_api_srv6_sid_list_t sid_lists[num_sid_lists];
@@ -232,12 +221,11 @@ define sr_steering_pol_dump
 define sr_steering_pol_details
 {
   u32 context;
-  u8 traffic_type;
+  vl_api_sr_steer_t traffic_type;
   u32 fib_table;
-  u8 prefix_addr[16];
-  u32 mask_width;
-  u32 sw_if_index;
-  vl_api_srv6_sid_t bsid;
+  vl_api_prefix_t prefix;
+  vl_api_interface_index_t sw_if_index;
+  vl_api_ip6_address_t bsid;
 };
 
 /*