sonic-net · kcudnik · Dec 18, 2020 · Dec 13, 2020 · Dec 13, 2020 · Dec 16, 2020
diff --git a/SAI b/SAI
diff --git a/lib/src/sai_redis_hash.cpp b/lib/src/sai_redis_hash.cpp
@@ -1,8 +1,9 @@
 #include "sai_redis.h"
 
 REDIS_GENERIC_QUAD(HASH,hash);
+REDIS_GENERIC_QUAD(FINE_GRAINED_HASH_FIELD,fine_grained_hash_field);
 
 const sai_hash_api_t redis_hash_api = {
-
     REDIS_GENERIC_QUAD_API(hash)
+    REDIS_GENERIC_QUAD_API(fine_grained_hash_field)
 };
diff --git a/lib/src/sai_redis_hostintf.cpp b/lib/src/sai_redis_hostintf.cpp
@@ -24,6 +24,27 @@ static sai_status_t redis_send_hostif_packet(
     return SAI_STATUS_NOT_IMPLEMENTED;
 }
 
+static sai_status_t redis_allocate_hostif_packet(
+        _In_ sai_object_id_t hostif_id,
+        _In_ sai_size_t buffer_size,
+        _Out_ void **buffer,
+        _In_ uint32_t attr_count,
+        _In_ const sai_attribute_t *attr_list)
+{
+    SWSS_LOG_ENTER();
+
+    return SAI_STATUS_NOT_IMPLEMENTED;
+}
+
+static sai_status_t redis_free_hostif_packet(
+        _In_ sai_object_id_t hostif_id,
+        _Inout_ void *buffer)
+{
+    SWSS_LOG_ENTER();
+
+    return SAI_STATUS_NOT_IMPLEMENTED;
+}
+
 REDIS_GENERIC_QUAD(HOSTIF,hostif);
 REDIS_GENERIC_QUAD(HOSTIF_TABLE_ENTRY,hostif_table_entry);
 REDIS_GENERIC_QUAD(HOSTIF_TRAP_GROUP,hostif_trap_group);
@@ -40,4 +61,6 @@ const sai_hostif_api_t redis_hostif_api = {
 
     redis_recv_hostif_packet,
     redis_send_hostif_packet,
+    redis_allocate_hostif_packet,
+    redis_free_hostif_packet,
 };
