ref: 网元授权激活授权code/change/state接口优化

src/modules/network_element/service/ne_license.go

@@ -29,9 +29,9 @@ type INeLicense interface {
 	SelectByNeTypeAndNeID(neType, neId string) model.NeLicense
 
 	// ReadLicenseInfo 读取授权文件信息
-	// 激活申请码, 激活文件
-	ReadLicenseInfo(neInfo model.NeInfo) (string, string)
+	// 返回激活申请码, 激活文件
+	ReadLicenseInfo(neLicense model.NeLicense) (string, string)
 
-	// UploadToNeHost 授权文件上传到网元主机
-	UploadToNeHost(neLicense model.NeLicense) error
+	// UploadLicense 授权文件上传到网元主机
+	UploadLicense(neLicense model.NeLicense) error
 }

src/modules/network_element/service/ne_license.impl.go

@@ -8,7 +8,6 @@ import (
 	"time"
 
 	"be.ems/src/framework/utils/file"
-	"be.ems/src/framework/utils/ssh"
 	"be.ems/src/modules/network_element/model"
 	"be.ems/src/modules/network_element/repository"
 )
@@ -109,64 +108,84 @@ func (r *NeLicenseImpl) SelectByNeTypeAndNeID(neType, neId string) model.NeLicen
 }
 
 // ReadLicenseInfo 读取授权文件信息
-// 激活申请码, 激活文件
-func (r *NeLicenseImpl) ReadLicenseInfo(neInfo model.NeInfo) (string, string) {
-	neTypeLower := strings.ToLower(neInfo.NeType)
+// 返回激活申请码, 激活文件
+func (r *NeLicenseImpl) ReadLicenseInfo(neLicense model.NeLicense) (string, string) {
+	neTypeLower := strings.ToLower(neLicense.NeType)
 	// 网管本地路径
 	omcPath := "/usr/local/etc/omc/ne_license"
 	if runtime.GOOS == "windows" {
 		omcPath = fmt.Sprintf("C:%s", omcPath)
 	}
-	omcPath = fmt.Sprintf("%s/%s/%s", omcPath, neTypeLower, neInfo.NeId)
+	omcPath = fmt.Sprintf("%s/%s/%s", omcPath, neTypeLower, neLicense.NeId)
 	// 网元端授权文件路径
 	nePath := fmt.Sprintf("/usr/local/etc/%s/license", neTypeLower)
 
-	// 复制授权申请码到本地
-	err := ssh.FileSCPNeToLocal(neInfo.IP, nePath+"/Activation_request_code.txt", omcPath+"/Activation_request_code.txt")
+	// 网元主机的SSH客户端
+	sshclient, err := NewNeInfoImpl.NeRunSSHclient(neLicense.NeType, neLicense.NeId)
 	if err != nil {
 		return "", ""
 	}
+	defer sshclient.Close()
+	// 网元主机的SSH客户端进行文件传输
+	sftpClient, err := sshclient.NewClientSFTP()
+	if err != nil {
+		return "", ""
+	}
+	defer sftpClient.Close()
+
+	// 复制授权申请码到本地
+	if err = sftpClient.CopyFileRemoteToLocal(nePath+"/Activation_request_code.txt", omcPath+"/Activation_request_code.txt"); err != nil {
+		return "", ""
+	}
 	// 读取文件内容
 	bytes, err := os.ReadFile(omcPath + "/Activation_request_code.txt")
 	if err != nil {
 		return "", ""
 	}
 
-	// 激活文件
+	// 复制激活文件到本地
 	licensePath := ""
-	if err = ssh.FileSCPNeToLocal(neInfo.IP, nePath+"/system.ini", omcPath+"/system.ini"); err == nil {
+	if err = sftpClient.CopyFileRemoteToLocal(nePath+"/system.ini", omcPath+"/system.ini"); err == nil {
 		licensePath = omcPath + "/system.ini"
 	}
 	return strings.TrimSpace(string(bytes)), licensePath
 }
 
-// UploadToNeHost 授权文件上传到网元主机
-func (r *NeLicenseImpl) UploadToNeHost(neLicense model.NeLicense) error {
-
+// UploadLicense 授权文件上传到网元主机
+func (r *NeLicenseImpl) UploadLicense(neLicense model.NeLicense) error {
 	// 检查文件是否存在
 	omcLicensePath := file.ParseUploadFilePath(neLicense.LicensePath)
 	if _, err := os.Stat(omcLicensePath); err != nil {
 		return fmt.Errorf("file read failure")
 	}
 
-	// 检查网元主机
-	neHostInfo := NewNeHostImpl.SelectById(neLicense.HostId)
-	if neHostInfo.HostType != "ssh" || neHostInfo.HostID != neLicense.HostId {
-		return fmt.Errorf("no found host info")
-	}
-
 	// 网元端授权文件路径
 	neTypeLower := strings.ToLower(neLicense.NeType)
 	neLicensePath := fmt.Sprintf("/usr/local/etc/%s/license", neTypeLower)
 	// 修改文件夹权限
 	NewNeInfoImpl.NeRunCMD(neLicense.NeType, neLicense.NeId, fmt.Sprintf("sudo chmod o+w %s/", neLicensePath))
+	NewNeInfoImpl.NeRunCMD(neLicense.NeType, neLicense.NeId, fmt.Sprintf("sudo chmod o+w %s/system.ini", neLicensePath))
 	// 尝试备份授权文件
 	neLicensePathBack := fmt.Sprintf("%s/system_%s.ini", neLicensePath, time.Now().Format("20060102_150405"))
 	NewNeInfoImpl.NeRunCMD(neLicense.NeType, neLicense.NeId, fmt.Sprintf("sudo cp -rf %s/system.ini %s", neLicensePath, neLicensePathBack))
+
+	// 网元主机的SSH客户端
+	sshclient, err := NewNeInfoImpl.NeRunSSHclient(neLicense.NeType, neLicense.NeId)
+	if err != nil {
+		return err
+	}
+	defer sshclient.Close()
+	// 网元主机的SSH客户端进行文件传输
+	sftpClient, err := sshclient.NewClientSFTP()
+	if err != nil {
+		return err
+	}
+	defer sftpClient.Close()
+
 	// 上传授权文件去覆盖
-	NewNeInfoImpl.NeRunCMD(neLicense.NeType, neLicense.NeId, fmt.Sprintf("sudo chmod o+w %s/system.ini", neLicensePath))
-	if err := ssh.FileSCPLocalToNe(neHostInfo.Addr, omcLicensePath, neLicensePath+"/system.ini"); err != nil {
-		return fmt.Errorf("error uploading license")
+	err = sftpClient.CopyFileLocalToRemote(omcLicensePath, neLicensePath+"/system.ini")
+	if err != nil {
+		return err
 	}
 
 	// 重启服务