Skip to content

Commit 36e912b

Browse files
vmittal-msftlguohan
authored andcommitted
[SAI submodule] Update SAI to 1.7.1 (sonic-net#748)
1 parent 83d11f1 commit 36e912b

File tree

6 files changed

+56
-7
lines changed

6 files changed

+56
-7
lines changed

lib/src/sai_redis_hash.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#include "sai_redis.h"
22

33
REDIS_GENERIC_QUAD(HASH,hash);
4+
REDIS_GENERIC_QUAD(FINE_GRAINED_HASH_FIELD,fine_grained_hash_field);
45

56
const sai_hash_api_t redis_hash_api = {
6-
77
REDIS_GENERIC_QUAD_API(hash)
8+
REDIS_GENERIC_QUAD_API(fine_grained_hash_field)
89
};

lib/src/sai_redis_hostintf.cpp

+23
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,27 @@ static sai_status_t redis_send_hostif_packet(
2424
return SAI_STATUS_NOT_IMPLEMENTED;
2525
}
2626

27+
static sai_status_t redis_allocate_hostif_packet(
28+
_In_ sai_object_id_t hostif_id,
29+
_In_ sai_size_t buffer_size,
30+
_Out_ void **buffer,
31+
_In_ uint32_t attr_count,
32+
_In_ const sai_attribute_t *attr_list)
33+
{
34+
SWSS_LOG_ENTER();
35+
36+
return SAI_STATUS_NOT_IMPLEMENTED;
37+
}
38+
39+
static sai_status_t redis_free_hostif_packet(
40+
_In_ sai_object_id_t hostif_id,
41+
_Inout_ void *buffer)
42+
{
43+
SWSS_LOG_ENTER();
44+
45+
return SAI_STATUS_NOT_IMPLEMENTED;
46+
}
47+
2748
REDIS_GENERIC_QUAD(HOSTIF,hostif);
2849
REDIS_GENERIC_QUAD(HOSTIF_TABLE_ENTRY,hostif_table_entry);
2950
REDIS_GENERIC_QUAD(HOSTIF_TRAP_GROUP,hostif_trap_group);
@@ -40,4 +61,6 @@ const sai_hostif_api_t redis_hostif_api = {
4061

4162
redis_recv_hostif_packet,
4263
redis_send_hostif_packet,
64+
redis_allocate_hostif_packet,
65+
redis_free_hostif_packet,
4366
};

vslib/src/SwitchStateBaseMACsec.cpp

+5-4
Original file line numberDiff line numberDiff line change
@@ -541,15 +541,16 @@ sai_status_t SwitchStateBase::loadMACsecAttrFromMACsecSA(
541541

542542
macsecAttr.m_an = attr->value.u8;
543543

544-
SAI_METADATA_GET_ATTR_BY_ID(attr, SAI_MACSEC_SA_ATTR_ENCRYPTION_ENABLE, attrCount, attrList);
545-
546-
macsecAttr.m_encryptionEnable = attr->value.booldata;
544+
//SAI_METADATA_GET_ATTR_BY_ID(attr, SAI_MACSEC_SA_ATTR_ENCRYPTION_ENABLE, attrCount, attrList);
545+
//macsecAttr.m_encryptionEnable = attr->value.booldata;
546+
SWSS_LOG_THROW("SAI_MACSEC_SA_ATTR_ENCRYPTION_ENABLE is not available in SAI 1.7.1, please help fix this");
547547

548548
SAI_METADATA_GET_ATTR_BY_ID(attr, SAI_MACSEC_SA_ATTR_SAK, attrCount, attrList);
549549

550550
macsecAttr.m_sak = sai_serialize_hex_binary(attr->value.macsecsak);
551551

552-
SAI_METADATA_GET_ATTR_BY_ID(attr, SAI_MACSEC_SA_ATTR_SAK_256_BITS, attrCount, attrList);
552+
//SAI_METADATA_GET_ATTR_BY_ID(attr, SAI_MACSEC_SA_ATTR_SAK_256_BITS, attrCount, attrList);
553+
SWSS_LOG_THROW("SAI_MACSEC_SA_ATTR_256_BITS is not available in SAI 1.7.1, please help fix this");
553554

554555
if (!attr->value.booldata)
555556
{

vslib/src/sai_vs_hash.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#include "sai_vs.h"
22

33
VS_GENERIC_QUAD(HASH,hash);
4+
VS_GENERIC_QUAD(FINE_GRAINED_HASH_FIELD,fine_grained_hash_field);
45

56
const sai_hash_api_t vs_hash_api = {
6-
77
VS_GENERIC_QUAD_API(hash)
8+
VS_GENERIC_QUAD_API(fine_grained_hash_field)
89
};

vslib/src/sai_vs_hostintf.cpp

+23
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,27 @@ static sai_status_t vs_send_hostif_packet(
2424
return SAI_STATUS_NOT_IMPLEMENTED;
2525
}
2626

27+
static sai_status_t vs_allocate_hostif_packet(
28+
_In_ sai_object_id_t hostif_id,
29+
_In_ sai_size_t buffer_size,
30+
_Out_ void **buffer,
31+
_In_ uint32_t attr_count,
32+
_In_ const sai_attribute_t *attr_list)
33+
{
34+
SWSS_LOG_ENTER();
35+
36+
return SAI_STATUS_NOT_IMPLEMENTED;
37+
}
38+
39+
static sai_status_t vs_free_hostif_packet(
40+
_In_ sai_object_id_t hostif_id,
41+
_Inout_ void *buffer)
42+
{
43+
SWSS_LOG_ENTER();
44+
45+
return SAI_STATUS_NOT_IMPLEMENTED;
46+
}
47+
2748
VS_GENERIC_QUAD(HOSTIF,hostif);
2849
VS_GENERIC_QUAD(HOSTIF_TABLE_ENTRY,hostif_table_entry);
2950
VS_GENERIC_QUAD(HOSTIF_TRAP_GROUP,hostif_trap_group);
@@ -40,4 +61,6 @@ const sai_hostif_api_t vs_hostif_api = {
4061

4162
vs_recv_hostif_packet,
4263
vs_send_hostif_packet,
64+
vs_allocate_hostif_packet,
65+
vs_free_hostif_packet,
4366
};

0 commit comments

Comments
 (0)