Adding Cisco-8000 Specific Packet Formatting in everflow_policer_test.py (sonic-net#21137)

Co-authored-by: mmananja <mmananja@users.noreply.github.com>

Author: mmananja

ansible/roles/test/files/acstests/everflow_policer_test.py

@@ -242,6 +242,17 @@ def checkMirroredFlow(self):
                                                 inner_frame=bytes(payload),
                                                 ip_id=0,
                                                 sgt_other=0x4)
+        elif self.asic_type in ["cisco-8000"]:
+            exp_pkt = testutils.ipv4_erspan_pkt(eth_src=self.router_mac,
+                                                ip_src=self.session_src_ip,
+                                                ip_dst=self.session_dst_ip,
+                                                ip_dscp=self.session_dscp,
+                                                ip_ttl=self.session_ttl-1,
+                                                inner_frame=bytes(payload),
+                                                ip_id=0,
+                                                version=1)
+
+            exp_pkt['ERSPAN II'].ver = 1
         else:
             exp_pkt['GRE'].proto = 0x88be
 
@@ -255,7 +266,10 @@ def checkMirroredFlow(self):
         if self.asic_type in ["marvell-prestera", "marvell"]:
             masked_exp_pkt.set_do_not_care_scapy(scapy.IP, "id")
             masked_exp_pkt.set_do_not_care_scapy(scapy.GRE, "seqnum_present")
-
+        if self.asic_type in ["cisco-8000"]:
+            erspan_bit_offset = 42
+            masked_exp_pkt.set_do_not_care(erspan_bit_offset * 8 + 19, 2)  # Mask the encap value
+            masked_exp_pkt.set_do_not_care(erspan_bit_offset * 8 + 22, 10)  # Mask the session_id
         if exp_pkt.haslayer(scapy.ERSPAN_III):
             masked_exp_pkt.set_do_not_care_scapy(scapy.ERSPAN_III, "span_id")
             masked_exp_pkt.set_do_not_care_scapy(scapy.ERSPAN_III, "timestamp")
@@ -279,6 +293,10 @@ def match_payload(pkt):
                 pkt = scapy.Ether(pkt[8:])
             elif self.asic_type == "barefoot":
                 pkt = scapy.Ether(pkt).load
+            elif self.asic_type == "cisco-8000":
+                pkt = scapy.Ether(pkt)[scapy.GRE].payload
+                pkt = bytes(pkt)
+                pkt = scapy.Ether(pkt[8:])  # Mask the ERSPAN II header
             else:
                 pkt = scapy.Ether(pkt)[scapy.GRE].payload
 

tests/common/plugins/conditional_mark/tests_mark_conditions.yaml

@@ -2180,11 +2180,11 @@ everflow/test_everflow_testbed.py::TestEverflowV4IngressAclIngressMirror::test_e
 
 everflow/test_everflow_testbed.py::TestEverflowV4IngressAclIngressMirror::test_everflow_dscp_with_policer:
   skip:
-    reason: "Skipping test since mirror with policer is not supported on Cisco 8000 platforms and Broadcom DNX platforms."
+    reason: "Skipping test since mirror with policer is not supported on Cisco 8122 platforms and Broadcom DNX platforms."
     conditions_logical_operator: "OR"
     conditions:
-      - "asic_type in ['cisco-8000']"
       - "asic_subtype in ['broadcom-dnx']"
+      - "platform in ['x86_64-8122_64eh_o-r0', 'x86_64-8122_64ehf_o-r0']"
 
 everflow/test_everflow_testbed.py::TestEverflowV4IngressAclIngressMirror::test_everflow_dscp_with_policer[erspan_ipv4-cli-downstream-default]:
   skip: