marge: 合并代码，包名变更be.ems

2024-03-18 15:22:47 +08:00
parent df904f5328
commit 78bd110b03
393 changed files with 7870 additions and 5170 deletions
--- a/features/cm/exec_linux.go
+++ b/features/cm/exec_linux.go
@@ -9,7 +9,7 @@ import (
 	"os/exec"
 	"time"

-	"ems.agt/lib/log"
+	"be.ems/lib/log"
 )

 func ExecCmd(command string) error {
--- a/features/cm/exec_windows.go
+++ b/features/cm/exec_windows.go
@@ -9,7 +9,7 @@ import (
 	"os/exec"
 	"time"

-	"ems.agt/lib/log"
+	"be.ems/lib/log"
 )

 func ExecCmd(command string) error {
--- a/features/cm/license.go
+++ b/features/cm/license.go
@@ -7,11 +7,12 @@ import (
 	"os"
 	"os/exec"
 	"strings"
+	"time"

-	"ems.agt/lib/dborm"
-	"ems.agt/lib/log"
-	"ems.agt/lib/services"
-	"ems.agt/restagent/config"
+	"be.ems/lib/dborm"
+	"be.ems/lib/log"
+	"be.ems/lib/services"
+	"be.ems/restagent/config"

 	"github.com/gorilla/mux"
 )
@@ -153,6 +154,22 @@ func DeleteLcenseFile(w http.ResponseWriter, r *http.Request) {
 	services.ResponseStatusOK204NoContent(w)
 }

+type MMLRequest struct {
+	MML []string `json:"mml"`
+}
+
+var TIME_DELAY_AFTER_WRITE time.Duration = 200
+var TIME_DEAD_LINE time.Duration = 10
+
+func init() {
+	if config.GetYamlConfig().MML.Sleep != 0 {
+		TIME_DELAY_AFTER_WRITE = time.Duration(config.GetYamlConfig().MML.Sleep)
+	}
+	if config.GetYamlConfig().MML.DeadLine != 0 {
+		TIME_DEAD_LINE = time.Duration(config.GetYamlConfig().MML.DeadLine)
+	}
+}
+
 func UploadLicenseFileData(w http.ResponseWriter, r *http.Request) {
 	log.Info("UploadLicenseFileData processing... ")

@@ -207,7 +224,7 @@ func UploadLicenseFileData(w http.ResponseWriter, r *http.Request) {

 	var licenseFileName, comment string

-	// 处理软件rpm/deb文件
+	// 处理license文件
 	if len(licFile) > 0 {
 		file := licFile[0]
 		// 打开文件
@@ -279,39 +296,213 @@ func UploadLicenseFileData(w http.ResponseWriter, r *http.Request) {
 		return
 	}

-	switch neTypeLower {
-	case "omc":
-		restartCmd := fmt.Sprintf("sudo %s/bin/omcsvc.sh restart", config.GetYamlConfig().NE.OmcDir)
-		cmd := exec.Command("ssh", sshHost, restartCmd)
-		out, err := cmd.CombinedOutput()
-		log.Debugf("Exec output: %v", string(out))
-		if err != nil {
-			log.Error("Faile to execute ssh restart omc:", err)
-			services.ResponseInternalServerError500ProcessError(w, err)
-			return
-		}
-	case "ims":
-		restartCmd := "sudo ims-stop && sudo ims-start"
-		cmd := exec.Command("ssh", sshHost, restartCmd)
-		out, err := cmd.CombinedOutput()
-		log.Debugf("Exec output: %v", string(out))
-		if err != nil {
-			log.Error("Faile to execute ssh sudo systemctl command:", err)
-			services.ResponseInternalServerError500ProcessError(w, err)
-			return
-		}
-	default:
-		restartCmd := fmt.Sprintf("sudo systemctl restart %s.service", neTypeLower)
-		cmd := exec.Command("ssh", sshHost, restartCmd)
-		out, err := cmd.CombinedOutput()
-		log.Debugf("Exec output: %v", string(out))
-		if err != nil {
-			log.Error("Faile to execute ssh sudo systemctl command:", err)
-			services.ResponseInternalServerError500ProcessError(w, err)
-			return
-		}
-	}
+	/*
+		// judge license if expired
+		isRestart := false
+		hostUri := fmt.Sprintf("http://%s:%v", neInfo.Ip, neInfo.Port)
+		requestURI2NF := fmt.Sprintf("%s/api/rest/systemManagement/v1/elementType/%s/objectType/systemState",
+			hostUri, neTypeLower)
+		log.Debug("requestURI2NF:", requestURI2NF)

+		resp, err := client.R().
+			EnableTrace().
+			SetHeaders(map[string]string{tokenConst.HEADER_KEY: r.Header.Get(tokenConst.HEADER_KEY)}).
+			//SetHeaders(map[string]string{"accessToken": token}).
+			SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}).
+			SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
+			Get(requestURI2NF)
+		if err != nil {
+			log.Error("Failed to get system state:", err)
+			isRestart = true
+		} else {
+			systemState := make(map[string]interface{})
+			_ = json.Unmarshal(resp.Body(), &systemState)
+			expiryDate := fmt.Sprintf("%v", systemState["expiryDate"])
+			t1_expiry, _ := time.ParseInLocation(time.DateOnly, expiryDate, time.Local)
+			nowDate := time.Now().Local()
+			nowDate.Format(time.DateOnly)
+			isRestart = t1_expiry.Before(nowDate)
+		}
+		// case non-expired license: send NE reload license MML
+		if !isRestart {
+			// send reload license MML
+			var buf [20 * 1024]byte
+			//buf := make([]byte, 0)
+			var n int
+			if neInfo != nil {
+				switch strings.ToLower(neType) {
+				case "ims":
+					hostMML := fmt.Sprintf("%s:%d", neInfo.Ip, config.GetYamlConfig().MML.Port)
+					conn, err := net.Dial("tcp", hostMML)
+					if err != nil {
+						errMsg := fmt.Sprintf("Failed to dial %s: %v", hostMML, err)
+						log.Error(errMsg)
+						services.ResponseInternalServerError500ProcessError(w, err)
+						return
+					}
+					defer conn.Close()
+
+					conn.SetDeadline(time.Now().Add(TIME_DEAD_LINE * time.Second))
+
+					_, err = conn.Write([]byte(config.GetYamlConfig().MML.User + "\r\n"))
+					if err != nil {
+						log.Error("Failed to write:", err)
+						services.ResponseInternalServerError500ProcessError(w, err)
+						return
+					}
+					time.Sleep(time.Millisecond * TIME_DELAY_AFTER_WRITE)
+
+					n, err = conn.Read(buf[0:])
+					if err != nil {
+						log.Error("Failed to read:", err)
+						services.ResponseInternalServerError500ProcessError(w, err)
+						return
+					}
+					log.Trace(string(buf[0:n]))
+
+					_, err = conn.Write([]byte(config.GetYamlConfig().MML.Password + "\r\n"))
+					if err != nil {
+						log.Error("Failed to write:", err)
+						services.ResponseInternalServerError500ProcessError(w, err)
+						return
+					}
+					time.Sleep(time.Millisecond * TIME_DELAY_AFTER_WRITE)
+
+					n, err = conn.Read(buf[0:])
+					if err != nil {
+						log.Error("Failed to read:", err)
+						services.ResponseInternalServerError500ProcessError(w, err)
+						return
+					}
+					log.Trace(string(buf[0 : n-len(neType)-2]))
+
+					mmlCommand := "check lic\r\n"
+
+					_, err = conn.Write([]byte(mmlCommand))
+					if err != nil {
+						log.Error("Failed to write:", err)
+						services.ResponseInternalServerError500ProcessError(w, err)
+						return
+					}
+					time.Sleep(time.Millisecond * TIME_DELAY_AFTER_WRITE)
+
+					n, err = conn.Read(buf[0:])
+					if err != nil {
+						log.Error("Failed to read:", err)
+						services.ResponseInternalServerError500ProcessError(w, err)
+						return
+					}
+					log.Trace(string(buf[0 : n-len(neType)-2]))
+
+					re1 := regexp.MustCompile(`\x1B\[[0-9;]*[a-zA-Z]`) // 匹配包含␛的控制字符
+					//re2 := regexp.MustCompile(`\x00`) // 匹配空字符
+					re2 := regexp.MustCompile(`[\x00-\x08\x0B\x0C\x0E-\x1F\x7F\x1B]`) // 匹配空字符和包含␛的控制字符
+					//re := regexp.MustCompile(`[\x00-\x1F\x7F]`)
+					// upf telnet buffer只能读取一次，需要去掉前面的多余字符
+					result := re1.ReplaceAllString(string(buf[0:n-len(neType)-2]), "")
+					result = re2.ReplaceAllString(result, "")
+					if !strings.Contains(result, "COMMAND OK") {
+						err = fmt.Errorf("failed to check license, %s", result)
+						log.Error(err)
+						services.ResponseInternalServerError500ProcessError(w, err)
+						return
+					}
+				default:
+					hostMML := fmt.Sprintf("%s:%d", neInfo.Ip, config.GetYamlConfig().MML.Port)
+					conn, err := net.Dial("tcp", hostMML)
+					if err != nil {
+						errMsg := fmt.Sprintf("Failed to dial %s: %v", hostMML, err)
+						log.Error(errMsg)
+						services.ResponseInternalServerError500ProcessError(w, err)
+						return
+					}
+					defer conn.Close()
+
+					conn.SetDeadline(time.Now().Add(TIME_DEAD_LINE * time.Second))
+					loginStr := fmt.Sprintf("%s\n%s\n", config.GetYamlConfig().MML.User, config.GetYamlConfig().MML.Password)
+					_, err = conn.Write([]byte(loginStr))
+					if err != nil {
+						log.Error("Failed to write:", err)
+						services.ResponseInternalServerError500ProcessError(w, err)
+						return
+					}
+
+					time.Sleep(time.Millisecond * TIME_DELAY_AFTER_WRITE)
+
+					n, err = conn.Read(buf[0:])
+					if err != nil {
+						log.Error("Failed to read:", err)
+						services.ResponseInternalServerError500ProcessError(w, err)
+						return
+					}
+					log.Trace(string(buf[0:n]))
+
+					mmlCommand := "check lic\n"
+					_, err = conn.Write([]byte(mmlCommand))
+					if err != nil {
+						log.Error("Failed to write:", err)
+						services.ResponseInternalServerError500ProcessError(w, err)
+						return
+					}
+					time.Sleep(time.Millisecond * TIME_DELAY_AFTER_WRITE)
+
+					n, err = conn.Read(buf[0:])
+					if err != nil {
+						log.Error("Failed to read:", err)
+						services.ResponseInternalServerError500ProcessError(w, err)
+						return
+					}
+					log.Trace(string(buf[0 : n-len(neType)-2]))
+					re1 := regexp.MustCompile(`\x1B\[[0-9;]*[a-zA-Z]`) // 匹配包含␛的控制字符
+					//re2 := regexp.MustCompile(`\x00`) // 匹配空字符
+					re2 := regexp.MustCompile(`[\x00-\x08\x0B\x0C\x0E-\x1F\x7F\x1B]`) // 匹配空字符和包含␛的控制字符
+					//re := regexp.MustCompile(`[\x00-\x1F\x7F]`)
+					result := re1.ReplaceAllString(string(buf[0:n-len(neType)-2]), "")
+					result = re2.ReplaceAllString(result, "")
+					if !strings.Contains(result, "COMMAND OK") {
+						err = fmt.Errorf("failed to check license, %s", result)
+						log.Error(err)
+						services.ResponseInternalServerError500ProcessError(w, err)
+						return
+					}
+				}
+			}
+		} else {
+			// case expired license: restart NE service
+			switch neTypeLower {
+			case "omc":
+				restartCmd := fmt.Sprintf("sudo %s/bin/omcsvc.sh restart", config.GetYamlConfig().NE.OmcDir)
+				cmd := exec.Command("ssh", sshHost, restartCmd)
+				out, err := cmd.CombinedOutput()
+				log.Debugf("Exec output: %v", string(out))
+				if err != nil {
+					log.Error("Faile to execute ssh restart omc:", err)
+					services.ResponseInternalServerError500ProcessError(w, err)
+					return
+				}
+			case "ims":
+				restartCmd := "sudo ims-stop && sudo ims-start"
+				cmd := exec.Command("ssh", sshHost, restartCmd)
+				out, err := cmd.CombinedOutput()
+				log.Debugf("Exec output: %v", string(out))
+				if err != nil {
+					log.Error("Faile to execute ssh sudo systemctl command:", err)
+					services.ResponseInternalServerError500ProcessError(w, err)
+					return
+				}
+			default:
+				restartCmd := fmt.Sprintf("sudo systemctl restart %s.service", neTypeLower)
+				cmd := exec.Command("ssh", sshHost, restartCmd)
+				out, err := cmd.CombinedOutput()
+				log.Debugf("Exec output: %v", string(out))
+				if err != nil {
+					log.Error("Faile to execute ssh sudo systemctl command:", err)
+					services.ResponseInternalServerError500ProcessError(w, err)
+					return
+				}
+			}
+		}
+	*/
 	neLicense := dborm.NeLicense{
 		NeType:   neTypeUpper,
 		NeID:     neId,
--- a/features/cm/ne.go
+++ b/features/cm/ne.go
@@ -10,21 +10,19 @@ import (
 	"strings"
 	"time"

-	"ems.agt/lib/dborm"
-	"ems.agt/lib/global"
-	"ems.agt/lib/log"
-	"ems.agt/lib/services"
-	"ems.agt/restagent/config"
-	tokenConst "ems.agt/src/framework/constants/token"
-	neService "ems.agt/src/modules/network_element/service"
+	"be.ems/lib/dborm"
+	"be.ems/lib/global"
+	"be.ems/lib/log"
+	"be.ems/lib/services"
+	"be.ems/restagent/config"
+	tokenConst "be.ems/src/framework/constants/token"
+	neService "be.ems/src/modules/network_element/service"

 	"github.com/go-resty/resty/v2"
 	"github.com/gorilla/mux"
 )

 var (
-	UriParamOmcNeConfig = config.DefaultUriPrefix + "/systemManagement/v1/elementType/%s/objectType/config/omcNeConfig"
-	UriOmcNeConfig      = config.DefaultUriPrefix + "/systemManagement/v1/elementType/omc/objectType/config/omcNeConfig"
 	// NE CM export/import
 	NeCmUri = config.DefaultUriPrefix + "/systemManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/cm"
 	// NE info
@@ -36,11 +34,9 @@ var (
 	// nf instance action uri, action: start/stop/restart
 	UriNeInstance = config.DefaultUriPrefix + "/systemManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/instance/{action}"

-	CustomUriParamOmcNeConfig = config.UriPrefix + "/systemManagement/v1/elementType/%s/objectType/config/omcNeConfig"
-	CustomUriOmcNeConfig      = config.UriPrefix + "/systemManagement/v1/elementType/omc/objectType/config/omcNeConfig"
-	CustomNeCmUri             = config.UriPrefix + "/systemManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/cm"
-	CustomUriNeInfo           = config.UriPrefix + "/systemManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/neInfo"
-	CustomUriNeCmFile         = config.UriPrefix + "/systemManagement/{apiVersion}/{neType}/neBackup/{fileName}"
+	CustomNeCmUri     = config.UriPrefix + "/systemManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/cm"
+	CustomUriNeInfo   = config.UriPrefix + "/systemManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/neInfo"
+	CustomUriNeCmFile = config.UriPrefix + "/systemManagement/{apiVersion}/{neType}/neBackup/{fileName}"
 	// service action uri, action: start/stop/restart
 	CustomUriNeService = config.UriPrefix + "/systemManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/service/{action}"
 	// nf instance action uri, action: start/stop/restart
@@ -170,7 +166,7 @@ func PostNeInfo(w http.ResponseWriter, r *http.Request) {
 	} else {
 		hostUri := global.CombineHostUri(neInfo.Ip, neInfo.Port)
 		//hostUri := fmt.Sprintf("http://%s:%v", neInfo.Ip, neInfo.Port)
-		apiUri := fmt.Sprintf(UriParamOmcNeConfig, strings.ToLower(neInfo.NeType))
+		apiUri := fmt.Sprintf("%s/systemManagement/v1/elementType/%s/objectType/config/omcNeConfig", config.DefaultUriPrefix, strings.ToLower(neInfo.NeType))
 		requestURI2NF := fmt.Sprintf("%s%s", hostUri, apiUri)
 		log.Debug("requestURI2NF:", requestURI2NF)

@@ -280,7 +276,7 @@ func PutNeInfo(w http.ResponseWriter, r *http.Request) {
 	} else {
 		hostUri := global.CombineHostUri(neInfo.Ip, neInfo.Port)
 		//hostUri := fmt.Sprintf("http://%s:%v", neInfo.Ip, neInfo.Port)
-		apiUri := fmt.Sprintf(UriParamOmcNeConfig, neTypeLower)
+		apiUri := fmt.Sprintf("%s/systemManagement/v1/elementType/%s/objectType/config/omcNeConfig", config.DefaultUriPrefix, neTypeLower)
 		requestURI2NF := fmt.Sprintf("%s%s", hostUri, apiUri)
 		log.Debug("requestURI2NF:", requestURI2NF)

@@ -338,28 +334,6 @@ func PutNeInfo(w http.ResponseWriter, r *http.Request) {
 	}
 }

-func PutOMCNeConfig(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-	neType := vars["elementTypeValue"]
-	if neType == "" {
-		log.Error("elementTypeValue is empty")
-		services.ResponseNotFound404UriNotExist(w, r)
-		return
-	}
-	body, err := io.ReadAll(io.LimitReader(r.Body, global.RequestBodyMaxLen))
-	if err != nil {
-		log.Error("Failed to io.ReadAll:", err)
-		services.ResponseNotFound404UriNotExist(w, r)
-		return
-	}
-
-	neInfo := new(dborm.NeInfo)
-	_ = json.Unmarshal(body, neInfo)
-	neInfo.NeType = strings.ToUpper(neType)
-
-	services.ResponseStatusOK204NoContent(w)
-}
-
 func DeleteNeInfo(w http.ResponseWriter, r *http.Request) {
 	log.Debug("DeleteNeInfo processing... ")

--- a/features/cm/param.go
+++ b/features/cm/param.go
@@ -1,18 +1,20 @@
 package cm

 import (
-	"ems.agt/lib/dborm"
-	"ems.agt/lib/global"
-	"ems.agt/lib/log"
-	"ems.agt/lib/services"
-	"ems.agt/restagent/config"
+	"strings"
+
+	"be.ems/lib/dborm"
+	"be.ems/lib/global"
+	"be.ems/lib/log"
+	"be.ems/lib/services"
+	"be.ems/restagent/config"

 	"encoding/json"
 	"fmt"
 	"io"
 	"net/http"

-	tokenConst "ems.agt/src/framework/constants/token"
+	tokenConst "be.ems/src/framework/constants/token"
 	"github.com/go-resty/resty/v2"
 	"github.com/gorilla/mux"
 )
@@ -163,8 +165,14 @@ func PutParamConfigToNF(w http.ResponseWriter, r *http.Request) {
 		services.ResponseNotFound404UriNotExist(w, r)
 		return
 	}
-	neId := services.GetUriParamString(r, "ne_id", ",", false, false)

+	// OMC配置接口 /api/rest/systemManagement/v1/elementType/omc/objectType/config/omcNeConfig
+	if v, ok := vars["paraName"]; ok && v == "omcNeConfig" && strings.ToLower(neType) == "omc" {
+		PutOMCNeConfig(w, r)
+		return
+	}
+
+	neId := services.GetUriParamString(r, "ne_id", ",", false, false)
 	//	no, _ := strconv.ParseInt(neId, 10, 64)
 	neInfo, err := dborm.XormGetNeInfo(neType, neId)
 	if err != nil {
@@ -199,6 +207,31 @@ func PutParamConfigToNF(w http.ResponseWriter, r *http.Request) {
 	services.ResponseWithJson(w, http.StatusNoContent, response)
 }

+// PutOMCNeConfig 网元OMC配置
+//
+// 目前没配置，返回204
+func PutOMCNeConfig(w http.ResponseWriter, r *http.Request) {
+	// vars := mux.Vars(r)
+	// neType := vars["elementTypeValue"]
+	// if neType == "" {
+	// 	log.Error("elementTypeValue is empty")
+	// 	services.ResponseNotFound404UriNotExist(w, r)
+	// 	return
+	// }
+	// body, err := io.ReadAll(io.LimitReader(r.Body, global.RequestBodyMaxLen))
+	// if err != nil {
+	// 	log.Error("Failed to io.ReadAll:", err)
+	// 	services.ResponseNotFound404UriNotExist(w, r)
+	// 	return
+	// }
+
+	// neInfo := new(dborm.NeInfo)
+	// _ = json.Unmarshal(body, neInfo)
+	// neInfo.NeType = strings.ToUpper(neType)
+
+	services.ResponseStatusOK204NoContent(w)
+}
+
 func DeleteParamConfigToNF(w http.ResponseWriter, r *http.Request) {
 	log.Debug("DeleteParamConfigToNF processing... ")

--- a/features/cm/software.go
+++ b/features/cm/software.go
@@ -10,11 +10,11 @@ import (
 	"strconv"
 	"strings"

-	"ems.agt/lib/dborm"
-	"ems.agt/lib/global"
-	"ems.agt/lib/log"
-	"ems.agt/lib/services"
-	"ems.agt/restagent/config"
+	"be.ems/lib/dborm"
+	"be.ems/lib/global"
+	"be.ems/lib/log"
+	"be.ems/lib/services"
+	"be.ems/restagent/config"

 	"github.com/gorilla/mux"
 )