ut sonic-net#1

Author: NavdhaJindal

tests/test_vnet.py

@@ -3275,6 +3275,65 @@ def test_vnet_orch_32(self, dvs, testlog):
         self.remove_ip_address("Ethernet12", "9.1.0.4/32")
         self.set_admin_status("Ethernet12", "down")
 
+    '''
+    Test 33 - Test for vnet tunnel routes with fine-grained ECMP using consistent_hashing_buckets
+    '''
+    def test_vnet_orch_33(self, dvs, testlog):
+        vnet_obj = self.get_vnet_obj()
+
+        self.setup_db(dvs)
+
+        tunnel_name = 'tunnel_33'
+        vnet_name = 'Vnet33'
+
+        vnet_obj.fetch_exist_entries(dvs)
+
+        # Create VxLAN tunnel
+        create_vxlan_tunnel(dvs, tunnel_name, '10.10.10.10')
+        create_vnet_entry(dvs, vnet_name, tunnel_name, '10033', "")
+
+        vnet_obj.check_vnet_entry(dvs, vnet_name)
+        vnet_obj.check_vxlan_tunnel_entry(dvs, tunnel_name, vnet_name, '10033')
+        vnet_obj.check_vxlan_tunnel(dvs, tunnel_name, '10.10.10.10')
+
+        vnet_obj.fetch_exist_entries(dvs)
+
+        # Create VNET route with consistent_hashing_buckets for fine-grained ECMP
+        bucket_size = 120
+        create_vnet_routes(dvs, "100.100.33.0/24", vnet_name, '33.0.0.1,33.0.0.2,33.0.0.3', 
+                          consistent_hashing_buckets=bucket_size)
+
+        # Verify the route is created with fine-grained ECMP
+        route, nhgid = vnet_obj.check_vnet_fine_grained_ecmp_routes(dvs, vnet_name, 
+                                                                      ['33.0.0.1', '33.0.0.2', '33.0.0.3'], 
+                                                                      tunnel_name, bucket_size)
+        
+        check_state_db_routes(dvs, vnet_name, "100.100.33.0/24", ['33.0.0.1', '33.0.0.2', '33.0.0.3'])
+        check_remove_routes_advertisement(dvs, "100.100.33.0/24")
+
+        # Update route with different endpoints while keeping fine-grained ECMP
+        vnet_obj.fetch_exist_entries(dvs)
+        set_vnet_routes(dvs, "100.100.33.0/24", vnet_name, '33.0.0.1,33.0.0.2,33.0.0.3,33.0.0.4', 
+                       consistent_hashing_buckets=bucket_size)
+        
+        route, nhgid = vnet_obj.check_vnet_fine_grained_ecmp_routes(dvs, vnet_name, 
+                                                                      ['33.0.0.1', '33.0.0.2', '33.0.0.3', '33.0.0.4'], 
+                                                                      tunnel_name, bucket_size, route_ids=route)
+        
+        check_state_db_routes(dvs, vnet_name, "100.100.33.0/24", ['33.0.0.1', '33.0.0.2', '33.0.0.3', '33.0.0.4'])
+        check_remove_routes_advertisement(dvs, "100.100.33.0/24")
+
+        # Clean up
+        vnet_obj.fetch_exist_entries(dvs)
+        delete_vnet_routes(dvs, "100.100.33.0/24", vnet_name)
+        vnet_obj.check_del_vnet_routes(dvs, vnet_name, ["100.100.33.0/24"])
+        check_remove_state_db_routes(dvs, vnet_name, "100.100.33.0/24")
+        check_remove_routes_advertisement(dvs, "100.100.33.0/24")
+
+        delete_vnet_entry(dvs, vnet_name)
+        vnet_obj.check_del_vnet_entry(dvs, vnet_name)
+        delete_vxlan_tunnel(dvs, tunnel_name)
+
 # Add Dummy always-pass test at end as workaroud
 # for issue when Flaky fail on final test it invokes module tear-down before retrying
 def test_nonflaky_dummy():

tests/vnet_lib.py

@@ -140,11 +140,11 @@ def delete_vnet_local_routes(dvs, prefix, vnet_name):
     time.sleep(2)
 
 
