Skip to content

Commit

Permalink
Added saithrift support to return sai_object_id for a given system_po…
Browse files Browse the repository at this point in the history 
…rt_id and read VOQ counters for system port (#1931)

For VOQ Chassis, the following two API's are added

Reads all the system ports in the switch from SAI and returns the sai_object_id of the system port requested by the sonic-mgmt.
Takes the sai_object_id of the system port and returns all the VOQs for that system port.
  • Loading branch information
@saksarav-nokia @rlhui
saksarav-nokia authored and rlhui committed Jan 2, 2024
1 parent a14cbd4 commit 957ccdb
Show file tree
Hide file tree
Showing 3 changed files with 141 additions and 0 deletions.
3 changes: 3 additions & 0 deletions test/saithrift/src/switch_sai.thrift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -422,4 +422,7 @@ service switch_sai_rpc {
sai_thrift_status_t sai_thrift_remove_debug_counter(1: sai_thrift_object_id_t thrift_debug_counter_id);
sai_thrift_status_t sai_thrift_set_debug_counter_attribute(1: sai_thrift_object_id_t dc_id,
2: sai_thrift_attribute_t thrift_attr);
// VOQ API
sai_thrift_object_id_t sai_thrift_get_sys_port_obj_id_by_port_id(1: i32 sys_port_id);
sai_thrift_attribute_list_t sai_thrift_get_system_port_attribute(1: sai_thrift_object_id_t sys_port_object_id);
}
115 changes: 115 additions & 0 deletions test/saithrift/src/switch_sai_rpc_server.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ extern "C" {
#include <saimirror.h>
#include <saistatus.h>
#include <saitunnel.h>
#include <saisystemport.h>

#include "arpa/inet.h"

Expand Down Expand Up @@ -4214,6 +4215,120 @@ class switch_sai_rpcHandler : virtual public switch_sai_rpcIf {

return status;
}
// Returns sai_object_id for a system_port_id
sai_thrift_object_id_t sai_thrift_get_sys_port_obj_id_by_port_id(const int32_t sys_port_id) {
SAI_THRIFT_LOG_DBG("Called.");
sai_status_t status = SAI_STATUS_SUCCESS;
sai_switch_api_t *switch_api;
sai_system_port_api_t *sys_port_api;
sai_attribute_t attr, max_sys_port_attribute;
sai_attribute_t sys_port_list_object_attribute;
sai_attribute_t sys_port_attr;
int max_sys_ports = 0;
sai_object_id_t sys_port_obj_id;

status = sai_api_query(SAI_API_SWITCH, (void **) &switch_api);
if (status != SAI_STATUS_SUCCESS) {
SAI_THRIFT_LOG_ERR("sai_api_query failed!!!");
return SAI_NULL_OBJECT_ID;
}
attr.id = SAI_SWITCH_ATTR_TYPE;
status = switch_api->get_switch_attribute(gSwitchId, 1, &attr);
if (status != SAI_STATUS_SUCCESS) {
SAI_THRIFT_LOG_ERR("get_switch_attribute failed!!!");
return SAI_NULL_OBJECT_ID;
}
if (attr.value.u32 != SAI_SWITCH_TYPE_VOQ) {
SAI_THRIFT_LOG_ERR("Switch is not VOQ switch!!!");
return SAI_NULL_OBJECT_ID;
}
status = sai_api_query(SAI_API_SYSTEM_PORT, (void **) &sys_port_api);
if (status != SAI_STATUS_SUCCESS) {
SAI_THRIFT_LOG_ERR("sai_api_query failed!!!");
return SAI_NULL_OBJECT_ID;
}

max_sys_port_attribute.id = SAI_SWITCH_ATTR_NUMBER_OF_SYSTEM_PORTS;
switch_api->get_switch_attribute(gSwitchId, 1, &max_sys_port_attribute);
max_sys_ports = max_sys_port_attribute.value.u32;

sys_port_list_object_attribute.id = SAI_SWITCH_ATTR_SYSTEM_PORT_LIST;
sys_port_list_object_attribute.value.objlist.list = (sai_object_id_t *) malloc(sizeof(sai_object_id_t) * max_sys_ports);
sys_port_list_object_attribute.value.objlist.count = max_sys_ports;
status = switch_api->get_switch_attribute(gSwitchId, 1, &sys_port_list_object_attribute);
if (status != SAI_STATUS_SUCCESS) {
SAI_THRIFT_LOG_ERR("get_switch_attribute failed!!!");
free(sys_port_list_object_attribute.value.objlist.list);
return SAI_NULL_OBJECT_ID;
}

for (int i=0 ; i<max_sys_ports ; i++){
sys_port_attr.id = SAI_SYSTEM_PORT_ATTR_CONFIG_INFO;
status = sys_port_api->get_system_port_attribute(sys_port_list_object_attribute.value.objlist.list[i], 1, &sys_port_attr);
if (status != SAI_STATUS_SUCCESS) {
SAI_THRIFT_LOG_ERR("get_system_port_attribute failed!!! for system_port 0x%lx", sys_port_list_object_attribute.value.objlist.list[i]);
continue;
}
if(sys_port_attr.value.sysportconfig.port_id == sys_port_id) {
sys_port_obj_id = sys_port_list_object_attribute.value.objlist.list[i];
free(sys_port_list_object_attribute.value.objlist.list);
return sys_port_obj_id;
}
}

SAI_THRIFT_LOG_ERR("Didn't find system port port\n");
free(sys_port_list_object_attribute.value.objlist.list);
return SAI_NULL_OBJECT_ID;
}
void sai_thrift_get_system_port_attribute(sai_thrift_attribute_list_t& thrift_attr_list, const sai_thrift_object_id_t sys_port_oid) {
SAI_THRIFT_LOG_DBG("sai_thrift_get_system_port_attribute for 0x%lx", sys_port_oid);
sai_status_t status = SAI_STATUS_SUCCESS;
sai_system_port_api_t *sys_port_api;
sai_attribute_t max_voq_attribute;
sai_attribute_t voq_list_object_attribute;
sai_thrift_attribute_t thrift_voq_list_attribute;
sai_object_list_t *voq_list_object;
int max_voqs = 0;

if(sys_port_oid == SAI_NULL_OBJECT_ID) {
SAI_THRIFT_LOG_ERR("Invalid system port!!!");
return;
}
status = sai_api_query(SAI_API_SYSTEM_PORT, (void **) &sys_port_api);
if (status != SAI_STATUS_SUCCESS) {
SAI_THRIFT_LOG_ERR("sai_api_query failed!!!");
return;
}

max_voq_attribute.id = SAI_SYSTEM_PORT_ATTR_QOS_NUMBER_OF_VOQS;
status = sys_port_api->get_system_port_attribute(sys_port_oid, 1, &max_voq_attribute);
if (status != SAI_STATUS_SUCCESS) {
SAI_THRIFT_LOG_ERR("sai_api_query failed!!!");
return;
}
max_voqs = max_voq_attribute.value.u32;

voq_list_object_attribute.id = SAI_SYSTEM_PORT_ATTR_QOS_VOQ_LIST;
voq_list_object_attribute.value.objlist.list = (sai_object_id_t *) malloc(sizeof(sai_object_id_t) * max_voqs);
voq_list_object_attribute.value.objlist.count = max_voqs;
status = sys_port_api->get_system_port_attribute(sys_port_oid, 1, &voq_list_object_attribute);
if (status != SAI_STATUS_SUCCESS) {
SAI_THRIFT_LOG_ERR("sai_api_query failed!!!");
return;
}

std::vector<sai_thrift_attribute_t>& attr_list = thrift_attr_list.attr_list;
thrift_voq_list_attribute.id = SAI_SYSTEM_PORT_ATTR_QOS_VOQ_LIST;
thrift_voq_list_attribute.value.objlist.count = max_voqs;
std::vector<sai_thrift_object_id_t>& voq_list = thrift_voq_list_attribute.value.objlist.object_id_list;
voq_list_object = &voq_list_object_attribute.value.objlist;
for (int index = 0; index < max_voqs; index++) {
voq_list.push_back((sai_thrift_object_id_t) voq_list_object->list[index]);
}
attr_list.push_back(thrift_voq_list_attribute);
free(voq_list_object_attribute.value.objlist.list);
SAI_THRIFT_LOG_DBG("Exited.");
}
};

static void * switch_sai_thrift_rpc_server_thread(void *arg) {
Expand Down
23 changes: 23 additions & 0 deletions test/saithrift/tests/switch.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1450,3 +1450,26 @@ def sai_thrift_create_tunnel_term_table(client, tunnel_type, addr_family, vr_id,
tb_attr_list=[attribute1,attribute2,attribute3,attribute4,attribute5,attribute6]
tunnel_entry_id=client.sai_thrift_create_tunnel_term_table_entry(tb_attr_list)
return tunnel_entry_id

def sai_thrift_read_port_voq_counters(client, port):
sys_port_oid = client.sai_thrift_get_sys_port_obj_id_by_port_id(port)
voq_list = []
port_attr_list = client.sai_thrift_get_system_port_attribute(sys_port_oid)
attr_list = port_attr_list.attr_list
for attribute in attr_list:
if attribute.id == SAI_SYSTEM_PORT_ATTR_QOS_VOQ_LIST:
for voq_id in attribute.value.objlist.object_id_list:
voq_list.append(voq_id)

cnt_ids = []
thrift_results = []
voq_counters_results = []
cnt_ids.append(SAI_QUEUE_STAT_PACKETS)
queue1 = 0
for voq in voq_list:
if queue1 <= 7:
thrift_results = client.sai_thrift_get_queue_stats(
voq, cnt_ids, len(cnt_ids))
voq_counters_results.append(thrift_results[0])
queue1 += 1
return (voq_counters_results)

0 comments on commit 957ccdb

Please sign in to comment.