Set preference for forced mgmt routes (#5844)

When forced mgmt routes are present, the issue fixed as part of #5754 is not complete. Added a preference(priority) field to forced mgmt route ip rules
sonic-net · Nov 21, 2020 · 1c2c30f · 1c2c30f
1 parent fd73c84
commit 1c2c30f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/files/image_config/interfaces/interfaces.j2 b/files/image_config/interfaces/interfaces.j2
@@ -79,7 +79,7 @@ iface eth0 {{ 'inet' if prefix | ipv4 else 'inet6' }} static
     up cgset -r l3mdev.master-device=mgmt mgmt
 {% endif %}
 {% for route in MGMT_INTERFACE[(name, prefix)]['forced_mgmt_routes'] %}
-    up ip rule add to {{ route }} table {{ vrf_table }}
+    up ip rule add pref 32764 to {{ route }} table {{ vrf_table }}
 {% endfor %}
     # management port down rules
     pre-down ip {{ '-4' if prefix | ipv4 else '-6' }} route delete default via {{ MGMT_INTERFACE[(name, prefix)]['gwaddr'] }} dev eth0 table {{ vrf_table }}
@@ -89,7 +89,7 @@ iface eth0 {{ 'inet' if prefix | ipv4 else 'inet6' }} static
     down cgdelete -g l3mdev:mgmt
 {% endif %}
 {% for route in MGMT_INTERFACE[(name, prefix)]['forced_mgmt_routes'] %}
-    pre-down ip rule delete to {{ route }} table {{ vrf_table }}
+    pre-down ip rule delete pref 32764 to {{ route }} table {{ vrf_table }}
 {% endfor %}
 {# TODO: COPP policy type rules #}
 {% endfor %}

diff --git a/src/sonic-config-engine/tests/sample_output/mvrf_interfaces b/src/sonic-config-engine/tests/sample_output/mvrf_interfaces
@@ -29,11 +29,15 @@ iface eth0 inet static
     up ip -4 rule add pref 32765 from 10.0.0.100/32 table 5000
     up cgcreate -g l3mdev:mgmt
     up cgset -r l3mdev.master-device=mgmt mgmt
+    up ip rule add pref 32764 to 11.11.11.11 table 5000
+    up ip rule add pref 32764 to 22.22.22.0/23 table 5000
     # management port down rules
     pre-down ip -4 route delete default via 10.0.0.1 dev eth0 table 5000
     pre-down ip -4 route delete 10.0.0.0/24 dev eth0 table 5000
     pre-down ip -4 rule delete pref 32765 from 10.0.0.100/32 table 5000
     down cgdelete -g l3mdev:mgmt
+    pre-down ip rule delete pref 32764 to 11.11.11.11 table 5000
+    pre-down ip rule delete pref 32764 to 22.22.22.0/23 table 5000
 iface eth0 inet6 static
     address 2603:10e2:0:2902::8
     netmask 64

diff --git a/src/sonic-config-engine/tests/t0-sample-graph-mvrf.xml b/src/sonic-config-engine/tests/t0-sample-graph-mvrf.xml
@@ -393,6 +393,11 @@
       <a:DeviceMetadata>
         <a:Name>switch-t0</a:Name>
         <a:Properties>
+          <a:DeviceProperty>
+            <a:Name>ForcedMgmtRoutes</a:Name>
+            <a:Reference i:nil="true"/>
+            <a:Value>11.11.11.11;22.22.22.0/23</a:Value>
+          </a:DeviceProperty>
           <a:DeviceProperty>
             <a:Name>ErspanDestinationIpv4</a:Name>
             <a:Reference i:nil="true"/>