Fixed bugs in SRv6 API

Jira ticket VPP-1196
Jira ticket VPP-1081
Jira ticket VPP-1078
Jira ticket VPP-1217

Change-Id: Id7e85229cae1017acb0aa4ca63ced334e6dafb8d
Signed-off-by: pcamaril <pcamaril@cisco.com>
Signed-off-by: Pablo Camarillo <pcamaril@cisco.com>
Signed-off-by: pcamaril <pcamaril@cisco.com>
Signed-off-by: Michal Cmarada <michal.cmarada@pantheon.tech>

1 files changed, 71 insertions, 14 deletions

diff --git a/src/vnet/srv6/sr.api b/src/vnet/srv6/sr.api
index 181192817b2..27b5ac6f89e 100644
--- a/src/vnet/srv6/sr.api
+++ b/src/vnet/srv6/sr.api
@@ -14,7 +14,21 @@
  * limitations under the License.
  */
 
-option version = "1.0.1";
+option version = "1.2.0";
+
+/** \brief SRv6 SID
+*/
+typeonly define srv6_sid
+{
+  u8 addr[16];
+};
+
+typeonly define srv6_sid_list
+{
+  u8 num_sids;
+  u32 weight;
+  vl_api_srv6_sid_t sids[16];
+};
 
 /** \brief IPv6 SR LocalSID add/del request
     @param client_index - opaque cookie to identify the sender
@@ -27,20 +41,22 @@ option version = "1.0.1";
      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_addr Next Hop IPv4/IPv6 address. Only for L2/L3 xconnect.
+    @param nh_addr6 Next Hop IPv6 address. Only for L2/L3 xconnect.
+    @param nh_addr4 Next Hop IPv4 address. Only for L2/L3 xconnect.
 */
 autoreply define sr_localsid_add_del
 {
   u32 client_index;
   u32 context;
   u8 is_del;
-  u8 localsid_addr[16];
+  vl_api_srv6_sid_t localsid;
   u8 end_psp;
   u8 behavior;
   u32 sw_if_index;
   u32 vlan_index;
   u32 fib_table;
-  u8 nh_addr[16];
+  u8 nh_addr6[16];
+  u8 nh_addr4[4];
 };
 
 typeonly define sr_ip6_address
@@ -56,7 +72,7 @@ typeonly define sr_ip6_address
     @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 fib_table is the VRF where to install the FIB entry for the BSID
-    @param segments is a vector of IPv6 address composing the segment list
+    @param sids is a srv6_sid_list object
 */
 autoreply define sr_policy_add
 {
@@ -67,8 +83,7 @@ autoreply define sr_policy_add
   u8 is_encap;
   u8 type;
   u32 fib_table;
-  u8 n_segments;
-  vl_api_sr_ip6_address_t segments[n_segments];
+  vl_api_srv6_sid_list_t sids;
 };
 
 /** \brief IPv6 SR policy modification
@@ -78,10 +93,9 @@ autoreply define sr_policy_add
     @param sr_policy_index is the index of the SR policy
     @param fib_table is the VRF where to install the FIB entry for the BSID
     @param operation is the operation to perform (among the top ones)
-    @param segments is a vector of IPv6 address composing the segment list
     @param sl_index is the index of the Segment List to modify/delete
     @param weight is the weight of the sid list. optional.
-    @param is_encap Mode. Encapsulation or SRH insertion.
+    @param sids is a srv6_sid_list object
 */
 autoreply define sr_policy_mod
 {
@@ -93,8 +107,7 @@ autoreply define sr_policy_mod
   u8 operation;
   u32 sl_index;
   u32 weight;
-  u8 n_segments;
-  vl_api_sr_ip6_address_t segments[n_segments];
+  vl_api_srv6_sid_list_t sids;
 };
 
 /** \brief IPv6 SR policy deletion
@@ -107,7 +120,7 @@ autoreply define sr_policy_del
 {
   u32 client_index;
   u32 context;
-  u8 bsid_addr[16];
+  vl_api_srv6_sid_t bsid_addr;
   u32 sr_policy_index;
 };
 
@@ -163,14 +176,58 @@ define sr_localsids_dump
 define sr_localsids_details
 {
   u32 context;
-  u8 address[16];
+  vl_api_srv6_sid_t addr;
   u8 end_psp;
   u16 behavior;
   u32 fib_table;
-  u8 xconnect_next_hop[16];
+  u32 vlan_index;
+  u8 xconnect_nh_addr6[16];
+  u8 xconnect_nh_addr4[4];
   u32 xconnect_iface_or_vrf_table;
 };
 
+/** \brief Dump the list of SR policies
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+*/
+define sr_policies_dump
+{
+  u32 client_index;
+  u32 context;
+};
+
+define sr_policies_details
+{
+  u32 context;
+  vl_api_srv6_sid_t bsid;
+  u8 type;
+  u8 is_encap;
+  u32 fib_table;
+  u8 num_sid_lists;
+  vl_api_srv6_sid_list_t sid_lists[num_sid_lists];
+};
+
+/** \brief Dump the steering policies
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+*/
+define sr_steering_pol_dump
+{
+  u32 client_index;
+  u32 context;
+};
+
+define sr_steering_pol_details
+{
+  u32 context;
+  u8 traffic_type;
+  u32 fib_table;
+  u8 prefix_addr[16];
+  u32 mask_width;
+  u32 sw_if_index;
+  vl_api_srv6_sid_t bsid;
+};
+
 /*
  * fd.io coding-style-patch-verification: OFF
  * Local Variables: