From 015fc62a2b686d0a1526b92f34eb2412a15099e7 Mon Sep 17 00:00:00 2001 From: Prince Sunny Date: Wed, 8 May 2019 14:01:33 -0700 Subject: [PATCH] Undo skipping Vnet tests, Vrf check before enslaving (#857) * Undo skipping Vnet tests, VxlanMgrd merged to master * Check VRF name before setting as master --- cfgmgr/intfmgr.cpp | 5 ++++- tests/test_vnet.py | 6 ------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/cfgmgr/intfmgr.cpp b/cfgmgr/intfmgr.cpp index 8993c7684eae..cd509b3bbd74 100644 --- a/cfgmgr/intfmgr.cpp +++ b/cfgmgr/intfmgr.cpp @@ -144,7 +144,10 @@ bool IntfMgr::doIntfGeneralTask(const vector& keys, // Set Interface VRF except for lo if (!is_lo) { - setIntfVrf(alias, vrf_name); + if (!vrf_name.empty()) + { + setIntfVrf(alias, vrf_name); + } m_appIntfTableProducer.set(alias, data); } else diff --git a/tests/test_vnet.py b/tests/test_vnet.py index 1c9aac342c3b..5ca4f167b1e6 100644 --- a/tests/test_vnet.py +++ b/tests/test_vnet.py @@ -799,8 +799,6 @@ def get_vnet_obj(self): ''' Test 1 - Create Vlan Interface, Tunnel and Vnet ''' - # TODO: Please fix this test case. - @pytest.mark.skip(reason="Starting Vxlanmgr to be merged") def test_vnet_orch_1(self, dvs, testlog): vnet_obj = self.get_vnet_obj() @@ -850,8 +848,6 @@ def test_vnet_orch_1(self, dvs, testlog): ''' Test 2 - Two VNets, One HSMs per VNet ''' - # TODO: Please fix this test case. - @pytest.mark.skip(reason="Starting Vxlanmgr to be merged") def test_vnet_orch_2(self, dvs, testlog): vnet_obj = self.get_vnet_obj() @@ -905,8 +901,6 @@ def test_vnet_orch_2(self, dvs, testlog): ''' Test 3 - Two VNets, One HSMs per VNet, Peering ''' - # TODO: Please fix this test case. - @pytest.mark.skip(reason="Starting Vxlanmgr to be merged") def test_vnet_orch_3(self, dvs, testlog): vnet_obj = self.get_vnet_obj()