From 9c20c00a9a3e3370ec44580a487226a3da2b9154 Mon Sep 17 00:00:00 2001
From: Shi Su <ssu@microsoft.com>
Date: Wed, 23 Jun 2021 03:12:25 +0000
Subject: [PATCH] undo changes for mock tests

---
 orchagent/bufferorch.cpp  |  8 ++------
 orchagent/orch.cpp        |  4 ----
 orchagent/portsorch.cpp   | 12 ++----------
 tests/mock_tests/portal.h |  2 --
 4 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/orchagent/bufferorch.cpp b/orchagent/bufferorch.cpp
index 14203d8a47c..5979445731d 100644
--- a/orchagent/bufferorch.cpp
+++ b/orchagent/bufferorch.cpp
@@ -117,12 +117,8 @@ void BufferOrch::initBufferConstants()
     if (status != SAI_STATUS_SUCCESS)
     {
         SWSS_LOG_ERROR("Failed to get Maximum memory size, rv:%d", status);
-        task_process_status handle_status = handleSaiGetStatus(SAI_API_SWITCH, status);
-        if (handle_status != task_process_status::task_success)
-        {
-            // This is not a mandatory attribute so in case of failure we just return
-            return;
-        }
+        // This is not a mandatory attribute so in case of failure we just return
+        return;
     }
 
     vector<FieldValueTuple> fvVector;
diff --git a/orchagent/orch.cpp b/orchagent/orch.cpp
index 475a259ed09..e5cc0b02b38 100644
--- a/orchagent/orch.cpp
+++ b/orchagent/orch.cpp
@@ -786,11 +786,7 @@ task_process_status Orch::handleSaiGetStatus(sai_api_t api, sai_status_t status,
         case SAI_STATUS_NOT_IMPLEMENTED:
             SWSS_LOG_ERROR("Encountered failure in get operation due to the function is not implemented, exiting orchagent, SAI API: %s",
                         sai_serialize_api(api).c_str());
-#ifdef MOCK_TEST
             exit(EXIT_FAILURE);
-#else
-            break;
-#endif
         default:
             SWSS_LOG_ERROR("Encountered failure in get operation, SAI API: %s, status: %s",
                         sai_serialize_api(api).c_str(), sai_serialize_status(status).c_str());
diff --git a/orchagent/portsorch.cpp b/orchagent/portsorch.cpp
index 0bb0ec0a618..89954340359 100755
--- a/orchagent/portsorch.cpp
+++ b/orchagent/portsorch.cpp
@@ -3994,11 +3994,7 @@ void PortsOrch::initializePortMaximumHeadroom(Port &port)
     if (status != SAI_STATUS_SUCCESS)
     {
         SWSS_LOG_NOTICE("Unable to get the maximum headroom for port %s rv:%d, ignored", port.m_alias.c_str(), status);
-        task_process_status handle_status = handleSaiGetStatus(SAI_API_PORT, status);
-        if (handle_status != task_process_status::task_success)
-        {
-            return;
-        }
+        return;
     }
 
     vector<FieldValueTuple> fvVector;
@@ -5918,11 +5914,7 @@ bool PortsOrch::getSystemPorts()
     if (status != SAI_STATUS_SUCCESS)
     {
         SWSS_LOG_INFO("Failed to get number of system ports, rv:%d", status);
-        task_process_status handle_status = handleSaiGetStatus(SAI_API_SWITCH, status);
-        if (handle_status != task_process_status::task_success)
-        {
-            return parseHandleSaiStatusFailure(handle_status);
-        }
+        return false;
     }
 
     m_systemPortCount = attr.value.u32;
diff --git a/tests/mock_tests/portal.h b/tests/mock_tests/portal.h
index 596d1efef20..7dab40036ba 100644
--- a/tests/mock_tests/portal.h
+++ b/tests/mock_tests/portal.h
@@ -2,14 +2,12 @@
 
 #define private public
 #define protected public
-#define MOCK_TEST
 
 #include "aclorch.h"
 #include "crmorch.h"
 
 #undef protected
 #undef private
-#undef MOCK_TEST
 
 struct Portal
 {