Merge pull request #4945 from natali-rs1985/T8143

pppoe-server: T8143: Set 'vpp-cp' option automatically if interface is in VPP

2 files changed, 3 insertions, 16 deletions

diff --git a/smoketest/scripts/cli/test_service_pppoe-server.py b/smoketest/scripts/cli/test_service_pppoe-server.py
index 5e1cbdd88..1a06e050f 100755
--- a/smoketest/scripts/cli/test_service_pppoe-server.py
+++ b/smoketest/scripts/cli/test_service_pppoe-server.py
@@ -213,19 +213,6 @@ class TestServicePPPoEServer(BasicAccelPPPTest.TestCase):
         self.assertIn('accept-any-service=1', config)
         self.assertIn('accept-blank-service=1', config)
 
-    def test_accel_vpp_cp(self):
-        self.basic_config()
-        self.cli_commit()
-
-        self.set(['interface', interface, 'vpp-cp'])
-
-        # vpp-cp require VPP service to be started and interface is configured in VPP
-        with self.assertRaises(ConfigSessionError):
-            self.cli_commit()
-
-        # All other checks for PPPoE control-plane integration
-        # with VPP are verified in test_vpp.py
-
 
 if __name__ == '__main__':
     unittest.main(verbosity=2, failfast=VyOSUnitTestSHIM.TestCase.debug_on())
diff --git a/smoketest/scripts/cli/test_vpp.py b/smoketest/scripts/cli/test_vpp.py
index 16295a932..9723a79cd 100755
--- a/smoketest/scripts/cli/test_vpp.py
+++ b/smoketest/scripts/cli/test_vpp.py
@@ -1572,9 +1572,8 @@ class TestVPP(VyOSUnitTestSHIM.TestCase):
         self.cli_set(pppoe_base + ['client-ip-pool', pool, 'range', '192.0.2.0/24'])
         self.cli_set(pppoe_base + ['default-pool', pool])
 
-        # Enable PPPoE control-plane integration with VPP
-        self.cli_set(pppoe_base + ['interface', interface, 'vpp-cp'])
-        self.cli_set(pppoe_base + ['interface', f'{interface}.{vni}', 'vpp-cp'])
+        self.cli_set(pppoe_base + ['interface', interface])
+        self.cli_set(pppoe_base + ['interface', f'{interface}.{vni}'])
 
         self.cli_commit()
 
@@ -1582,6 +1581,7 @@ class TestVPP(VyOSUnitTestSHIM.TestCase):
         config = read_file(config_file)
 
         # Validate configuration
+        # PPPoE on VPP-managed interfaces automatically get control-plane integration
         self.assertIn(f'interface={interface},vpp-cp=true', config)
         self.assertIn(f'interface={interface}.{vni},vpp-cp=true', config)