Moved the MACSec to use SAI_MACSEC_SA_ATTR_CONFIGURED_EGRESS_XPN as

needed vy v1.8.0 Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>
sonic-net · Apr 1, 2021 · 262b119 · 262b119
1 parent 5906d97
commit 262b119
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/tests/BCM56850/test_macsec_p2p_establishment.rec b/tests/BCM56850/test_macsec_p2p_establishment.rec
@@ -69,7 +69,7 @@
 2021-02-04.14:32:44.652603|c|SAI_OBJECT_TYPE_MACSEC_FLOW:oid:0x5a000000000633|SAI_MACSEC_FLOW_ATTR_MACSEC_DIRECTION=SAI_MACSEC_DIRECTION_INGRESS
 2021-02-04.14:32:44.656090|c|SAI_OBJECT_TYPE_MACSEC_SC:oid:0x5b000000000634|SAI_MACSEC_SC_ATTR_MACSEC_DIRECTION=SAI_MACSEC_DIRECTION_INGRESS|SAI_MACSEC_SC_ATTR_FLOW_ID=oid:0x5a000000000633|SAI_MACSEC_SC_ATTR_MACSEC_SCI=72294895074694398|SAI_MACSEC_SC_ATTR_ENCRYPTION_ENABLE=true|SAI_MACSEC_SC_ATTR_MACSEC_EXPLICIT_SCI_ENABLE=false|SAI_MACSEC_SC_ATTR_MACSEC_CIPHER_SUITE=SAI_MACSEC_CIPHER_SUITE_GCM_AES_128
 2021-02-04.14:32:44.658292|c|SAI_OBJECT_TYPE_ACL_ENTRY:oid:0x8000000000635|SAI_ACL_ENTRY_ATTR_TABLE_ID=oid:0x700000000062e|SAI_ACL_ENTRY_ATTR_PRIORITY=2|SAI_ACL_ENTRY_ATTR_ADMIN_STATE=true|SAI_ACL_ENTRY_ATTR_ACTION_PACKET_ACTION=SAI_PACKET_ACTION_DROP
-2021-02-04.14:32:46.658586|c|SAI_OBJECT_TYPE_MACSEC_SA:oid:0x5c000000000636|SAI_MACSEC_SA_ATTR_MACSEC_DIRECTION=SAI_MACSEC_DIRECTION_EGRESS|SAI_MACSEC_SA_ATTR_SC_ID=oid:0x5b000000000631|SAI_MACSEC_SA_ATTR_AN=0|SAI_MACSEC_SA_ATTR_SAK=00000000000000000000000000000000BCF9AD8CE37694552ECF8AB895169604|SAI_MACSEC_SA_ATTR_SALT=000000000000000000000000|SAI_MACSEC_SA_ATTR_MACSEC_SSCI=0|SAI_MACSEC_SA_ATTR_AUTH_KEY=E6BCBC29D9BB2A4E9297A11976D1FFBA|SAI_MACSEC_SA_ATTR_XPN=1
+2021-02-04.14:32:46.658586|c|SAI_OBJECT_TYPE_MACSEC_SA:oid:0x5c000000000636|SAI_MACSEC_SA_ATTR_MACSEC_DIRECTION=SAI_MACSEC_DIRECTION_EGRESS|SAI_MACSEC_SA_ATTR_SC_ID=oid:0x5b000000000631|SAI_MACSEC_SA_ATTR_AN=0|SAI_MACSEC_SA_ATTR_SAK=00000000000000000000000000000000BCF9AD8CE37694552ECF8AB895169604|SAI_MACSEC_SA_ATTR_SALT=000000000000000000000000|SAI_MACSEC_SA_ATTR_MACSEC_SSCI=0|SAI_MACSEC_SA_ATTR_AUTH_KEY=E6BCBC29D9BB2A4E9297A11976D1FFBA|SAI_MACSEC_SA_ATTR_CONFIGURED_EGRESS_XPN=1
 2021-02-04.14:32:46.663929|c|SAI_OBJECT_TYPE_MACSEC_SA:oid:0x5c000000000637|SAI_MACSEC_SA_ATTR_MACSEC_DIRECTION=SAI_MACSEC_DIRECTION_INGRESS|SAI_MACSEC_SA_ATTR_SC_ID=oid:0x5b000000000634|SAI_MACSEC_SA_ATTR_AN=0|SAI_MACSEC_SA_ATTR_SAK=00000000000000000000000000000000BCF9AD8CE37694552ECF8AB895169604|SAI_MACSEC_SA_ATTR_SALT=000000000000000000000000|SAI_MACSEC_SA_ATTR_MACSEC_SSCI=0|SAI_MACSEC_SA_ATTR_AUTH_KEY=E6BCBC29D9BB2A4E9297A11976D1FFBA|SAI_MACSEC_SA_ATTR_MINIMUM_XPN=1
 2021-02-04.14:32:46.666605|s|SAI_OBJECT_TYPE_ACL_ENTRY:oid:0x8000000000632|SAI_ACL_ENTRY_ATTR_ACTION_MACSEC_FLOW=oid:0x5a000000000630
 2021-02-04.14:32:46.751694|s|SAI_OBJECT_TYPE_ACL_ENTRY:oid:0x8000000000632|SAI_ACL_ENTRY_ATTR_ACTION_PACKET_ACTION=disabled

diff --git a/vslib/src/SwitchStateBaseMACsec.cpp b/vslib/src/SwitchStateBaseMACsec.cpp
@@ -564,7 +564,7 @@ sai_status_t SwitchStateBase::loadMACsecAttrFromMACsecSA(
 
     if (macsecAttr.m_direction == SAI_MACSEC_DIRECTION_EGRESS)
     {
-        SAI_METADATA_GET_ATTR_BY_ID(attr, SAI_MACSEC_SA_ATTR_XPN, attrCount, attrList);
+        SAI_METADATA_GET_ATTR_BY_ID(attr, SAI_MACSEC_SA_ATTR_CONFIGURED_EGRESS_XPN, attrCount, attrList);
     }
     else
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -564,7 +564,7 @@ sai_status_t SwitchStateBase::loadMACsecAttrFromMACsecSA( @@
         if (macsecAttr.m_direction == SAI_MACSEC_DIRECTION_EGRESS)
         {
-            SAI_METADATA_GET_ATTR_BY_ID(attr, SAI_MACSEC_SA_ATTR_XPN, attrCount, attrList);
+            SAI_METADATA_GET_ATTR_BY_ID(attr, SAI_MACSEC_SA_ATTR_CONFIGURED_EGRESS_XPN, attrCount, attrList);
         }
         else
         {
@@ Expand Down @@