1 files changed, 14 insertions, 15 deletions
diff --git a/src/plugins/pppoe/pppoe.api b/src/plugins/pppoe/pppoe.api
index 5f0423384eb..fcbbf8a2f97 100644
--- a/src/plugins/pppoe/pppoe.api
+++ b/src/plugins/pppoe/pppoe.api
@@ -13,13 +13,15 @@
  * limitations under the License.
  */
 
-option version = "1.0.0";
+option version = "2.0.0";
+import "vnet/interface_types.api";
+import "vnet/ethernet/ethernet_types.api";
+import "vnet/ip/ip_types.api";
 
 /** \brief Set or delete an PPPOE session
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
     @param is_add - add address if non-zero, else delete
-    @param is_ipv6 - client_ip and dst_address is ipv6 or not
     @param session_id - PPPoE session ID
     @param client_ip - PPPOE session's client address.
     @param decap_vrf_id - the vrf index for pppoe decaped packet
@@ -29,12 +31,11 @@ define pppoe_add_del_session
 {
   u32 client_index;
   u32 context;
-  u8 is_add;
-  u8 is_ipv6;
+  bool is_add;
   u16 session_id;
-  u8 client_ip[16];
+  vl_api_address_t client_ip;
   u32 decap_vrf_id;
-  u8 client_mac[6];
+  vl_api_mac_address_t client_mac;
   option vat_help = "client-addr <client-addr> session-id <nn> [encap-if-index <nn>] [decap-next [ip4|ip6|node <name>]] local-mac <local-mac> client-mac <client-mac> [del]";
 };
 
@@ -47,7 +48,7 @@ define pppoe_add_del_session_reply
 {
   u32 context;
   i32 retval;
-  u32 sw_if_index;
+  vl_api_interface_index_t sw_if_index;
 };
 
 /** \brief Dump PPPOE session
@@ -59,14 +60,13 @@ define pppoe_session_dump
 {
   u32 client_index;
   u32 context;
-  u32 sw_if_index;
+  vl_api_interface_index_t sw_if_index;
   option vat_help = "[<intfc> | sw_if_index <nn>]";
 };
 
 /** \brief dump details of an PPPOE session
     @param context - sender context, to match reply w/ request
     @param sw_if_index - software index of the interface
-    @param is_ipv6 - client_ip and dst_address is ipv6 or not
     @param session_id - PPPoE session ID
     @param client_ip - PPPOE session's client address.
     @param encap_if_index - the index of tx interface for pppoe encaped packet
@@ -77,14 +77,13 @@ define pppoe_session_dump
 define pppoe_session_details
 {
   u32 context;
-  u32 sw_if_index;
-  u8 is_ipv6;
+  vl_api_interface_index_t sw_if_index;
   u16 session_id;
-  u8 client_ip[16];
-  u32 encap_if_index;
+  vl_api_address_t client_ip;
+  vl_api_interface_index_t encap_if_index;
   u32 decap_vrf_id;
-  u8 local_mac[6];
-  u8 client_mac[6];
+  vl_api_mac_address_t local_mac;
+  vl_api_mac_address_t client_mac;
 };
 
 /*