[intfsorch, neighorch]Fix to get system port alias from port

Author: vedganes

orchagent/intfsorch.cpp

@@ -1328,8 +1328,13 @@ bool IntfsOrch::voqSyncAddIntf(string &alias, sai_object_id_t &rif_id)
         {
             return true;
         }
+	alias = port.m_system_port_info.alias;
+    }
+    else
+    {
+        SWSS_LOG_ERROR("Port does not exist for %s!", alias.c_str());
+        return false;
     }
-    alias = port.m_system_port_info.alias;
 
     //Get router interface to make sure it exists
     sai_attribute_t attr;
@@ -1372,8 +1377,13 @@ bool IntfsOrch::voqSyncDelIntf(string &alias)
         {
             return true;
         }
+	alias = port.m_system_port_info.alias;
+    }
+    else
+    {
+        SWSS_LOG_ERROR("Port does not exist for %s!", alias.c_str());
+        return false;
     }
-    alias = port.m_system_port_info.alias;
 
     m_tableVoqSystemInterfaceTable.del(alias);
 

orchagent/neighorch.cpp

@@ -1000,8 +1000,13 @@ bool NeighOrch::voqSyncAddNeigh(string &alias, IpAddress &ip_address, const MacA
         {
             return true;
         }
+	alias = port.m_system_port_info.alias;
+    }
+    else
+    {
+        SWSS_LOG_ERROR("Port does not exist for %s!", alias.c_str());
+        return false;
     }
-    alias = port.m_system_port_info.alias;
 
     attr.id = SAI_NEIGHBOR_ENTRY_ATTR_ENCAP_INDEX;
 
@@ -1037,8 +1042,13 @@ bool NeighOrch::voqSyncDelNeigh(string &alias, IpAddress &ip_address)
         {
             return true;
         }
+	alias = port.m_system_port_info.alias;
+    }
+    else
+    {
+        SWSS_LOG_ERROR("Port does not exist for %s!", alias.c_str());
+        return false;
     }
-    alias = port.m_system_port_info.alias;
 
     string key = alias + ":" + ip_address.to_string();
     m_tableVoqSystemNeighTable.del(key);