Merging upstream version 10.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 22 insertions, 3 deletions

diff --git a/tests/topotests/mgmt_config/test_config.py b/tests/topotests/mgmt_config/test_config.py
index b07ed8f..1d73222 100644
--- a/tests/topotests/mgmt_config/test_config.py
+++ b/tests/topotests/mgmt_config/test_config.py
@@ -61,8 +61,7 @@ import pytest
 from lib.common_config import retry, step
 from lib.topogen import Topogen, TopoRouter
 
-# pytestmark = [pytest.mark.staticd, pytest.mark.mgmtd]
-pytestmark = [pytest.mark.staticd]
+pytestmark = [pytest.mark.staticd, pytest.mark.mgmtd]
 
 
 @retry(retry_timeout=1, initial_wait=0.1)
diff --git a/tests/topotests/mgmt_config/test_regression.py b/tests/topotests/mgmt_config/test_regression.py
index 00c3e01..928151a 100644
--- a/tests/topotests/mgmt_config/test_regression.py
+++ b/tests/topotests/mgmt_config/test_regression.py
@@ -12,7 +12,7 @@ Test mgmtd regressions
 import pytest
 from lib.topogen import Topogen
 
-pytestmark = [pytest.mark.staticd]
+pytestmark = [pytest.mark.staticd, pytest.mark.mgmtd]
 
 
 @pytest.fixture(scope="module")
@@ -51,3 +51,23 @@ def test_regression_issue_13920(tgen):
     )
     output = r1.net.checkRouterCores()
     assert not output.strip()
+
+
+def test_regression_pullreq_15423(tgen):
+    r1 = tgen.gears["r1"]
+    r1.vtysh_multicmd(
+        """
+    conf t
+    access-list test seq 1 permit ip any 10.10.10.0 0.0.0.255
+    """
+    )
+
+    output = r1.vtysh_multicmd(
+        """
+    conf terminal file-lock
+    mgmt delete-config /frr-filter:lib/access-list[name='test'][type='ipv4']/entry[sequence='1']/destination-network
+    mgmt commit apply
+    end
+    """
+    )
+    assert "No changes found" not in output