From 825c0cbd2989f870f7ccecdfcf2ff1c85843ada2 Mon Sep 17 00:00:00 2001 From: Volodymyr Samotiy Date: Sat, 15 Jun 2019 05:32:50 +0300 Subject: [PATCH] [vs]: Fix bitmap VNET virtual switch test (#936) Signed-off-by: Volodymyr Samotiy --- tests/test_vnet.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/tests/test_vnet.py b/tests/test_vnet.py index ddfd89d08604..e47180a37aef 100644 --- a/tests/test_vnet.py +++ b/tests/test_vnet.py @@ -922,7 +922,6 @@ def get_vnet_obj(self): ''' Test 1 - Create Vlan Interface, Tunnel and Vnet ''' - @pytest.mark.skip(reason="Failing. Under investigation") def test_vnet_orch_1(self, dvs, testlog): vnet_obj = self.get_vnet_obj() @@ -944,6 +943,7 @@ def test_vnet_orch_1(self, dvs, testlog): vid = create_vlan_interface(dvs, "Vlan101", "Ethernet28", "Vnet_2000", "100.100.4.1/24") vnet_obj.check_router_interface(dvs, 'Vnet_2000', vid) + vnet_obj.fetch_exist_entries(dvs) create_vnet_routes(dvs, "100.100.1.1/32", 'Vnet_2000', '10.10.10.1') vnet_obj.check_vnet_routes(dvs, 'Vnet_2000', '10.10.10.1', tunnel_name) @@ -963,6 +963,7 @@ def test_vnet_orch_1(self, dvs, testlog): create_phy_interface(dvs, "Ethernet4", "Vnet_2001", "100.102.1.1/24") vnet_obj.check_router_interface(dvs, 'Vnet_2001') + vnet_obj.fetch_exist_entries(dvs) create_vnet_routes(dvs, "100.100.2.1/32", 'Vnet_2001', '10.10.10.2', "00:12:34:56:78:9A") vnet_obj.check_vnet_routes(dvs, 'Vnet_2001', '10.10.10.2', tunnel_name, "00:12:34:56:78:9A") @@ -1004,7 +1005,6 @@ def test_vnet_orch_1(self, dvs, testlog): ''' Test 2 - Two VNets, One HSMs per VNet ''' - @pytest.mark.skip(reason="Failing. Under investigation") def test_vnet_orch_2(self, dvs, testlog): vnet_obj = self.get_vnet_obj() @@ -1023,15 +1023,19 @@ def test_vnet_orch_2(self, dvs, testlog): vid = create_vlan_interface(dvs, "Vlan1001", "Ethernet0", "Vnet_1", "1.1.10.1/24") vnet_obj.check_router_interface(dvs, 'Vnet_1', vid) + vnet_obj.fetch_exist_entries(dvs) create_vnet_routes(dvs, "1.1.1.10/32", 'Vnet_1', '100.1.1.10') vnet_obj.check_vnet_routes(dvs, 'Vnet_1', '100.1.1.10', tunnel_name) + vnet_obj.fetch_exist_entries(dvs) create_vnet_routes(dvs, "1.1.1.11/32", 'Vnet_1', '100.1.1.10') vnet_obj.check_vnet_routes(dvs, 'Vnet_1', '100.1.1.10', tunnel_name) + vnet_obj.fetch_exist_entries(dvs) create_vnet_routes(dvs, "1.1.1.12/32", 'Vnet_1', '200.200.1.200') vnet_obj.check_vnet_routes(dvs, 'Vnet_1', '200.200.1.200', tunnel_name) + vnet_obj.fetch_exist_entries(dvs) create_vnet_routes(dvs, "1.1.1.14/32", 'Vnet_1', '200.200.1.201') vnet_obj.check_vnet_routes(dvs, 'Vnet_1', '200.200.1.201', tunnel_name) @@ -1046,9 +1050,11 @@ def test_vnet_orch_2(self, dvs, testlog): vid = create_vlan_interface(dvs, "Vlan1002", "Ethernet4", "Vnet_2", "2.2.10.1/24") vnet_obj.check_router_interface(dvs, 'Vnet_2', vid) + vnet_obj.fetch_exist_entries(dvs) create_vnet_routes(dvs, "2.2.2.10/32", 'Vnet_2', '100.1.1.20') vnet_obj.check_vnet_routes(dvs, 'Vnet_2', '100.1.1.20', tunnel_name) + vnet_obj.fetch_exist_entries(dvs) create_vnet_routes(dvs, "2.2.2.11/32", 'Vnet_2', '100.1.1.20') vnet_obj.check_vnet_routes(dvs, 'Vnet_2', '100.1.1.20', tunnel_name) @@ -1096,7 +1102,6 @@ def test_vnet_orch_2(self, dvs, testlog): ''' Test 3 - Two VNets, One HSMs per VNet, Peering ''' - @pytest.mark.skip(reason="Failing. Under investigation") def test_vnet_orch_3(self, dvs, testlog): vnet_obj = self.get_vnet_obj() @@ -1124,9 +1129,11 @@ def test_vnet_orch_3(self, dvs, testlog): vid = create_vlan_interface(dvs, "Vlan2002", "Ethernet12", "Vnet_20", "8.8.10.1/24") vnet_obj.check_router_interface(dvs, 'Vnet_20', vid) + vnet_obj.fetch_exist_entries(dvs) create_vnet_routes(dvs, "5.5.5.10/32", 'Vnet_10', '50.1.1.10') vnet_obj.check_vnet_routes(dvs, 'Vnet_10', '50.1.1.10', tunnel_name) + vnet_obj.fetch_exist_entries(dvs) create_vnet_routes(dvs, "8.8.8.10/32", 'Vnet_20', '80.1.1.20') vnet_obj.check_vnet_routes(dvs, 'Vnet_10', '80.1.1.20', tunnel_name)