Repair SNAT's IPFIX and IF-add-del test functions.

[vpp.git] / src / plugins / snat / snat_test.c

diff --git a/src/plugins/snat/snat_test.c b/src/plugins/snat/snat_test.c
index 50e81ea..a299e0a 100644 (file)
--- a/src/plugins/snat/snat_test.c
+++ b/src/plugins/snat/snat_test.c
@@ -214,13 +214,15 @@ static int api_snat_add_static_mapping(vat_main_t * vam)
   unformat_input_t * i = vam->input;
   vl_api_snat_add_static_mapping_t * mp;
   u8 external_addr_set = 0;
-  u8 local_addr_set;
+  u8 local_addr_set = 0;
   u8 is_add = 1;
   u8 addr_only = 1;
   ip4_address_t local_addr, external_addr;
   u32 local_port = 0, external_port = 0, vrf_id = ~0;
   u32 sw_if_index = ~0;
   u8 sw_if_index_set = 0;
+  u32 proto = ~0;
+  u8 proto_set = 0;
   int ret;
 
   while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
@@ -239,8 +241,10 @@ static int api_snat_add_static_mapping(vat_main_t * vam)
         sw_if_index_set = 1;
       else if (unformat (i, "external_sw_if_index %d", &sw_if_index))
         sw_if_index_set = 1;
-       else if (unformat (i, "vrf %u", &vrf_id))
+      else if (unformat (i, "vrf %u", &vrf_id))
         ;
+      else if (unformat (i, "protocol %u", &proto))
+        proto_set = 1;
       else if (unformat (i, "del"))
         is_add = 0;
       else
@@ -250,6 +254,12 @@ static int api_snat_add_static_mapping(vat_main_t * vam)
         }
     }
 
+  if (!addr_only && !proto_set)
+    {
+      errmsg ("protocol required\n");
+      return -99;
+    }
+
   if (!local_addr_set)
     {
       errmsg ("local addr required\n");
@@ -269,6 +279,7 @@ static int api_snat_add_static_mapping(vat_main_t * vam)
   mp->external_port = ntohs ((u16) external_port);
   mp->external_sw_if_index = ntohl (sw_if_index);
   mp->vrf_id = ntohl (vrf_id);
+  mp->protocol = (u8) proto;
   memcpy (mp->local_ip_address, &local_addr, 4);
   memcpy (mp->external_ip_address, &external_addr, 4);
 
@@ -299,18 +310,34 @@ static void vl_api_snat_static_mapping_details_t_handler
   snat_test_main_t * sm = &snat_test_main;
   vat_main_t *vam = sm->vat_main;
 
-  if (mp->addr_only)
-      fformat (vam->ofp, "%15U%6s%15U%6s%11d\n",
+  if (mp->addr_only && mp->external_sw_if_index != ~0)
+      fformat (vam->ofp, "%15U%6s%15d%6s%11d%6d\n",
+               format_ip4_address, &mp->local_ip_address, "",
+               ntohl (mp->external_sw_if_index), "",
+               ntohl (mp->vrf_id),
+               mp->protocol);
+  else if (mp->addr_only && mp->external_sw_if_index == ~0)
+      fformat (vam->ofp, "%15U%6s%15U%6s%11d%6d\n",
                format_ip4_address, &mp->local_ip_address, "",
                format_ip4_address, &mp->external_ip_address, "",
-               ntohl (mp->vrf_id));
+               ntohl (mp->vrf_id),
+               mp->protocol);
+  else if (!mp->addr_only && mp->external_sw_if_index != ~0)
+      fformat (vam->ofp, "%15U%6d%15d%6d%11d%6d\n",
+               format_ip4_address, &mp->local_ip_address,
+               ntohs (mp->local_port),
+               ntohl (mp->external_sw_if_index),
+               ntohs (mp->external_port),
+               ntohl (mp->vrf_id),
+               mp->protocol);
   else
-      fformat (vam->ofp, "%15U%6d%15U%6d%11d\n",
+      fformat (vam->ofp, "%15U%6d%15U%6d%11d%6d\n",
                format_ip4_address, &mp->local_ip_address,
                ntohs (mp->local_port),
                format_ip4_address, &mp->external_ip_address,
                ntohs (mp->external_port),
-               ntohl (mp->vrf_id));
+               ntohl (mp->vrf_id),
+               mp->protocol);
 
 }
 
@@ -327,8 +354,8 @@ static int api_snat_static_mapping_dump(vat_main_t * vam)
     }
 
   fformat (vam->ofp, "%21s%21s\n", "local", "external");
-  fformat (vam->ofp, "%15s%6s%15s%6s%11s\n", "address", "port", "address",
-           "port", "vrf");
+  fformat (vam->ofp, "%15s%6s%15s%6s%11s%6s\n", "address", "port",
+           "address/if_idx", "port", "vrf", "proto");
 
   M(SNAT_STATIC_MAPPING_DUMP, mp);
   S(mp);
@@ -513,7 +540,7 @@ static int api_snat_worker_dump(vat_main_t * vam)
   return ret;
 }
 
-static int api_snat_ipfix_enable_disable (vat_main_t * vam)
+static int api_snat_add_del_interface_addr (vat_main_t * vam)
 {
   unformat_input_t * i = vam->input;
   vl_api_snat_add_del_interface_addr_t * mp;
@@ -584,7 +611,7 @@ static int api_snat_interface_addr_dump(vat_main_t * vam)
   return ret;
 }
 
-static int api_snat_add_del_interface_addr (vat_main_t * vam)
+static int api_snat_ipfix_enable_disable (vat_main_t * vam)
 {
   unformat_input_t * i = vam->input;
   vl_api_snat_ipfix_enable_disable_t * mp;
@@ -626,9 +653,10 @@ static int api_snat_add_del_interface_addr (vat_main_t * vam)
 _(snat_add_address_range, "<start-addr> [- <end-addr] [del]")    \
 _(snat_interface_add_del_feature,                                \
   "<intfc> | sw_if_index <id> [in] [out] [del]")                 \
-_(snat_add_static_mapping, "local_addr <ip> external_addr <ip> " \
-  "| external_if <intfc> | external_sw_if_ndex <id>) "           \
-  "[local_port <n>] [external_port <n>] [vrf <table-id>] [del]") \
+_(snat_add_static_mapping, "local_addr <ip> (external_addr <ip>" \
+  " | external_if <intfc> | external_sw_if_ndex <id>) "          \
+  "[local_port <n>] [external_port <n>] [vrf <table-id>] [del] " \
+  "protocol <n>")                                                \
 _(snat_set_workers, "<wokrers_bitmap>")                          \
 _(snat_static_mapping_dump, "")                                  \
 _(snat_show_config, "")                                          \