Parallel manager2

ansible/ansible.cfg

@@ -124,7 +124,8 @@ connection_plugins = plugins/connection
 lookup_plugins = plugins/lookup
 # vars_plugins       = /usr/share/ansible_plugins/vars_plugins
 filter_plugins     = plugins/filter
-callback_whitelist = profile_tasks
+# Disable profile tasks callback to avoid possible deadlock
+# callback_whitelist = profile_tasks
 
 # by default callbacks are not loaded for /bin/ansible, enable this if you
 # want, for example, a notification or logging callback to also apply to
@@ -190,7 +191,7 @@ become_ask_pass=False
 # ssh arguments to use
 # Leaving off ControlPersist will result in poor performance, so use
 # paramiko on older platforms rather than removing it
-ssh_args = -o ControlMaster=auto -o ControlPersist=180s -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o ServerAliveInterval=30 -o ServerAliveCountMax=40
+ssh_args = -o ControlMaster=auto -o ControlPersist=300s -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o ServerAliveInterval=30 -o ServerAliveCountMax=40 -o TCPKeepAlive=yes
 
 
 # The path to use for the ControlPath sockets. This defaults to

ansible/config_sonic_basedon_testbed.yml

@@ -40,13 +40,16 @@
       set_fact:
         testbed_file: testbed.yaml
       when: testbed_file is not defined
+      tags: always
 
     - name: Gathering testbed information
       test_facts: testbed_name="{{ testbed_name }}" testbed_file="{{ testbed_file }}"
       delegate_to: localhost
+      tags: always
 
     - fail: msg="The DUT you are trying to run test does not belongs to this testbed"
       when: inventory_hostname not in testbed_facts['duts']
+      tags: always
 
     - name: Set default num_asic
       set_fact:
@@ -60,11 +63,13 @@
     - name: set testbed_type
       set_fact:
         topo: "{{ testbed_facts['topo'] }}"
+      tags: always
 
     - name: set default light mode
       set_fact:
         is_light_mode: true
       when: topo in ["t1-smartswitch-ha","t1-28-lag","smartswitch-t1", "t1-48-lag"] and is_light_mode is not defined
+      tags: always
 
     - name: set ptf image name
       set_fact:
@@ -756,7 +761,7 @@
           macsec_profile: "{{ macsec_profile }}"
           num_asics: "{{ num_asics }}"
         become: true
-        when: "('t2' in topo) and (enable_macsec is defined)"
+        when: "('t2' in topo) and (macsec_profile is defined)"
 
       - name: Use minigraph case
         block:
@@ -915,6 +920,7 @@
         become: true
         # t1-28-lag is smartswitch topo only
         when: topo in ["t1-smartswitch-ha","t1-28-lag","smartswitch-t1", "t1-48-lag"] and is_light_mode|bool == true
+        tags: [ dpu_config ]
 
       - name: Load DPU config in smartswitch
         load_extra_dpu_config:
@@ -924,6 +930,7 @@
         become: true
         # t1-28-lag is smartswitch topo only
         when: topo in ["t1-smartswitch-ha","t1-28-lag","smartswitch-t1", "t1-48-lag"] and is_light_mode|bool == true
+        tags: [ dpu_config ]
 
       - name: Configure TACACS
         become: true

ansible/group_vars/sonic/variables

