diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-09-25 16:47:28 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-09-25 16:47:28 +0200 |
| commit | 4b287511af74448ebf1cdc44c7880989a6a02da1 (patch) | |
| tree | 0f98b4bfe440536a55bb5f3f199715ec93ecbe02 | |
| parent | 801123eff1bf232ca1e5202ceb0989c2fba34c86 (diff) | |
| download | vyos-1x-4b287511af74448ebf1cdc44c7880989a6a02da1.tar.gz vyos-1x-4b287511af74448ebf1cdc44c7880989a6a02da1.zip | |
bgp: xml: T2387: use "generic-description" building block over BGP specific one
There is no benefit in the BGP specific definition of a "description" node.
| -rw-r--r-- | interface-definitions/include/bgp/neighbor-description.xml.i | 7 | ||||
| -rw-r--r-- | interface-definitions/include/bgp/protocol-common-config.xml.i | 4 |
2 files changed, 2 insertions, 9 deletions
diff --git a/interface-definitions/include/bgp/neighbor-description.xml.i b/interface-definitions/include/bgp/neighbor-description.xml.i deleted file mode 100644 index 3095d2560..000000000 --- a/interface-definitions/include/bgp/neighbor-description.xml.i +++ /dev/null @@ -1,7 +0,0 @@ -<!-- include start from bgp/neighbor-description.xml.i --> -<leafNode name="description"> - <properties> - <help>Neighbor specific description</help> - </properties> -</leafNode> -<!-- include end --> diff --git a/interface-definitions/include/bgp/protocol-common-config.xml.i b/interface-definitions/include/bgp/protocol-common-config.xml.i index 2b22bac7d..40b9a56de 100644 --- a/interface-definitions/include/bgp/protocol-common-config.xml.i +++ b/interface-definitions/include/bgp/protocol-common-config.xml.i @@ -960,9 +960,9 @@ </constraint> </properties> </leafNode> + #include <include/generic-description.xml.i> #include <include/bgp/neighbor-bfd.xml.i> #include <include/bgp/neighbor-capability.xml.i> - #include <include/bgp/neighbor-description.xml.i> #include <include/bgp/neighbor-disable-capability-negotiation.xml.i> #include <include/bgp/neighbor-disable-connected-check.xml.i> #include <include/bgp/neighbor-ebgp-multihop.xml.i> @@ -1418,9 +1418,9 @@ #include <include/bgp/neighbor-afi-l2vpn-evpn.xml.i> </children> </node> + #include <include/generic-description.xml.i> #include <include/bgp/neighbor-bfd.xml.i> #include <include/bgp/neighbor-capability.xml.i> - #include <include/bgp/neighbor-description.xml.i> #include <include/bgp/neighbor-disable-capability-negotiation.xml.i> #include <include/bgp/neighbor-disable-connected-check.xml.i> #include <include/bgp/neighbor-ebgp-multihop.xml.i> |