diff --git a/.azure-pipelines/pr_test_scripts.yaml b/.azure-pipelines/pr_test_scripts.yaml index 4b600572950..7533a4f15a5 100644 --- a/.azure-pipelines/pr_test_scripts.yaml +++ b/.azure-pipelines/pr_test_scripts.yaml @@ -644,6 +644,7 @@ t1-lag-vpp: - bgp/test_bgp_session.py - bgp/test_bgp_operation_in_ro.py - bgp/test_bgp_queue.py + - copp/test_copp.py - bgp/test_bgp_session_flap.py - bgp/test_ipv6_nlri_over_ipv4.py - bgp/test_bgp_allow_list.py diff --git a/ansible/roles/test/files/ptftests/py3/copp_tests.py b/ansible/roles/test/files/ptftests/py3/copp_tests.py index 46c48356b81..86d9dab8f8e 100644 --- a/ansible/roles/test/files/ptftests/py3/copp_tests.py +++ b/ansible/roles/test/files/ptftests/py3/copp_tests.py @@ -633,7 +633,7 @@ def check_constraints(self, send_count, recv_count, time_delta_ms, rx_pps): ) assert self.PPS_LIMIT_MIN <= rx_pps <= self.PPS_LIMIT_MAX, "Copp policer constraint check failed, " \ "Actual PPS: {} Expected PPS range: {} - {}".format(rx_pps, self.PPS_LIMIT_MIN, self.PPS_LIMIT_MAX) - elif self.asic_type not in ['broadcom', 'marvell-teralynx']: + elif self.asic_type not in ['broadcom', 'marvell-teralynx', 'vpp']: self.log("Checking constraints (NoPolicyApplied):") self.log( "rx_pps (%d) <= PPS_LIMIT_MIN (%d): %s" % @@ -689,19 +689,20 @@ def runTest(self): def construct_packet(self, port_number): src_mac = self.my_mac[port_number] dst_mac = self.peer_mac[port_number] + src_ip = self.myip dst_ip = self.peerip packet = testutils.simple_udp_packet( eth_dst=dst_mac, - ip_dst=dst_ip, eth_src=src_mac, + ip_src=src_ip, + ip_dst=dst_ip, udp_dport=161 ) return packet -# SONIC config contains policer CIR=600 for SSH class SSHTest(PolicyTest): def __init__(self): PolicyTest.__init__(self) @@ -754,12 +755,14 @@ def one_port_test(self, port_number): def construct_packet(self, port_number): src_mac = self.my_mac[port_number] dst_mac = self.peer_mac[port_number] + src_ip = self.myip dst_ip = self.peerip packet = testutils.simple_tcp_packet( pktlen=self.packet_size, eth_src=src_mac, eth_dst=dst_mac, + ip_src=src_ip, ip_dst=dst_ip ) diff --git a/tests/common/plugins/conditional_mark/tests_mark_conditions_sonic_vpp.yaml b/tests/common/plugins/conditional_mark/tests_mark_conditions_sonic_vpp.yaml index 913839dc5d1..65262e436ea 100644 --- a/tests/common/plugins/conditional_mark/tests_mark_conditions_sonic_vpp.yaml +++ b/tests/common/plugins/conditional_mark/tests_mark_conditions_sonic_vpp.yaml @@ -116,17 +116,6 @@ container_checker/test_container_checker.py::test_container_checker_telemetry: conditions: - "asic_type in ['vpp']" -####################################### -##### COPP ##### -####################################### -copp: - skip: - reason: > - Unsupported - conditions_logical_operator: or - conditions: - - "asic_type in ['vpp']" - ####################################### ##### Decap ##### #######################################