summaryrefslogtreecommitdiffstats
path: root/vpp-api-test/vat
diff options
context:
space:
mode:
authorKeith Burns (alagalah) <alagalah@gmail.com>2016-05-04 16:11:38 -0700
committerDave Barach <openvpp@barachs.net>2016-05-05 11:45:22 +0000
commitfdff1e6ed540f2a04792fb64e04b0c7862dc2b8c (patch)
treee846f70e89a3992ca98c82759bd9d36dc7ed3fdb /vpp-api-test/vat
parent8f15e922f7f32c1beca5baa9a1a7f187ff5bdc4f (diff)
VPP-39 - refactoring of NSH into own folder
- common header files and structs used in both GRE and VXLAN-GPE Change-Id: I06d0b773e936fb011408817237059f24a4beb412 Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>
Diffstat (limited to 'vpp-api-test/vat')
-rw-r--r--vpp-api-test/vat/api_format.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/vpp-api-test/vat/api_format.c b/vpp-api-test/vat/api_format.c
index 4a57d4cb018..548959edb3b 100644
--- a/vpp-api-test/vat/api_format.c
+++ b/vpp-api-test/vat/api_format.c
@@ -7894,13 +7894,13 @@ static uword unformat_nsh_gre_decap_next
u32 tmp;
if (unformat (input, "drop"))
- *result = NSH_INPUT_NEXT_DROP;
+ *result = NSH_GRE_INPUT_NEXT_DROP;
else if (unformat (input, "ip4"))
- *result = NSH_INPUT_NEXT_IP4_INPUT;
+ *result = NSH_GRE_INPUT_NEXT_IP4_INPUT;
else if (unformat (input, "ip6"))
- *result = NSH_INPUT_NEXT_IP6_INPUT;
+ *result = NSH_GRE_INPUT_NEXT_IP6_INPUT;
else if (unformat (input, "ethernet"))
- *result = NSH_INPUT_NEXT_ETHERNET_INPUT;
+ *result = NSH_GRE_INPUT_NEXT_ETHERNET_INPUT;
else if (unformat (input, "%d", &tmp))
*result = tmp;
else
@@ -7932,7 +7932,7 @@ static int api_nsh_gre_add_del_tunnel (vat_main_t * vam)
u32 c3 = 0;
u32 c4 = 0;
u32 *tlvs = 0;
- u32 decap_next_index = NSH_INPUT_NEXT_IP4_INPUT;
+ u32 decap_next_index = NSH_GRE_INPUT_NEXT_IP4_INPUT;
u32 tmp;
int i;
@@ -8084,7 +8084,7 @@ static int api_nsh_vxlan_gpe_add_del_tunnel (vat_main_t * vam)
u32 c3 = 0;
u32 c4 = 0;
u32 *tlvs = 0;
- u32 decap_next_index = NSH_INPUT_NEXT_IP4_INPUT;
+ u32 decap_next_index = NSH_GRE_INPUT_NEXT_IP4_INPUT;
u32 vni;
u8 vni_set = 0;
u32 tmp;