X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fnat%2Fnat_format.c;h=8452940898d45ec98445b23ed1d982990a63c2ab;hb=b686508c4edff42dac2ab140318de8aacb2ac18b;hp=a4b62b6e97736b015bad694afaa3963b73e16a23;hpb=e2f4e2f175beb6d6490d275049199db7dd61c783;p=vpp.git

diff --git a/src/plugins/nat/nat_format.c b/src/plugins/nat/nat_format.c
index a4b62b6e977..8452940898d 100644
--- a/src/plugins/nat/nat_format.c
+++ b/src/plugins/nat/nat_format.c
@@ -220,6 +220,26 @@ format_snat_static_mapping (u8 * s, va_list * args)
   snat_static_mapping_t *m = va_arg (*args, snat_static_mapping_t *);
   nat44_lb_addr_port_t *local;
 
+  if (is_identity_static_mapping (m))
+    {
+      if (is_addr_only_static_mapping (m))
+	s = format (s, "identity mapping %U",
+		    format_ip4_address, &m->local_addr);
+      else
+	s = format (s, "identity mapping %U %U:%d",
+		    format_snat_protocol, m->proto,
+		    format_ip4_address, &m->local_addr, m->local_port);
+
+      /* *INDENT-OFF* */
+      pool_foreach (local, m->locals,
+      ({
+        s = format (s, " vrf %d", local->vrf_id);
+      }));
+      /* *INDENT-ON* */
+
+      return s;
+    }
+
   if (is_addr_only_static_mapping (m))
     s = format (s, "local %U external %U vrf %d %s %s",
 		format_ip4_address, &m->local_addr,
@@ -230,7 +250,7 @@ format_snat_static_mapping (u8 * s, va_list * args)
 		is_out2in_only_static_mapping (m) ? "out2in-only" : "");
   else
     {
-      if (vec_len (m->locals))
+      if (is_lb_static_mapping (m))
 	{
 	  s = format (s, "%U external %U:%d %s %s",
 		      format_snat_protocol, m->proto,
@@ -238,10 +258,16 @@ format_snat_static_mapping (u8 * s, va_list * args)
 		      m->twice_nat == TWICE_NAT ? "twice-nat" :
 		      m->twice_nat == TWICE_NAT_SELF ? "self-twice-nat" : "",
 		      is_out2in_only_static_mapping (m) ? "out2in-only" : "");
-	  vec_foreach (local, m->locals)
+
+          /* *INDENT-OFF* */
+          pool_foreach (local, m->locals,
+          ({
 	    s = format (s, "\n  local %U:%d vrf %d probability %d\%",
 			format_ip4_address, &local->addr, local->port,
 			local->vrf_id, local->probability);
+          }));
+          /* *INDENT-ON* */
+
 	}
       else
 	s = format (s, "%U local %U:%d external %U:%d vrf %d %s %s",