[orchagent]: Update MACsec SAI API to 1.8.0 and re-enable MACsec test (…

…#1733) Signed-off-by: Ze Gan <ganze718@gmail.com>
sonic-net · May 7, 2021 · e29d566 · e29d566
1 parent 295061c
commit e29d566
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/orchagent/macsecorch.cpp b/orchagent/macsecorch.cpp
@@ -1848,13 +1848,13 @@ bool MACsecOrch::createMACsecSA(
 
     if (direction == SAI_MACSEC_DIRECTION_EGRESS)
     {
-        attr.id = SAI_MACSEC_SA_ATTR_XPN;
+        attr.id = SAI_MACSEC_SA_ATTR_CONFIGURED_EGRESS_XPN;
         attr.value.u64 = pn;
         attrs.push_back(attr);
     }
     else
     {
-        attr.id = SAI_MACSEC_SA_ATTR_MINIMUM_XPN;
+        attr.id = SAI_MACSEC_SA_ATTR_MINIMUM_INGRESS_XPN;
         attr.value.u64 = pn;
         attrs.push_back(attr);
     }

diff --git a/tests/test_macsec.py b/tests/test_macsec.py
@@ -2,7 +2,6 @@
 import conftest
 
 import sys
-import pytest
 import functools
 import typing
 import re
@@ -588,7 +587,6 @@ def deinit_macsec(
                 macsec_port_identifier))
         wpa.deinit_macsec_port(port_name)
 
-    @pytest.mark.skip("Skip to be removed after macsec orch is made compatible to SAI v1.8.0")
     def test_macsec_term_orch(self, dvs: conftest.DockerVirtualSwitch, testlog):
         port_name = "Ethernet0"
         local_mac_address = "00-15-5D-78-FF-C1"