diff --git a/vslib/src/SwitchStateBaseMACsec.cpp b/vslib/src/SwitchStateBaseMACsec.cpp
@@ -541,15 +541,16 @@ sai_status_t SwitchStateBase::loadMACsecAttrFromMACsecSA(
 
     macsecAttr.m_an = attr->value.u8;
 
-    SAI_METADATA_GET_ATTR_BY_ID(attr, SAI_MACSEC_SA_ATTR_ENCRYPTION_ENABLE, attrCount, attrList);
-
-    macsecAttr.m_encryptionEnable = attr->value.booldata;
+    //SAI_METADATA_GET_ATTR_BY_ID(attr, SAI_MACSEC_SA_ATTR_ENCRYPTION_ENABLE, attrCount, attrList);
+    //macsecAttr.m_encryptionEnable = attr->value.booldata;
+    SWSS_LOG_THROW("SAI_MACSEC_SA_ATTR_ENCRYPTION_ENABLE is not available in SAI 1.7.1, please help fix this");
 
     SAI_METADATA_GET_ATTR_BY_ID(attr, SAI_MACSEC_SA_ATTR_SAK, attrCount, attrList);
 
     macsecAttr.m_sak = sai_serialize_hex_binary(attr->value.macsecsak);
 
-    SAI_METADATA_GET_ATTR_BY_ID(attr, SAI_MACSEC_SA_ATTR_SAK_256_BITS, attrCount, attrList);
+    //SAI_METADATA_GET_ATTR_BY_ID(attr, SAI_MACSEC_SA_ATTR_SAK_256_BITS, attrCount, attrList);
+    SWSS_LOG_THROW("SAI_MACSEC_SA_ATTR_256_BITS is not available in SAI 1.7.1, please help fix this");
 
     if (!attr->value.booldata)
     {

diff --git a/vslib/src/sai_vs_hash.cpp b/vslib/src/sai_vs_hash.cpp
@@ -1,8 +1,10 @@
 #include "sai_vs.h"
 
 VS_GENERIC_QUAD(HASH,hash);
+VS_GENERIC_QUAD(FINE_GRAINED_HASH_FIELD,fine_grained_hash_field);
 
 const sai_hash_api_t vs_hash_api = {
 
     VS_GENERIC_QUAD_API(hash)
+    VS_GENERIC_QUAD_API(fine_grained_hash_field)
 };
diff --git a/vslib/src/sai_vs_hostintf.cpp b/vslib/src/sai_vs_hostintf.cpp
@@ -24,6 +24,27 @@ static sai_status_t vs_send_hostif_packet(
     return SAI_STATUS_NOT_IMPLEMENTED;
 }
 
+static sai_status_t vs_allocate_hostif_packet(
+        _In_ sai_object_id_t hostif_id,
+        _In_ sai_size_t buffer_size,
+        _Out_ void **buffer,
+        _In_ uint32_t attr_count,
+        _In_ const sai_attribute_t *attr_list)
+{
+    SWSS_LOG_ENTER();
+
+    return SAI_STATUS_NOT_IMPLEMENTED;
+}
+
+static sai_status_t vs_free_hostif_packet(
+        _In_ sai_object_id_t hostif_id,
+        _Inout_ void *buffer)
+{
+    SWSS_LOG_ENTER();
+
+    return SAI_STATUS_NOT_IMPLEMENTED;
+}
+
 VS_GENERIC_QUAD(HOSTIF,hostif);
 VS_GENERIC_QUAD(HOSTIF_TABLE_ENTRY,hostif_table_entry);
 VS_GENERIC_QUAD(HOSTIF_TRAP_GROUP,hostif_trap_group);
@@ -40,4 +61,6 @@ const sai_hostif_api_t vs_hostif_api = {
 
     vs_recv_hostif_packet,
     vs_send_hostif_packet,
+    vs_allocate_hostif_packet,
+    vs_free_hostif_packet,
 };
+1 −1		bm/sai_adapter/test/ptf_tests/ptf/src/ptf/testutils.py
+218 −0		doc/Hash/Policy-based-hash.md
+ −		doc/SAI-Proposal-Mirroring_Sampled_Packets.docx
+332 −0		doc/SAI_1.6.3_ReleaseNotes.md
+400 −0		doc/UDF-based-ACL.md
+ −		doc/behavioral model/pipeline_v8.vsdx
+ −		doc/figures/phy_failover_on_host_side.png
+ −		doc/macsec-gearbox/PAI-Proposal-Failover.docx
+254 −0		doc/macsec-gearbox/PAI-Proposal-Failover.md
+ −		doc/macsec-gearbox/PAI-Proposal-Failover.pdf
+ −		doc/macsec-gearbox/phy_failover_on_host_side.png
+209 −10		inc/saiacl.h
+12 −0		inc/saidebugcounter.h
+209 −31		inc/saihash.h
+61 −0		inc/saihostif.h
+9 −0		inc/sailag.h
+40 −37		inc/saimacsec.h
+25 −0		inc/saimirror.h
+11 −0		inc/saineighbor.h
+1 −1		inc/sainexthop.h
+13 −0		inc/sainexthopgroup.h
+14 −0		inc/saiobject.h
+221 −3		inc/saiport.h
+1 −1		inc/sairouterinterface.h
+3 −0		inc/saisamplepacket.h
+53 −0		inc/saiswitch.h
+49 −4		inc/saitunnel.h
+33 −2		inc/saitypes.h
+9 −0		inc/saivirtualrouter.h
+8 −10		inc/saivlan.h
+10 −1		meta/acronyms.txt
+3 −0		meta/aspell.en.pws
+14 −2		meta/parse.pl
+9 −2		meta/saisanitycheck.c
+5 −0		meta/serialize.pm
+4 −4		meta/style.pm
+1 −1		test/ptf