incus/server/device/nic_routed/go: Added host_tables

signed-off-by: avipatel805 <[email protected]>

Author: avipatel805

internal/server/device/nic_routed.go

@@ -193,14 +193,16 @@ func (d *nicRouted) validateConfig(instConf instance.ConfigReader) error {
 		//  type: integer
 		//  shortdesc: The custom policy routing table ID to add IPv4 static routes to (in addition to the main routing table)
 
-		"ipv4.host_table",
+		"ipv4.host_table", // deprecated
 		// gendoc:generate(entity=devices, group=nic_routed, key=ipv6.host_table)
 		//
 		// ---
 		//  type: integer
 		//  shortdesc: The custom policy routing table ID to add IPv6 static routes to (in addition to the main routing table)
 
-		"ipv6.host_table",
+		"ipv6.host_table", // deprecated
+		"ipv4.host_tables",
+		"ipv6.host_tables",
 		// gendoc:generate(entity=devices, group=nic_routed, key=gvrp)
 		//
 		// ---
@@ -241,6 +243,10 @@ func (d *nicRouted) validateConfig(instConf instance.ConfigReader) error {
 	//  shortdesc: Comma-delimited list of IPv6 static addresses to add to the instance
 	rules["ipv6.address"] = validate.Optional(validate.IsListOf(validate.IsNetworkAddressV6))
 
+	rules["ipv4.host_tables"] = validate.Optional(validate.IsListOf(validate.IsInRange(0, 255)))
+
+	rules["ipv6.host_tables"] = validate.Optional(validate.IsListOf(validate.IsInRange(0, 255)))
+
 	rules["gvrp"] = validate.Optional(validate.IsBool)
 
 	// gendoc:generate(entity=devices, group=nic_routed, key=ipv4.neighbor_probe)
@@ -584,36 +590,53 @@ func (d *nicRouted) Start() (*deviceConfig.RunConfig, error) {
 			}
 		}
 
-		table := "main"
-		if d.config["vrf"] != "" {
-			table = ""
+		getTables := func() []string {
+			// New plural form ­– honour exactly what the user gives.
+			if v := d.config[fmt.Sprintf("%s.hosttables", keyPrefix)]; v != "" {
+				tbls := util.SplitNTrimSpace(v, ",", -1, true)
+				return tbls
+			}
+
+			// Legacy – single key: include it plus 254.
+			if v := d.config[fmt.Sprintf("%s.host_table", keyPrefix)]; v != "" {
+				if v == "254" {
+					return []string{"254"} // user asked for main only
+				}
+
+				return []string{v, "254"} // custom + main
+			}
+
+			// Default – main only.
+			return []string{"254"}
 		}
 
+		tables := getTables()
+
 		// Perform per-address host-side configuration (static routes and neighbour proxy entries).
 		for _, addrStr := range addresses {
 			// Apply host-side static routes to main routing table or VRF.
-			r := ip.Route{
-				DevName: saveData["host_name"],
-				Route:   fmt.Sprintf("%s/%d", addrStr, subnetSize),
-				Table:   table,
-				Family:  ipFamilyArg,
-				VRF:     d.config["vrf"],
-			}
+			// If a VRF is set we still add a route into the VRF's own table (empty Table value).
+			if d.config["vrf"] != "" {
+				r := ip.Route{
+					DevName: saveData["host_name"],
+					Route:   fmt.Sprintf("%s/%d", addrStr, subnetSize),
+					Table:   "",
+					Family:  ipFamilyArg,
+					VRF:     d.config["vrf"],
+				}
 
-			err = r.Add()
-			if err != nil {
-				return nil, fmt.Errorf("Failed adding host route %q: %w", r.Route, err)
+				err = r.Add()
+				if err != nil {
+					return nil, fmt.Errorf("Failed adding host route %q: %w", r.Route, err)
+				}
 			}
 
-			// Add host-side static routes to instance IPs to custom routing table if specified.
-			// This is in addition to the static route added to the main routing table, which is still
-			// critical to ensure that reverse path filtering doesn't kick in blocking traffic from
-			// the instance.
-			if d.config[fmt.Sprintf("%s.host_table", keyPrefix)] != "" {
+			// Add routes to all requested tables.
+			for _, tbl := range tables {
 				r := ip.Route{
 					DevName: saveData["host_name"],
 					Route:   fmt.Sprintf("%s/%d", addrStr, subnetSize),
-					Table:   d.config[fmt.Sprintf("%s.host_table", keyPrefix)],
+					Table:   tbl,
 					Family:  ipFamilyArg,
 				}
 
@@ -651,7 +674,7 @@ func (d *nicRouted) Start() (*deviceConfig.RunConfig, error) {
 				r := ip.Route{
 					DevName: saveData["host_name"],
 					Route:   routeStr,
-					Table:   table,
+					Table:   "",
 					Family:  ipFamilyArg,
 					Via:     addresses[0],
 					VRF:     d.config["vrf"],
@@ -720,7 +743,6 @@ func (d *nicRouted) Start() (*deviceConfig.RunConfig, error) {
 	}
 
 	reverter.Success()
-
 	return &runConf, nil
 }