-def create_vnet_routes(dvs, prefix, vnet_name, endpoint, mac="", vni=0, ep_monitor="", profile="", primary="", monitoring="", rx_monitor_timer=-1, tx_monitor_timer=-1, adv_prefix="", check_directly_connected=False):
-    set_vnet_routes(dvs, prefix, vnet_name, endpoint, mac=mac, vni=vni, ep_monitor=ep_monitor, profile=profile, primary=primary, monitoring=monitoring, rx_monitor_timer=rx_monitor_timer, tx_monitor_timer=tx_monitor_timer, adv_prefix=adv_prefix, check_directly_connected=check_directly_connected)
+def create_vnet_routes(dvs, prefix, vnet_name, endpoint, mac="", vni=0, ep_monitor="", profile="", primary="", monitoring="", rx_monitor_timer=-1, tx_monitor_timer=-1, adv_prefix="", check_directly_connected=False, consistent_hashing_buckets=0):
+    set_vnet_routes(dvs, prefix, vnet_name, endpoint, mac=mac, vni=vni, ep_monitor=ep_monitor, profile=profile, primary=primary, monitoring=monitoring, rx_monitor_timer=rx_monitor_timer, tx_monitor_timer=tx_monitor_timer, adv_prefix=adv_prefix, check_directly_connected=check_directly_connected, consistent_hashing_buckets=consistent_hashing_buckets)
 
 
-def set_vnet_routes(dvs, prefix, vnet_name, endpoint, mac="", vni=0, ep_monitor="", profile="", primary="", monitoring="", rx_monitor_timer=-1, tx_monitor_timer=-1, adv_prefix="", check_directly_connected=False):
+def set_vnet_routes(dvs, prefix, vnet_name, endpoint, mac="", vni=0, ep_monitor="", profile="", primary="", monitoring="", rx_monitor_timer=-1, tx_monitor_timer=-1, adv_prefix="", check_directly_connected=False, consistent_hashing_buckets=0):
     conf_db = swsscommon.DBConnector(swsscommon.CONFIG_DB, dvs.redis_sock, 0)
 
     attrs = [
@@ -181,6 +181,9 @@ def set_vnet_routes(dvs, prefix, vnet_name, endpoint, mac="", vni=0, ep_monitor=
     if tx_monitor_timer != -1:
         attrs.append(('tx_monitor_timer', str(tx_monitor_timer)))
 
+    if consistent_hashing_buckets > 0:
+        attrs.append(('consistent_hashing_buckets', str(consistent_hashing_buckets)))
+
     tbl = swsscommon.Table(conf_db, "VNET_ROUTE_TUNNEL")
     fvs = swsscommon.FieldValuePairs(attrs)
     tbl.set("%s|%s" % (vnet_name, prefix), fvs)
@@ -1222,6 +1225,71 @@ def check_vnet_ecmp_routes(self, dvs, name, endpoints, tunnel, mac=[], vni=[], r
 
         return new_route, new_nhg
 
+    def check_vnet_fine_grained_ecmp_routes(self, dvs, name, endpoints, tunnel, bucket_size, route_ids=[], mac=[], vni=[]):
+        asic_db = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sock, 0)
+        
+        vr_ids = self.vnet_route_ids(dvs, name)
+        count = len(vr_ids)
+
+        # Validate that next hop group is of type FINE_GRAIN_ECMP
+        if route_ids:
+            new_route = route_ids
+        else:
+            new_route = get_created_entries(asic_db, self.ASIC_ROUTE_ENTRY, self.routes, count)
+
+        # Get the next hop group ID from the route
+        fvs = asic_db.get_entry(self.ASIC_ROUTE_ENTRY, new_route[0])
+        nhgid = fvs.get("SAI_ROUTE_ENTRY_ATTR_NEXT_HOP_ID")
+        assert nhgid, "Next hop group ID not found"
+
+        # Check that the next hop group is of type FINE_GRAIN_ECMP
+        nhg_fvs = asic_db.get_entry(self.ASIC_NEXT_HOP_GROUP, nhgid)
+        nhg_type = nhg_fvs.get("SAI_NEXT_HOP_GROUP_ATTR_TYPE")
+        assert nhg_type == "SAI_NEXT_HOP_GROUP_TYPE_FINE_GRAIN_ECMP", f"Expected FINE_GRAIN_ECMP, got {nhg_type}"
+        
+        # Check that configured size matches bucket_size
+        nhg_cfg_size = nhg_fvs.get("SAI_NEXT_HOP_GROUP_ATTR_CONFIGURED_SIZE")
+        assert int(nhg_cfg_size) == bucket_size, f"Expected bucket size {bucket_size}, got {nhg_cfg_size}"
+
+        # Check that next hop group members exist and match bucket size
+        nhg_members = asic_db.get_keys(self.ASIC_NEXT_HOP_GROUP_MEMBER)
+        member_count = 0
+        for member in nhg_members:
+            fvs = asic_db.get_entry(self.ASIC_NEXT_HOP_GROUP_MEMBER, member)
+            if fvs.get("SAI_NEXT_HOP_GROUP_MEMBER_ATTR_NEXT_HOP_GROUP_ID") == nhgid:
+                member_count += 1
+        
+        assert member_count == bucket_size, f"Expected {bucket_size} members, found {member_count}"
+
+        # Verify endpoints are properly configured
+        expected_attrs = {}
+        for idx, endpoint in enumerate(endpoints):
+            expected_attr = {
+                        "SAI_NEXT_HOP_ATTR_TYPE": "SAI_NEXT_HOP_TYPE_TUNNEL_ENCAP",
+                        "SAI_NEXT_HOP_ATTR_IP": endpoint,
+                        "SAI_NEXT_HOP_ATTR_TUNNEL_ID": self.tunnel[tunnel],
+                    }
+            if vni and vni[idx]:
+                expected_attr.update({'SAI_NEXT_HOP_ATTR_TUNNEL_VNI': vni[idx]})
+            if mac and mac[idx]:
+                expected_attr.update({'SAI_NEXT_HOP_ATTR_TUNNEL_MAC': mac[idx]})
+            expected_attrs[endpoint] = expected_attr
+
+        # Verify routes are in correct VRF
+        asic_vrs = set()
+        for idx in range(count):
+            check_object(asic_db, self.ASIC_ROUTE_ENTRY, new_route[idx],
+                        {
+                            "SAI_ROUTE_ENTRY_ATTR_NEXT_HOP_ID": nhgid,
+                        })
+            rt_key = json.loads(new_route[idx])
+            asic_vrs.add(rt_key['vr'])
+
+        assert asic_vrs == vr_ids
+        self.routes.update(new_route)
+
+        return new_route, nhgid
+
     def check_priority_vnet_ecmp_routes(self, dvs, name, endpoints_primary, tunnel, mac=[], vni=[], route_ids=[], count =1, prefix =""):
         asic_db = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sock, 0)
         endpoint_str_primary = name + "|" + self.serialize_endpoint_group(endpoints_primary)