Update MACsec SAI API to 1.8.0 and re-enable MACsec test

Pterosaur · Pterosaur · commit 7ea2f1e7073c · 2021-04-29T23:56:59.000+08:00
Signed-off-by: Ze Gan &lt;ganze718@gmail.com&gt;
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
@@ -588,7 +588,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"

Original file line number	Diff line number	Diff line change
`@@ -1848,13 +1848,13 @@ bool MACsecOrch::createMACsecSA(`
`1848`	`1848`
`1849`	`1849`	`if (direction == SAI_MACSEC_DIRECTION_EGRESS)`
`1850`	`1850`	`{`
`1851`		`- attr.id = SAI_MACSEC_SA_ATTR_XPN;`
	`1851`	`+ attr.id = SAI_MACSEC_SA_ATTR_CONFIGURED_EGRESS_XPN;`
`1852`	`1852`	`attr.value.u64 = pn;`
`1853`	`1853`	`attrs.push_back(attr);`
`1854`	`1854`	`}`
`1855`	`1855`	`else`
`1856`	`1856`	`{`
`1857`		`- attr.id = SAI_MACSEC_SA_ATTR_MINIMUM_XPN;`
	`1857`	`+ attr.id = SAI_MACSEC_SA_ATTR_MINIMUM_INGRESS_XPN;`
`1858`	`1858`	`attr.value.u64 = pn;`
`1859`	`1859`	`attrs.push_back(attr);`
`1860`	`1860`	`}`