Undo skipping Vnet tests, Vrf check before enslaving (sonic-net#857)

* Undo skipping Vnet tests, VxlanMgrd merged to master

* Check VRF name before setting as master

Author: prsunny

cfgmgr/intfmgr.cpp

@@ -144,7 +144,10 @@ bool IntfMgr::doIntfGeneralTask(const vector<string>& 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

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()