Updated swss with latest from master

Author: vmittal-msft

orchagent/bufferorch.cpp

@@ -859,7 +859,8 @@ task_process_status BufferOrch::processQueue(KeyOpFieldsValuesTuple &tuple)
             SWSS_LOG_DEBUG("processing queue:%zd", ind);
             if (gMySwitchType == "voq") 
             {
-                if (port.m_system_port_info.m_voq_ids.size() <= ind)
+                std :: vector<sai_object_id_t> queue_ids = gPortOrch->getPortVoQIds(port);
+                if (queue_ids.size() <= ind)
                 {
                     SWSS_LOG_ERROR("Invalid voq index specified:%zd", ind);
                     return task_process_status::task_invalid_entry;
@@ -868,7 +869,8 @@ task_process_status BufferOrch::processQueue(KeyOpFieldsValuesTuple &tuple)
                 if (need_update_sai)
                 {
                     sai_object_id_t queue_id;
-                    queue_id = port.m_system_port_info.m_voq_ids[ind];
+                    queue_id = queue_ids[ind];
+
                     SWSS_LOG_DEBUG("Applying buffer profile:0x%" PRIx64 " to queue index:%zd, queue sai_id:0x%" PRIx64, sai_buffer_profile, ind, queue_id);
                     sai_status_t sai_status = sai_queue_api->set_queue_attribute(queue_id, &attr);
                     if (sai_status != SAI_STATUS_SUCCESS)

orchagent/portsorch.cpp

@@ -7709,6 +7709,13 @@ bool PortsOrch::isMACsecPort(sai_object_id_t port_id) const
     return m_macsecEnabledPorts.find(port_id) != m_macsecEnabledPorts.end();
 }
 
+vector<sai_object_id_t> PortsOrch::getPortVoQIds(const Port& port)
+{
+    SWSS_LOG_ENTER();
+
+    return m_port_voq_ids[port.m_alias];
+}
+
 /* Refresh the per-port Auto-Negotiation operational states */
 void PortsOrch::refreshPortStateAutoNeg(const Port &port)
 {

orchagent/portsorch.h

@@ -179,6 +179,7 @@ class PortsOrch : public Orch, public Subject
 
     void setMACsecEnabledState(sai_object_id_t port_id, bool enabled);
     bool isMACsecPort(sai_object_id_t port_id) const;
+    vector<sai_object_id_t> getPortVoQIds(const Port& port);
 
 private:
     unique_ptr<Table> m_counterTable;