bgp: T3624: add "bandwidth" bestpath option

3 files changed, 36 insertions, 3 deletions

diff --git a/data/templates/frr/bgpd.frr.tmpl b/data/templates/frr/bgpd.frr.tmpl
index 158da3605..c21e7f234 100644
--- a/data/templates/frr/bgpd.frr.tmpl
+++ b/data/templates/frr/bgpd.frr.tmpl
@@ -402,15 +402,18 @@ router bgp {{ local_as }} {{ 'vrf ' ~ vrf if vrf is defined and vrf is not none
  bgp always-compare-med
 {%   endif %}
 {%   if parameters.bestpath is defined and parameters.bestpath is not none %}
-{%     if parameters.bestpath.compare_routerid is defined %}
- bgp bestpath compare-routerid
-{%     endif %}
 {%     if parameters.bestpath.as_path is defined and parameters.bestpath.as_path is not none %}
 {%       for option in parameters.bestpath.as_path %}
 {# replace is required for multipath-relax option #}
  bgp bestpath as-path {{ option|replace('_', '-') }}
 {%       endfor %}
 {%     endif %}
+{%     if parameters.bestpath.bandwidth is defined and parameters.bestpath.bandwidth is not none %}
+ bgp bestpath bandwidth {{ parameters.bestpath.bandwidth }}
+{%     endif %}
+{%     if parameters.bestpath.compare_routerid is defined %}
+ bgp bestpath compare-routerid
+{%     endif %}
 {%     if parameters.bestpath.med is defined and parameters.bestpath.med is not none %}
  bgp bestpath med {{ 'confed' if parameters.bestpath.med.confed is defined }} {{ 'missing-as-worst' if parameters.bestpath.med.missing_as_worst is defined }}
 {%     endif %}
diff --git a/interface-definitions/include/bgp/protocol-common-config.xml.i b/interface-definitions/include/bgp/protocol-common-config.xml.i
index 78a4fb763..37fc7259f 100644
--- a/interface-definitions/include/bgp/protocol-common-config.xml.i
+++ b/interface-definitions/include/bgp/protocol-common-config.xml.i
@@ -1114,6 +1114,29 @@
             </leafNode>
           </children>
         </node>
+        <leafNode name="bandwidth">
+          <properties>
+            <help>Link Bandwidth attribute</help>
+            <completionHelp>
+              <list>default-weight-for-missing ignore skip-missing</list>
+            </completionHelp>
+            <valueHelp>
+              <format>default-weight-for-missing</format>
+              <description>Assign low default weight (1) to paths not having link bandwidth</description>
+            </valueHelp>
+            <valueHelp>
+              <format>ignore</format>
+              <description>Ignore link bandwidth (do regular ECMP, not weighted)</description>
+            </valueHelp>
+            <valueHelp>
+              <format>skip-missing</format>
+              <description>Ignore paths without link bandwidth for ECMP (if other paths have it)</description>
+            </valueHelp>
+            <constraint>
+              <regex>^(default-weight-for-missing|ignore|skip-missing)$</regex>
+            </constraint>
+          </properties>
+        </leafNode>
         <leafNode name="compare-routerid">
           <properties>
             <help>Compare the router-id for identical EBGP paths</help>
diff --git a/smoketest/scripts/cli/test_protocols_bgp.py b/smoketest/scripts/cli/test_protocols_bgp.py
index 10adc06e1..c51d83875 100755
--- a/smoketest/scripts/cli/test_protocols_bgp.py
+++ b/smoketest/scripts/cli/test_protocols_bgp.py
@@ -224,6 +224,10 @@ class TestProtocolsBGP(VyOSUnitTestSHIM.TestCase):
         self.cli_set(base_path + ['parameters', 'graceful-shutdown'])
         self.cli_set(base_path + ['parameters', 'ebgp-requires-policy'])
 
+        self.cli_set(base_path + ['parameters', 'bestpath', 'as-path', 'multipath-relax'])
+        self.cli_set(base_path + ['parameters', 'bestpath', 'bandwidth', 'default-weight-for-missing'])
+        self.cli_set(base_path + ['parameters', 'bestpath', 'compare-routerid'])
+
         # AFI maximum path support
         self.cli_set(base_path + ['address-family', 'ipv4-unicast', 'maximum-paths', 'ebgp', max_path_v4])
         self.cli_set(base_path + ['address-family', 'ipv4-unicast', 'maximum-paths', 'ibgp', max_path_v4ibgp])
@@ -242,6 +246,9 @@ class TestProtocolsBGP(VyOSUnitTestSHIM.TestCase):
         self.assertIn(f' no bgp default ipv4-unicast', frrconfig)
         self.assertIn(f' bgp graceful-restart stalepath-time {stalepath_time}', frrconfig)
         self.assertIn(f' bgp graceful-shutdown', frrconfig)
+        self.assertIn(f' bgp bestpath as-path multipath-relax', frrconfig)
+        self.assertIn(f' bgp bestpath bandwidth default-weight-for-missing', frrconfig)
+        self.assertIn(f' bgp bestpath compare-routerid', frrconfig)
         self.assertNotIn(f'bgp ebgp-requires-policy', frrconfig)
 
         afiv4_config = self.getFRRconfig(' address-family ipv4 unicast')