X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Flb%2Fcli.c;h=a12a63354ccea497bd7e54a62b46d6d73c63d64c;hb=6a4375e0;hp=cfe8f381b13711bc141b601511acbc61f5a046c4;hpb=219cc90cb435cfcfb5154c6c0e49bd4d60aae769;p=vpp.git

diff --git a/src/plugins/lb/cli.c b/src/plugins/lb/cli.c
index cfe8f381b13..a12a63354cc 100644
--- a/src/plugins/lb/cli.c
+++ b/src/plugins/lb/cli.c
@@ -201,6 +201,7 @@ lb_as_command_fn (vlib_main_t * vm,
   u32 port = 0;
   u8 protocol = 0;
   u8 del = 0;
+  u8 flush = 0;
   int ret;
   clib_error_t *error = 0;
 
@@ -219,11 +220,17 @@ lb_as_command_fn (vlib_main_t * vm,
   {
     if (unformat(line_input, "%U", unformat_ip46_address,
                  &as_addr, IP46_TYPE_ANY))
-    {
-      vec_add1(as_array, as_addr);
-    } else if (unformat(line_input, "del")) {
-      del = 1;
-    }
+      {
+        vec_add1(as_array, as_addr);
+      }
+    else if (unformat(line_input, "del"))
+      {
+        del = 1;
+      }
+    else if (unformat(line_input, "flush"))
+      {
+        flush = 1;
+      }
     else if (unformat(line_input, "protocol tcp"))
       {
           protocol = (u8)IP_PROTOCOL_TCP;
@@ -262,7 +269,7 @@ lb_as_command_fn (vlib_main_t * vm,
   clib_warning("vip index is %d", vip_index);
 
   if (del) {
-    if ((ret = lb_vip_del_ass(vip_index, as_array, vec_len(as_array))))
+    if ((ret = lb_vip_del_ass(vip_index, as_array, vec_len(as_array), flush)))
     {
       error = clib_error_return (0, "lb_vip_del_ass error %d", ret);
       goto done;
@@ -286,7 +293,7 @@ VLIB_CLI_COMMAND (lb_as_command, static) =
 {
   .path = "lb as",
   .short_help = "lb as <vip-prefix> [protocol (tcp|udp) port <n>]"
-      " [<address> [<address> [...]]] [del]",
+      " [<address> [<address> [...]]] [del] [flush]",
   .function = lb_as_command_fn,
 };
 
@@ -494,29 +501,86 @@ static clib_error_t *
 lb_flowtable_flush_command_fn (vlib_main_t * vm,
               unformat_input_t * input, vlib_cli_command_t * cmd)
 {
-  u32 thread_index;
-  vlib_thread_main_t *tm = vlib_get_thread_main();
-  lb_main_t *lbm = &lb_main;
+  lb_flush_vip_as(~0, 0);
 
-  for(thread_index = 0; thread_index < tm->n_vlib_mains; thread_index++ ) {
-    lb_hash_t *h = lbm->per_cpu[thread_index].sticky_ht;
-    if (h != NULL) {
-        u32 i;
-        lb_hash_bucket_t *b;
+  return NULL;
+}
 
-        lb_hash_foreach_entry(h, b, i) {
-            vlib_refcount_add(&lbm->as_refcount, thread_index, b->value[i], -1);
-            vlib_refcount_add(&lbm->as_refcount, thread_index, 0, 1);
-        }
+static clib_error_t *
+lb_flush_vip_command_fn (vlib_main_t * vm,
+                         unformat_input_t * input,
+                         vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  int ret;
+  ip46_address_t vip_prefix;
+  u8 vip_plen;
+  u32 vip_index;
+  u8 protocol = 0;
+  u32 port = 0;
+  clib_error_t *error = 0;
+
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  if (!unformat(line_input, "%U", unformat_ip46_prefix, &vip_prefix,
+                &vip_plen, IP46_TYPE_ANY, &vip_plen)) {
+    error = clib_error_return (0, "invalid vip prefix: '%U'",
+                               format_unformat_error, line_input);
+    goto done;
+  }
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+  {
+    if (unformat(line_input, "protocol tcp"))
+      {
+        protocol = (u8)IP_PROTOCOL_TCP;
+      }
+    else if (unformat(line_input, "protocol udp"))
+      {
+        protocol = (u8)IP_PROTOCOL_UDP;
+      }
+    else if (unformat(line_input, "port %d", &port))
+      ;
+  }
 
-        lb_hash_free(h);
-        lbm->per_cpu[thread_index].sticky_ht = 0;
+  if (port == 0)
+    {
+      protocol = ~0;
     }
+
+  if ((ret = lb_vip_find_index(&vip_prefix, vip_plen, protocol,
+                               (u16)port, &vip_index))){
+    error = clib_error_return (0, "lb_vip_find_index error %d", ret);
+    goto done;
   }
 
-  return NULL;
+  if ((ret = lb_flush_vip_as(vip_index, ~0)))
+    {
+      error = clib_error_return (0, "lb_flush_vip error %d", ret);
+    }
+  else
+    {
+        vlib_cli_output(vm, "lb_flush_vip ok %d", vip_index);
+    }
+
+done:
+  unformat_free (line_input);
+
+  return error;
 }
 
+/*
+ * flush lb flowtable as per vip
+ */
+VLIB_CLI_COMMAND (lb_flush_vip_command, static) =
+{
+  .path = "lb flush vip",
+  .short_help = "lb flush vip <prefix> "
+      "[protocol (tcp|udp) port <n>]",
+  .function = lb_flush_vip_command_fn,
+};
+
 /*
  * flush all lb flowtables
  * This is indented for debug and unit-tests purposes only