From 82182d09c73be2f6f53cd87824cc3c34a342a372 Mon Sep 17 00:00:00 2001 From: Alexander Couzens Date: Tue, 22 Sep 2020 13:21:46 +0200 Subject: Port gbproxy to NS2 Since NS2 has a different abstraction we mock up the prim send/recv functions and don't test NS like the old tests did. Related: SYS#4998 Change-Id: Iecfd0408a35a11638d254c1db3c1d477b1a11524 --- tests/vty_test_runner.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'tests/vty_test_runner.py') diff --git a/tests/vty_test_runner.py b/tests/vty_test_runner.py index ed52d5f9b..beb0ee126 100755 --- a/tests/vty_test_runner.py +++ b/tests/vty_test_runner.py @@ -95,7 +95,7 @@ class TestVTYGbproxy(TestVTYBase): def testVtyShow(self): res = self.vty.command("show ns") - self.assertTrue(res.find('Encapsulation NS-UDP-IP') >= 0) + self.assertTrue(res.find('UDP bind') >= 0) res = self.vty.command("show gbproxy stats") self.assertTrue(res.find('GBProxy Global Statistics') >= 0) @@ -105,16 +105,14 @@ class TestVTYGbproxy(TestVTYBase): self.assertTrue(self.vty.verify('delete-gbproxy-peer 9999 bvci 7777', ['BVC not found'])) res = self.vty.command("delete-gbproxy-peer 9999 all dry-run") self.assertTrue(res.find('Not Deleted 0 BVC') >= 0) - self.assertTrue(res.find('Not Deleted 0 NS-VC') >= 0) + self.assertTrue(res.find('NSEI not found') >= 0) res = self.vty.command("delete-gbproxy-peer 9999 only-bvc dry-run") self.assertTrue(res.find('Not Deleted 0 BVC') >= 0) - self.assertTrue(res.find('Not Deleted 0 NS-VC') < 0) res = self.vty.command("delete-gbproxy-peer 9999 only-nsvc dry-run") - self.assertTrue(res.find('Not Deleted 0 BVC') < 0) - self.assertTrue(res.find('Not Deleted 0 NS-VC') >= 0) + self.assertTrue(res.find('NSEI not found') >= 0) res = self.vty.command("delete-gbproxy-peer 9999 all") self.assertTrue(res.find('Deleted 0 BVC') >= 0) - self.assertTrue(res.find('Deleted 0 NS-VC') >= 0) + self.assertTrue(res.find('NSEI not found') >= 0) class TestVTYSGSN(TestVTYBase): -- cgit v1.2.3