From ddbaf941d9618125eb9d1a778c1f704c84109abf Mon Sep 17 00:00:00 2001
From: Quentin Young <qlyoung@cumulusnetworks.com>
Date: Tue, 22 Nov 2016 22:43:39 +0000
Subject: [PATCH] bgpd: Fix ambiguous commands for `...attribute-unchanged...`

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
---
 bgpd/bgp_vty.c | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index e7ed9e1911..77cf410a0f 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -3966,9 +3966,9 @@ DEFUN (neighbor_attr_unchanged,
        neighbor_attr_unchanged_cmd,
        "neighbor <A.B.C.D|X:X::X:X|WORD> attribute-unchanged\
        [<\
-          as-path [next-hop [med]]|as-path [med [next-hop]]|\
-          next-hop [as-path [med]]|next-hop [med [as-path]]|\
-          med [as-path [nexthop]]|med [next-hop [as-path]]\
+          as-path [<next-hop [med]|med [next-hop]>]|\
+          next-hop [<as-path [med]|med [as-path]>]|\
+          med [<as-path [next-hop]|next-hop [as-path]>]\
        >]",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
@@ -3976,19 +3976,16 @@ DEFUN (neighbor_attr_unchanged,
        "As-path attribute\n"
        "Nexthop attribute\n"
        "Med attribute\n"
-       "As-path attribute\n"
        "Med attribute\n"
        "Nexthop attribute\n"
        "Nexthop attribute\n"
        "As-path attribute\n"
        "Med attribute\n"
-       "Nexthop attribute\n"
        "Med attribute\n"
        "As-path attribute\n"
        "Med attribute\n"
        "As-path attribute\n"
        "Nexthop attribute\n"
-       "Med attribute\n"
        "Nexthop attribute\n"
        "As-path attribute\n")
 {
@@ -4019,9 +4016,9 @@ DEFUN (no_neighbor_attr_unchanged,
        no_neighbor_attr_unchanged_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> attribute-unchanged\
        [<\
-          as-path [next-hop [med]]|as-path [med [next-hop]]|\
-          next-hop [as-path [med]]|next-hop [med [as-path]]|\
-          med [as-path [nexthop]]|med [next-hop [as-path]]\
+          as-path [<next-hop [med]|med [next-hop]>]|\
+          next-hop [<as-path [med]|med [as-path]>]|\
+          med [<as-path [next-hop]|next-hop [as-path]>]\
        >]",
        NO_STR
        NEIGHBOR_STR
@@ -4030,19 +4027,16 @@ DEFUN (no_neighbor_attr_unchanged,
        "As-path attribute\n"
        "Nexthop attribute\n"
        "Med attribute\n"
-       "As-path attribute\n"
        "Med attribute\n"
        "Nexthop attribute\n"
        "Nexthop attribute\n"
        "As-path attribute\n"
        "Med attribute\n"
-       "Nexthop attribute\n"
        "Med attribute\n"
        "As-path attribute\n"
        "Med attribute\n"
        "As-path attribute\n"
        "Nexthop attribute\n"
-       "Med attribute\n"
        "Nexthop attribute\n"
        "As-path attribute\n")
 {
-- 
2.39.5