fix: dhcpv6 support, phase 2 (#22851)

Co-authored-by: Qiu Jian <qiujian@yunionyun.com>

Author: swordqiu

pkg/baremetal/manager.go

@@ -1040,31 +1040,37 @@ func (b *SBaremetalInstance) GetIPMINicIPAddr() string {
 func (b *SBaremetalInstance) GetDHCPConfig(cliMac net.HardwareAddr) (*dhcp.ResponseConfig, error) {
 	var nic *types.SNic
 	var hostname string
+	var osName string
 	if b.GetServer() != nil && (b.GetTask() == nil || !b.GetTask().NeedPXEBoot()) {
 		nic = b.GetServer().GetNicByMac(cliMac)
-		hostname = b.GetServer().GetName()
+		hostname = b.GetServer().GetHostName()
+		osName = b.GetServer().GetOsName()
 	} else {
 		nic = b.GetNicByMac(cliMac)
 	}
 	if nic == nil {
 		return nil, fmt.Errorf("GetNicDHCPConfig no nic found by mac: %s", cliMac)
 	}
-	return b.getDHCPConfig(nic, hostname, false, 0)
+	return b.getDHCPConfig(nic, hostname, false, 0, osName)
 }
 
 func (b *SBaremetalInstance) GetPXEDHCPConfig(arch uint16) (*dhcp.ResponseConfig, error) {
-	return b.getDHCPConfig(b.GetAdminNic(), "", true, arch)
+	return b.getDHCPConfig(b.GetAdminNic(), "", true, arch, "Linux")
 }
 
 func (b *SBaremetalInstance) getDHCPConfig(
 	nic *types.SNic,
 	hostName string,
 	isPxe bool,
 	arch uint16,
+	osName string,
 ) (*dhcp.ResponseConfig, error) {
 	if hostName == "" {
 		hostName = b.GetName()
 	}
+	if osName == "" {
+		osName = "Linux"
+	}
 	serverIP, err := b.manager.Agent.GetDHCPServerIP()
 	if err != nil {
 		return nil, err
@@ -1078,7 +1084,7 @@ func (b *SBaremetalInstance) getDHCPConfig(
 			return nil, errors.Errorf("Baremetal %s not need UEFI PXE boot", b.GetName())
 		}
 	}
-	return GetNicDHCPConfig(nic, serverIP.String(), hostName, isPxe, arch)
+	return GetNicDHCPConfig(nic, serverIP, b.manager.Agent.ListenInterface.HardwareAddr, hostName, isPxe, arch, osName)
 }
 
 func (b *SBaremetalInstance) GetNotifyUrl() string {
@@ -2550,6 +2556,22 @@ func (server *SBaremetalServer) GetName() string {
 	return id
 }
 
+func (server *SBaremetalServer) GetHostName() string {
+	hostname, err := server.desc.GetString("hostname")
+	if err != nil {
+		log.Errorf("Get hostname from desc %s error: %v", server.desc.String(), err)
+	}
+	return hostname
+}
+
+func (server *SBaremetalServer) GetOsName() string {
+	osName, err := server.desc.GetString("os_name")
+	if err != nil {
+		log.Errorf("Get os name from desc %s error: %v", server.desc.String(), err)
+	}
+	return osName
+}
+
 func (server *SBaremetalServer) SaveDesc(desc jsonutils.JSONObject) error {
 	if desc != nil {
 		server.desc = desc.(*jsonutils.JSONDict)

pkg/baremetal/nic.go

@@ -15,14 +15,15 @@
 package baremetal
 
 import (
-	"fmt"
 	"net"
 	"os"
 	"path/filepath"
 	"strings"
 	"time"
 
+	"yunion.io/x/pkg/errors"
 	"yunion.io/x/pkg/util/netutils"
+	"yunion.io/x/pkg/util/regutils"
 
 	o "yunion.io/x/onecloud/pkg/baremetal/options"
 	"yunion.io/x/onecloud/pkg/cloudcommon/types"
@@ -31,68 +32,127 @@ import (
 
 func GetNicDHCPConfig(
 	n *types.SNic,
-	serverIP string,
+	serverIP net.IP,
+	serverMac net.HardwareAddr,
 	hostName string,
 	isPxe bool,
 	arch uint16,
+	osName string,
 ) (*dhcp.ResponseConfig, error) {
 	if n == nil {
-		return nil, fmt.Errorf("Nic is nil")
+		return nil, errors.Wrap(errors.ErrEmpty, "Nic is nil")
 	}
-	if n.IpAddr == "" {
-		return nil, fmt.Errorf("Nic no ip address")
+	if n.IpAddr == "" && n.Ip6Addr == "" {
+		return nil, errors.Wrap(errors.ErrEmpty, "Nic no ip or ip6 address")
 	}
-	ipAddr, err := netutils.NewIPV4Addr(n.IpAddr)
-	if err != nil {
-		return nil, fmt.Errorf("Parse IP address error: %q", n.IpAddr)
+
+	routes4 := make([]dhcp.SRouteInfo, 0)
+	routes6 := make([]dhcp.SRouteInfo, 0)
+	for _, route := range n.Routes {
+		routeInfo, err := dhcp.ParseRouteInfo([]string{route[0], route[1]})
+		if err != nil {
+			return nil, errors.Wrapf(err, "Parse route %s error: %q", route, err)
+		}
+		if regutils.MatchCIDR6(route[0]) {
+			routes6 = append(routes6, *routeInfo)
+		} else {
+			routes4 = append(routes4, *routeInfo)
+		}
 	}
 
-	subnetMask := net.ParseIP(netutils.Masklen2Mask(n.Masklen).String())
+	if n.IsDefault == nil || *n.IsDefault {
+		if n.Gateway != "" && !strings.HasPrefix(strings.ToLower(osName), "win") {
+			routes4 = append(routes4, dhcp.SRouteInfo{
+				Prefix:    net.ParseIP("0.0.0.0"),
+				PrefixLen: 0,
+				Gateway:   net.ParseIP(n.Gateway),
+			})
+		}
+		if n.Gateway6 != "" {
+			routes6 = append(routes6, dhcp.SRouteInfo{
+				Prefix:    net.ParseIP("::"),
+				PrefixLen: 0,
+				Gateway:   net.ParseIP(n.Gateway6),
+			})
+		}
+	}
 
-	routes := make([][]string, 0)
-	for _, route := range n.Routes {
-		routes = append(routes, []string{route[0], route[1]})
+	conf := &dhcp.ResponseConfig{
+		InterfaceMac: serverMac,
+
+		ServerIP:    serverIP,
+		Domain:      n.Domain,
+		OsName:      osName,
+		Hostname:    strings.ToLower(hostName),
+		Routes:      routes4,
+		Routes6:     routes6,
+		LeaseTime:   time.Duration(o.Options.DhcpLeaseTime) * time.Second,
+		RenewalTime: time.Duration(o.Options.DhcpRenewalTime) * time.Second,
 	}
 
-	parseIPs := func(ips string) []net.IP {
-		ret := make([]net.IP, 0)
-		iplist := strings.Split(ips, ",")
-		for _, ip := range iplist {
-			ret = append(ret, net.ParseIP(ip))
+	if n.IpAddr != "" {
+		ipAddr, err := netutils.NewIPV4Addr(n.IpAddr)
+		if err != nil {
+			return nil, errors.Wrapf(err, "Parse IP address error: %q", n.IpAddr)
 		}
-		return ret
+
+		subnetMask := net.ParseIP(netutils.Masklen2Mask(n.Masklen).String())
+
+		conf.ClientIP = net.ParseIP(ipAddr.String())
+		conf.SubnetMask = subnetMask
+		conf.BroadcastAddr = net.ParseIP(ipAddr.BroadcastAddr(n.Masklen).String())
+		conf.Gateway = net.ParseIP(n.Gateway)
+	}
+	if n.Ip6Addr != "" {
+		ipAddr6, err := netutils.NewIPV6Addr(n.Ip6Addr)
+		if err != nil {
+			return nil, errors.Wrapf(err, "Parse IPv6 address error: %q", n.Ip6Addr)
+		}
+
+		conf.ClientIP6 = net.ParseIP(ipAddr6.String())
+		conf.PrefixLen6 = n.Masklen6
+		conf.Gateway6 = net.ParseIP(n.Gateway6)
 	}
 
-	parseDomains := func(domains string) []net.IP {
-		ret := make([]net.IP, 0)
-		domainlist := strings.Split(domains, ",")
-		for _, domain := range domainlist {
-			addrs, _ := net.LookupHost(domain)
-			for _, addr := range addrs {
-				ret = append(ret, net.ParseIP(addr))
+	if len(n.Dns) > 0 {
+		conf.DNSServers = make([]net.IP, 0)
+		conf.DNSServers6 = make([]net.IP, 0)
+		for _, dns := range strings.Split(n.Dns, ",") {
+			if regutils.MatchIP4Addr(dns) {
+				conf.DNSServers = append(conf.DNSServers, net.ParseIP(dns))
+			} else if regutils.MatchIP6Addr(dns) {
+				conf.DNSServers6 = append(conf.DNSServers6, net.ParseIP(dns))
 			}
 		}
-		return ret
 	}
 
-	conf := &dhcp.ResponseConfig{
-		ServerIP:      net.ParseIP(serverIP),
-		ClientIP:      net.ParseIP(ipAddr.String()),
-		Gateway:       net.ParseIP(n.Gateway),
-		SubnetMask:    subnetMask,
-		BroadcastAddr: net.ParseIP(ipAddr.BroadcastAddr(n.Masklen).String()),
-		DNSServers:    parseIPs(n.Dns),
-		NTPServers:    parseDomains(n.Ntp),
-		Domain:        n.Domain,
-		OsName:        "Linux",
-		Hostname:      hostName,
-		Routes:        routes,
-		LeaseTime:     time.Duration(o.Options.DhcpLeaseTime) * time.Second,
-		RenewalTime:   time.Duration(o.Options.DhcpRenewalTime) * time.Second,
+	if len(n.Ntp) > 0 {
+		conf.NTPServers = make([]net.IP, 0)
+		conf.NTPServers6 = make([]net.IP, 0)
+		for _, ntp := range strings.Split(n.Ntp, ",") {
+			if regutils.MatchIP4Addr(ntp) {
+				conf.NTPServers = append(conf.NTPServers, net.ParseIP(ntp))
+			} else if regutils.MatchIP6Addr(ntp) {
+				conf.NTPServers6 = append(conf.NTPServers6, net.ParseIP(ntp))
+			} else if regutils.MatchDomainName(ntp) {
+				ntpAddrs, _ := net.LookupHost(ntp)
+				for _, ntpAddr := range ntpAddrs {
+					if regutils.MatchIP4Addr(ntpAddr) {
+						conf.NTPServers = append(conf.NTPServers, net.ParseIP(ntpAddr))
+					} else if regutils.MatchIP6Addr(ntpAddr) {
+						conf.NTPServers6 = append(conf.NTPServers6, net.ParseIP(ntpAddr))
+					}
+				}
+			}
+		}
+	}
+
+	if n.Mtu > 0 {
+		conf.MTU = uint16(n.Mtu)
 	}
 
 	if isPxe {
-		conf.BootServer = serverIP
+		conf.BootServer = serverIP.String()
 		if len(o.Options.TftpBootServer) > 0 {
 			conf.BootServer = o.Options.TftpBootServer
 		}

pkg/baremetal/types/types.go

@@ -41,4 +41,7 @@ type IBaremetalServer interface {
 	GetNicByMac(mac net.HardwareAddr) *types.SNic
 
 	GetRootTemplateId() string
+
+	GetHostName() string
+	GetOsName() string
 }

pkg/cloudcommon/types/nic.go

@@ -52,6 +52,8 @@ type SNic struct {
 	Bandwidth int `json:"bandwidth"`
 
 	Index int `json:"index"`
+
+	IsDefault *bool `json:"is_default"`
 }
 
 type SRoute []string
@@ -132,5 +134,7 @@ func (n SServerNic) ToNic() SNic {
 		Ip6Addr:  n.Ip6,
 		Masklen6: uint8(n.Masklen6),
 		Gateway6: n.Gateway6,
+
+		IsDefault: &n.IsDefault,
 	}
 }