X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fplugins%2Fnsim%2Fnsim.api;h=f0ae02a70bdaac20956b3f9e614c2f226c116f1d;hb=00f21fb2f;hp=89174268aee2f224527467da38e7ab2c85df0af2;hpb=9e3252b5cec76dddb9877e593c799ebe15cae0af;p=vpp.git

diff --git a/src/plugins/nsim/nsim.api b/src/plugins/nsim/nsim.api
index 89174268aee..f0ae02a70bd 100644
--- a/src/plugins/nsim/nsim.api
+++ b/src/plugins/nsim/nsim.api
@@ -3,7 +3,8 @@
  * @brief VPP control-plane API messages for the network delay simulator
  */
 
-option version = "1.0.0";
+option version = "2.2.1";
+import "vnet/interface_types.api";
 
 /** \brief enable / disable the network delay simulation cross-connect
     @param client_index - opaque cookie to identify the sender
@@ -12,7 +13,7 @@ option version = "1.0.0";
     @param sw_if_index0 - one interface to cross-connect
     @param sw_if_index1 - the other interface to cross-connect
 */
-autoreply define nsim_enable_disable 
+autoreply define nsim_cross_connect_enable_disable 
 {
   /* Client identifier, set from api_main.my_client_index */
   u32 client_index;
@@ -21,11 +22,34 @@ autoreply define nsim_enable_disable
   u32 context;
   
   /* Enable / disable the feature on the interfaces */
-  u8 enable_disable;
+  bool enable_disable;
   
   /* Interface handles */
-  u32 sw_if_index0;
-  u32 sw_if_index1;
+  vl_api_interface_index_t sw_if_index0;
+  vl_api_interface_index_t sw_if_index1;
+  option vat_help = "[<intfc0> | sw_if_index <swif0>] [<intfc1> | sw_if_index <swif1>] [disable]";
+};
+
+/** \brief enable / disable the network delay simulation output feature
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param enable_disable - enable or disable the feature
+    @param sw_if_index0 - interface 
+*/
+autoreply define nsim_output_feature_enable_disable 
+{
+  /* Client identifier, set from api_main.my_client_index */
+  u32 client_index;
+  
+  /* Arbitrary context, so client can match reply to request */
+  u32 context;
+  
+  /* Enable / disable the feature on the interfaces */
+  bool enable_disable;
+  
+  /* Interface handles */
+  vl_api_interface_index_t sw_if_index;
+  option vat_help = "[<intfc> | sw_if_index <nnn> [disable]";
 };
 
 /** \brief configure the network delay simulation cross-connect
@@ -37,6 +61,7 @@ autoreply define nsim_enable_disable
 */
 autoreply define nsim_configure
 {
+  option deprecated;
   /* Client identifier, set from api_main.my_client_index */
   u32 client_index;
   
@@ -47,4 +72,31 @@ autoreply define nsim_configure
   u32 delay_in_usec;
   u32 average_packet_size;
   u64 bandwidth_in_bits_per_second;
+  u32 packets_per_drop;
+  option vat_help = "delay <time> bandwidth <bw> [packet-size <nn>] [packets-per-drop <nnnn>]";
 };
+
+/** \brief configure the network delay simulation cross-connect
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param delay_in_usec - microseconds of link delay to simulate
+    @param average_packet_size - average packet size for wheel sizing
+    @param bandwidth_in_bits_per_second - bps for wheel sizing
+*/
+autoreply define nsim_configure2
+{
+  /* Client identifier, set from api_main.my_client_index */
+  u32 client_index;
+  
+  /* Arbitrary context, so client can match reply to request */
+  u32 context;
+
+  /* Configuration parameters */
+  u32 delay_in_usec;
+  u32 average_packet_size;
+  u64 bandwidth_in_bits_per_second;
+  u32 packets_per_drop;
+  u32 packets_per_reorder;
+  option vat_help = "delay <time> bandwidth <bw> [packet-size <nn>] [packets-per-drop <nnnn>]";
+};
+