From 1eb78009ce36e88053645c32bd662f7212d789f4 Mon Sep 17 00:00:00 2001
From: NightRain233 <434782114@qq.com>
Date: Tue, 22 Aug 2023 14:46:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=B8=E9=87=91=E5=B1=9E=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AEmac=E5=9C=B0=E5=9D=80=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E7=BD=91=E5=8D=A1=20(#31)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: 郑守迪 <davis.zheng@ucloud.cn>
---
 pkg/iputils/addr.go | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkg/iputils/addr.go b/pkg/iputils/addr.go
index 1178553..70aee74 100644
--- a/pkg/iputils/addr.go
+++ b/pkg/iputils/addr.go
@@ -41,19 +41,22 @@ func GetMasterInterface() string {
 		return UHostMasterInterface
 	}
 
-	var targetInterface string
-	if strings.HasPrefix(meta.InstanceId, "upm") {
-		targetInterface = UPHostMasterInterface
+	var targetMac string
+	// 裸金属根据mac地址匹配网卡
+	if strings.HasPrefix(meta.InstanceId, "upm") && len(meta.UPHost.NetworkInterfaces) > 0 {
+		mac := meta.UPHost.NetworkInterfaces[0].Mac
+		targetMac = strings.ToLower(mac)
 	} else {
-		targetInterface = UHostMasterInterface
+		// 云主机直接返回eth0
+		return UHostMasterInterface
 	}
 
 	for _, iface := range list {
-		if iface.Name == targetInterface {
-			return targetInterface
+		if iface.HardwareAddr.String() == targetMac {
+			return iface.Name
 		}
 	}
-	return targetInterface
+	return UPHostMasterInterface
 }
 
 // Get node master network interface ip and mac address