Update Unit tests for code coverage

Author: saksarav-nokia

orchagent/portsorch.cpp

@@ -5153,21 +5153,21 @@ void PortsOrch::doPortTask(Consumer &consumer)
                             it++;
                             continue;
                         }
-                        if (pCfg.media_type.is_set)
-                        {
-                            if (setPortMediaType(p, pCfg.media_type.value))
-                            {
-                                SWSS_LOG_NOTICE("Set port %s Media Type %s is successful",
-                                                 p.m_alias.c_str(), pCfg.media_type.value.c_str());
-                            }
-                            else
-                            {
-                                SWSS_LOG_ERROR("Failed to set port %s Media Type %s",
-                                                p.m_alias.c_str(), pCfg.media_type.value.c_str());
-                                it++;
-                                continue;
-                            }
-                        }
+                    }
+                }
+                if (pCfg.media_type.is_set)
+                {
+                    if (setPortMediaType(p, pCfg.media_type.value))
+                    {
+                        SWSS_LOG_NOTICE("Set port %s Media Type %s is successful",
+                                         p.m_alias.c_str(), pCfg.media_type.value.c_str());
+                    }
+                    else
+                    {
+                        SWSS_LOG_ERROR("Failed to set port %s Media Type %s",
+                                        p.m_alias.c_str(), pCfg.media_type.value.c_str());
+                        it++;
+                        continue;
                     }
                 }
 

tests/mock_tests/portsorch_ut.cpp

@@ -1208,6 +1208,8 @@ namespace portsorch_test
                 { "media_type",    "backplane"                   }
             }
         }};
+        std::deque<KeyOpFieldsValuesTuple> kfvList1 = {{"Ethernet0", SET_COMMAND, {{ "media_type",    "" }}}};
+        std::deque<KeyOpFieldsValuesTuple> kfvList2 = {"Ethernet0", SET_COMMAND, {{ "media_type",    "none" }}};
 
         // Refill consumer
         auto consumer = dynamic_cast<Consumer*>(gPortsOrch->getExecutor(APP_PORT_TABLE_NAME));
@@ -1295,6 +1297,19 @@ namespace portsorch_test
         // Verify unreliablelos
         ASSERT_EQ(p.m_unreliable_los, false);
 
+        //empty media_type should not be processed
+        consumer->addToSync(kfvList1);
+        static_cast<Orch*>(gPortsOrch)->doTask();
+        Port p1;
+        ASSERT_TRUE(gPortsOrch->getPort("Ethernet0", p1));
+        ASSERT_EQ(p1.m_media_type, media_type); // it should be still backplane
+
+        consumer->addToSync(kfvList2);
+        static_cast<Orch*>(gPortsOrch)->doTask();
+        Port p2;
+        ASSERT_TRUE(gPortsOrch->getPort("Ethernet0", p2));
+        ASSERT_EQ(p2.m_media_type, media_type); // it should be still backplane
+
         // Dump pending tasks
         std::vector<std::string> taskList;
         gPortsOrch->dumpPendingTasks(taskList);

tests/test_port.py

@@ -538,15 +538,45 @@ def test_PortAdminRestore(self, dvs, testlog):
 
     def test_media_type(self, dvs, testlog):
 
-        media_name = 'media_type'
-        media_val = "backplane"
-        fvs = swsscommon.FieldValuePairs([(media_name, media_val)])
         db = swsscommon.DBConnector(0, dvs.redis_sock, 0)
         adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
 
+        tbl = swsscommon.Table(db, "PORT_TABLE")
         ptbl = swsscommon.ProducerStateTable(db, "PORT_TABLE")
         atbl = swsscommon.Table(adb, "ASIC_STATE:SAI_OBJECT_TYPE_PORT")
 
+        media_name = 'media_type'
+        media_val = ""
+
+        fvs = swsscommon.FieldValuePairs([(media_name, media_val)])
+        ptbl.set("Ethernet0", fvs)
+
+        time.sleep(1)
+
+        # get media_type
+        (status, fvs) = atbl.get(dvs.asicdb.portnamemap["Ethernet0"])
+        assert status == True
+        #empty media_type should be rejected
+        for fv in fvs:
+            assert fv[0] != "SAI_PORT_ATTR_MEDIA_TYPE"
+
+        media_name = 'media_type'
+        media_val = "none"
+        fvs = swsscommon.FieldValuePairs([(media_name, media_val)])
+        ptbl.set("Ethernet0", fvs)
+
+        time.sleep(1)
+
+        # get media_type
+        (status, fvs) = atbl.get(dvs.asicdb.portnamemap["Ethernet0"])
+        assert status == True
+        #"none" media_type should be rejected
+        for fv in fvs:
+            assert fv[0] != "SAI_PORT_ATTR_MEDIA_TYPE"
+
+        media_name = 'media_type'
+        media_val = "backplane"
+        fvs = swsscommon.FieldValuePairs([(media_name, media_val)])
         ptbl.set("Ethernet0", fvs)
 
         time.sleep(1)
@@ -555,9 +585,13 @@ def test_media_type(self, dvs, testlog):
         (status, fvs) = atbl.get(dvs.asicdb.portnamemap["Ethernet0"])
         assert status == True
 
+        found = False
+        #check the media_type is added in ASIC_DB
         for fv in fvs:
             if fv[0] == "SAI_PORT_ATTR_MEDIA_TYPE":
-                assert fv[1] == SAI_PORT_MEDIA_TYPE_BACKPLANE
+                assert fv[1] == "SAI_PORT_MEDIA_TYPE_BACKPLANE"
+                found = True
+        assert found == True
 
 # Add Dummy always-pass test at end as workaroud
 # for issue when Flaky fail on final test it invokes module tear-down before retrying