@@ -21,7 +21,7 @@ broadcom_th5_hwskus: ['Arista-7060X6-64DE', 'Arista-7060X6-64DE-64x400G', 'Arist
 broadcom_j2c+_hwskus: ['Nokia-IXR7250E-36x100G', 'Nokia-IXR7250E-36x400G', 'Arista-7280DR3A-36', 'Arista-7280DR3AK-36', 'Arista-7280DR3AK-36S', 'Arista-7280DR3AM-36', 'Arista-7800R3A-36DM2-C36', 'Arista-7800R3A-36DM2-D36', 'Arista-7800R3AK-36DM2-C36', 'Arista-7800R3AK-36DM2-D36', 'Nokia-IXR7250-X3B']
 
 broadcom_jr2_hwskus: ['Arista-7800R3-48CQ2-C48', 'Arista-7800R3-48CQM2-C48']
-broadcom_q3d_hwskus: ['Arista-7280R4-32QF-32DF-64O', 'Arista-7280R4K-32QF-32DF-64O']
+broadcom_q3d_hwskus: ['NH-5010-F-O64', 'NH-5010-F-O32-C32', 'Arista-7280R4-32QF-32DF-64O', 'Arista-7280R4K-32QF-32DF-64O']
 
 mellanox_spc1_hwskus: [ 'ACS-MSN2700', 'ACS-MSN2740', 'ACS-MSN2100', 'ACS-MSN2410', 'ACS-MSN2010', 'Mellanox-SN2700', 'Mellanox-SN2700-A1', 'Mellanox-SN2700-D48C8','Mellanox-SN2700-D40C8S8', 'Mellanox-SN2700-A1-D48C8', 'Mellanox-SN2700-C28D8', 'Mellanox-SN2700-A1-C28D8']
 mellanox_spc2_hwskus: [ 'ACS-MSN3700', 'ACS-MSN3700C', 'ACS-MSN3800', 'Mellanox-SN3800-D112C8' , 'ACS-MSN3420']

ansible/library/dut_basic_facts.py

@@ -51,6 +51,10 @@ def main():
         if hasattr(device_info, 'is_chassis'):
             results['is_chassis'] = device_info.is_chassis()
 
+        results['is_chassis_config_absent'] = False
+        if hasattr(device_info, 'is_chassis_config_absent'):
+            results['is_chassis_config_absent'] = device_info.is_chassis_config_absent()
+
         if results['is_multi_asic']:
             results['asic_index_list'] = []
             if results['is_chassis']:

ansible/roles/eos/templates/t2-single-node-max-64p-core.j2

@@ -0,0 +1 @@
+t2-core.j2

ansible/roles/eos/templates/t2-single-node-max-64p-leaf.j2

@@ -0,0 +1 @@
+t2-leaf.j2

ansible/roles/test/files/ptftests/py3/generic_hash_test.py

@@ -22,8 +22,8 @@ class GenericHashTest(BaseTest):
     # ---------------------------------------------------------------------
     # Class variables
     # ---------------------------------------------------------------------
-    DEFAULT_BALANCING_RANGE = 0.25
-    BALANCING_TEST_TIMES = 625
+    DEFAULT_BALANCING_RANGE = 0.3
+    BALANCING_TEST_TIMES = 480
     VXLAN_PORT = 4789
     VXLAN_VNI = 20001
     NVGRE_TNI = 20001
@@ -206,12 +206,12 @@ def _get_single_layer_packet():
             if self.hash_field == 'ETHERTYPE':
                 pkt['Ether'].type = random.choice(range(self.ethertype_range[0], self.ethertype_range[1]))
             if not self.is_l2_test:
-                pkt_summary = f"{self.ipver} packet with src_mac:{src_mac}, dst_mac:{dst_mac}, src_ip:{src_ip}, " \
-                              f"dst_ip:{dst_ip}, src_port:{src_port}, dst_port: {dst_port}, " \
-                              f"ip_protocol:{_get_pkt_ip_protocol(pkt)}"
+                pkt_summary = f"{self.ipver} packet with src_mac: {src_mac}, dst_mac: {dst_mac}, src_ip: {src_ip}, " \
+                              f"dst_ip: {dst_ip}, src_port: {src_port}, dst_port: {dst_port}, " \
+                              f"ip_protocol: {_get_pkt_ip_protocol(pkt)}"
             else:
-                pkt_summary = f"Ethernet packet with src_mac:{src_mac}, dst_mac:{dst_mac}, " \
-                              f"ether_type:{hex(pkt['Ether'].type)}, vlan_id:{vlan_id if vlan_id != 0 else 'N/A'}"
+                pkt_summary = f"Ethernet packet with src_mac: {src_mac}, dst_mac: {dst_mac}, " \
+                              f"ether_type: {hex(pkt['Ether'].type)}, vlan_id: {vlan_id if vlan_id != 0 else 'N/A'}"
             if self.hash_field == 'IPV6_FLOW_LABEL':
                 pkt_summary += f", ipv6 flow label: {flow_label} "
 
@@ -244,10 +244,10 @@ def _get_ipinip_packet():
                 masked_expected_pkt.set_do_not_care_packet(scapy.Ether, "dst")
                 masked_expected_pkt.set_do_not_care_packet(scapy.Ether, "src")
                 masked_expected_pkt.set_do_not_care_packet(scapy.IPv6, "hlim")
-            pkt_summary = f"{self.ipver} ipinip packet with src_ip:{src_ip}, dst_ip:{dst_ip}, " \
-                          f"ip_protocol:{_get_pkt_ip_protocol(pkt)}, inner_ipver:{self.inner_ipver}, " \
-                          f"inner_src_ip:{inner_src_ip}, inner_dst_ip:{inner_dst_ip}, inner_src_port:{src_port}," \
-                          f" inner_dst_port:{dst_port}, inner_ip_protocol:{_get_pkt_ip_protocol(inner_pkt)}"
+            pkt_summary = f"{self.ipver} ipinip packet with src_ip: {src_ip}, dst_ip: {dst_ip}, " \
+                f"ip_protocol: {_get_pkt_ip_protocol(pkt)}, inner_ipver: {self.inner_ipver}, " \
+                f"inner_src_ip: {inner_src_ip}, inner_dst_ip: {inner_dst_ip}, inner_src_port: {src_port}, " \
+                f" inner_dst_port: {dst_port}, inner_ip_protocol: {_get_pkt_ip_protocol(inner_pkt)}"
             return pkt, masked_expected_pkt, pkt_summary
 
         def _get_vxlan_packet():
@@ -286,11 +286,12 @@ def _get_vxlan_packet():
                 masked_expected_pkt.set_do_not_care_packet(scapy.Ether, "dst")
                 masked_expected_pkt.set_do_not_care_packet(scapy.Ether, "src")
                 masked_expected_pkt.set_do_not_care_packet(scapy.IPv6, "hlim")
-            pkt_summary = f"{self.ipver} vxlan packet with src_ip:{src_ip}, dst_ip:{dst_ip}, " \
-                f"src_port:{self.L4_SRC_PORT}, dst_port: {self.vxlan_port}, ip_protocol:{_get_pkt_ip_protocol(pkt)}, " \
-                f"inner_ipver:{self.inner_ipver}, inner_src_ip:{inner_src_ip}, inner_dst_ip:{inner_dst_ip}, " \
-                f"inner_src_port:{src_port}, inner_dst_port:{dst_port}, " \
-                f"inner_ip_protocol:{_get_pkt_ip_protocol(inner_pkt)}"
+            pkt_summary = f"{self.ipver} vxlan packet with src_ip: {src_ip}, dst_ip: {dst_ip}, " \
+                f"src_port: {self.L4_SRC_PORT}, dst_port: {self.vxlan_port}, " \
+                f"ip_protocol: {_get_pkt_ip_protocol(pkt)}, " \
+                f"inner_ipver: {self.inner_ipver}, inner_src_ip: {inner_src_ip}, inner_dst_ip: {inner_dst_ip}, " \
+                f"inner_src_port: {src_port}, inner_dst_port: {dst_port}, " \
+                f"inner_ip_protocol: {_get_pkt_ip_protocol(inner_pkt)}"
             return pkt, masked_expected_pkt, pkt_summary
 
         def _get_nvgre_packet():
@@ -325,10 +326,10 @@ def _get_nvgre_packet():
                 masked_expected_pkt.set_do_not_care_packet(scapy.Ether, "dst")
                 masked_expected_pkt.set_do_not_care_packet(scapy.Ether, "src")
                 masked_expected_pkt.set_do_not_care_packet(scapy.IPv6, "hlim")
-            pkt_summary = f"{self.ipver} nvgre packet with src_ip:{src_ip}, dst_ip:{dst_ip}, " \
-                          f"ip_protocol:{_get_pkt_ip_protocol(pkt)}, inner_ipver:{self.inner_ipver}, " \
-                          f"inner_src_ip:{inner_src_ip}, inner_dst_ip:{inner_dst_ip}, inner_src_port:{src_port}, " \
-                          f"inner_dst_port:{dst_port}, inner_ip_protocol:{_get_pkt_ip_protocol(inner_pkt)}"
+            pkt_summary = f"{self.ipver} nvgre packet with src_ip: {src_ip}, dst_ip: {dst_ip}, " \
+                f"ip_protocol: {_get_pkt_ip_protocol(pkt)}, inner_ipver: {self.inner_ipver}, " \
+                f"inner_src_ip: {inner_src_ip}, inner_dst_ip: {inner_dst_ip}, inner_src_port: {src_port}, " \
+                f"inner_dst_port: {dst_port}, inner_ip_protocol: {_get_pkt_ip_protocol(inner_pkt)}"
             return pkt, masked_expected_pkt, pkt_summary
 
         src_mac = _get_src_mac()
@@ -396,13 +397,14 @@ def check_ip_route(self, pkt, masked_expected_pkt, sending_port):
             port_index, received = testutils.verify_packet_any_port(
                 self, masked_expected_pkt, self.expected_port_list, timeout=0.1)
         except AssertionError:
-            logging.error("Traffic wasn't sent successfully, trying again")
+            logging.warning("Packet wasn't received successfully, trying again")
             logging.info(f"Expected packet: {masked_expected_pkt}")
             for _ in range(5):
                 testutils.send_packet(self, sending_port, pkt, count=1)
                 time.sleep(0.1)
             port_index, received = testutils.verify_packet_any_port(
                 self, masked_expected_pkt, self.expected_port_list, timeout=1)
+            logging.info("Packet was received successfully after retry.")
         # The port_index is the index of expected_port_list, need to convert it to the ptf port index
         return self.expected_port_list[port_index], received
 
@@ -511,6 +513,31 @@ def _check_only_lag_hash_balancing():
         elif not self.ecmp_hash and self.lag_hash:
             _check_only_lag_hash_balancing()
 
+    def print_result_summary(self, hit_count_map):
+        total_receiving_ports = len(hit_count_map)
+        total_received_packets = sum(hit_count_map.values())
+        average_packets = total_received_packets / total_receiving_ports
+        min_received_packets = min(hit_count_map.values())
+        max_received_packets = max(hit_count_map.values())
+        min_received_ports = [port for port, count in hit_count_map.items() if count == min_received_packets]
+        max_received_ports = [port for port, count in hit_count_map.items() if count == max_received_packets]
+        expected_total_hit_cnt = self.balancing_test_times * len(self.expected_port_list)
+        expected_hit_cnt_per_port = self.balancing_test_times
+        if self.ecmp_hash and not self.lag_hash:
+            expected_hit_cnt_per_port = expected_total_hit_cnt / len(self.expected_port_groups)
+        elif not self.ecmp_hash and self.lag_hash:
+            expected_hit_cnt_per_port = expected_total_hit_cnt / len(self.expected_port_groups[0])
+        max_deviation = max(abs(expected_hit_cnt_per_port - min_received_packets),
+                            abs(expected_hit_cnt_per_port - max_received_packets))
+        max_deviation_percentage = str(max_deviation / expected_hit_cnt_per_port * 100) + "%"
+        logging.info(f"\nTotal number of receiving ports: {total_receiving_ports}\n"
+                     f"Total packet count: {total_received_packets}\n"
+                     f"Average packet count: {average_packets}\n"
+                     f"Min packets on a port: {min_received_packets}(Ports: {min_received_ports})\n"
+                     f"Max packets on a port: {max_received_packets}(Ports: {max_received_ports})\n"
+                     f"Max deviation: {max_deviation}\n"
+                     f"Max deviation percentage: {max_deviation_percentage}\n")
+
     def runTest(self):
         logging.info("=============Test Start==============")
         hit_count_map = {}
@@ -544,9 +571,9 @@ def runTest(self):
 
             logging.info("Received packet at index {}: {}".format(
                 str(matched_port), re.sub(r"(?<=\w)(?=(?:\w\w)+$)", ' ', received.hex())))
-            time.sleep(0.02)
 
             hit_count_map[matched_port] = hit_count_map.get(matched_port, 0) + 1
         logging.info(f"hash_field={self.hash_field}, hit count map: {hit_count_map}")
+        self.print_result_summary(hit_count_map)
         # Check if the traffic is properly balanced
         self.check_balancing(hit_count_map)

ansible/templates/golden_config_db_t2.j2

@@ -23,8 +23,7 @@
 {% endif %}
 {%- endfor -%}
 {% else %}
-  {
-    "MACSEC_PROFILE": {
+  "MACSEC_PROFILE": {
       "{{macsec_profile}}": {
         "priority": "{{priority}}",
         "cipher_suite": "{{cipher_suite}}",
@@ -34,6 +33,5 @@
         "send_sci": "{{send_sci}}"
       }
     }
-  },
 {%- endif -%}
 }