Merge pull request #11334 from ton31337/fix/deprecation_warning

ospfd: Remove local-block deprecated command

8 files changed, 2 insertions, 9 deletions

diff --git a/tests/topotests/ospf_sr_te_topo1/rt1/ospfd.conf b/tests/topotests/ospf_sr_te_topo1/rt1/ospfd.conf
index a440fa6fd..064a4bf28 100644
--- a/tests/topotests/ospf_sr_te_topo1/rt1/ospfd.conf
+++ b/tests/topotests/ospf_sr_te_topo1/rt1/ospfd.conf
@@ -30,7 +30,6 @@ router ospf
  passive-interface lo
  segment-routing on
  segment-routing global-block 16000 23999
- !segment-routing local-block 15000 15999
  segment-routing node-msd 8
  segment-routing prefix 1.1.1.1/32 index 10
 !
diff --git a/tests/topotests/ospf_sr_te_topo1/rt2/ospfd.conf b/tests/topotests/ospf_sr_te_topo1/rt2/ospfd.conf
index 7bec98cd7..65b20f0e6 100644
--- a/tests/topotests/ospf_sr_te_topo1/rt2/ospfd.conf
+++ b/tests/topotests/ospf_sr_te_topo1/rt2/ospfd.conf
@@ -41,7 +41,6 @@ router ospf
  passive-interface lo
  segment-routing on
  segment-routing global-block 16000 23999
- !segment-routing local-block 15000 15999
  segment-routing node-msd 8
  segment-routing prefix 2.2.2.2/32 index 20
 !
diff --git a/tests/topotests/ospf_sr_te_topo1/rt3/ospfd.conf b/tests/topotests/ospf_sr_te_topo1/rt3/ospfd.conf
index 40b85c460..5be0c49a8 100644
--- a/tests/topotests/ospf_sr_te_topo1/rt3/ospfd.conf
+++ b/tests/topotests/ospf_sr_te_topo1/rt3/ospfd.conf
@@ -40,7 +40,6 @@ router ospf
  router-info area 0.0.0.0
  segment-routing on
  segment-routing global-block 16000 23999
- !segment-routing local-block 15000 15999
  segment-routing node-msd 8
  segment-routing prefix 3.3.3.3/32 index 30
 !
diff --git a/tests/topotests/ospf_sr_te_topo1/rt4/ospfd.conf b/tests/topotests/ospf_sr_te_topo1/rt4/ospfd.conf
index 4d3380d10..7cdf032ea 100644
--- a/tests/topotests/ospf_sr_te_topo1/rt4/ospfd.conf
+++ b/tests/topotests/ospf_sr_te_topo1/rt4/ospfd.conf
@@ -47,7 +47,6 @@ router ospf
  passive-interface lo
  segment-routing on
  segment-routing global-block 16000 23999
- !segment-routing local-block 15000 15999
  segment-routing node-msd 8
  segment-routing prefix 4.4.4.4/32 index 40
 !
diff --git a/tests/topotests/ospf_sr_te_topo1/rt5/ospfd.conf b/tests/topotests/ospf_sr_te_topo1/rt5/ospfd.conf
index b111ce588..8f71cda44 100644
--- a/tests/topotests/ospf_sr_te_topo1/rt5/ospfd.conf
+++ b/tests/topotests/ospf_sr_te_topo1/rt5/ospfd.conf
@@ -47,7 +47,6 @@ router ospf
  passive-interface lo
  segment-routing on
  segment-routing global-block 16000 23999
-! segment-routing local-block 15000 15999
  segment-routing node-msd 8
  segment-routing prefix 5.5.5.5/32 index 50
 !
diff --git a/tests/topotests/ospf_sr_te_topo1/rt6/ospfd.conf b/tests/topotests/ospf_sr_te_topo1/rt6/ospfd.conf
index f0c5a9c0b..20c89757a 100644
--- a/tests/topotests/ospf_sr_te_topo1/rt6/ospfd.conf
+++ b/tests/topotests/ospf_sr_te_topo1/rt6/ospfd.conf
@@ -35,7 +35,6 @@ router ospf
  passive-interface lo
  segment-routing on
  segment-routing global-block 16000 23999
-! segment-routing local-block 15000 15999
  segment-routing node-msd 8
  segment-routing prefix 6.6.6.6/32 index 60
 !
diff --git a/tests/topotests/ospf_te_topo1/r4/ospfd.conf b/tests/topotests/ospf_te_topo1/r4/ospfd.conf
index e45467315..cd508017d 100644
--- a/tests/topotests/ospf_te_topo1/r4/ospfd.conf
+++ b/tests/topotests/ospf_te_topo1/r4/ospfd.conf
@@ -15,8 +15,7 @@ router ospf
   mpls-te on
   mpls-te router-address 10.0.255.4
   segment-routing on
-  segment-routing local-block 5000 5999
-  segment-routing global-block 10000 19999
+  segment-routing global-block 10000 19999 local-block 5000 5999
   segment-routing node-msd 12
   segment-routing prefix 10.0.255.4/32 index 400 no-php-flag
 !
diff --git a/tests/topotests/ospf_te_topo1/test_ospf_te_topo1.py b/tests/topotests/ospf_te_topo1/test_ospf_te_topo1.py
index 7de23dc34..699cdc905 100644
--- a/tests/topotests/ospf_te_topo1/test_ospf_te_topo1.py
+++ b/tests/topotests/ospf_te_topo1/test_ospf_te_topo1.py
@@ -224,7 +224,7 @@ def test_step4():
         'vtysh -c "conf t" -c "router ospf" -c "segment-routing node-msd 16"'
     )
     tgen.net["r2"].cmd(
-        'vtysh -c "conf t" -c "router ospf" -c "segment-routing local-block 5000 6999"'
+        'vtysh -c "conf t" -c "router ospf" -c "segment-routing global-block 16000 23999 local-block 5000 6999"'
     )
     tgen.net["r2"].cmd(
         'vtysh -c "conf t" -c "router ospf" -c "segment-routing prefix 10.0.255.2/32 index 20 explicit-null"'