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/mml/mml.go
+++ b/features/mml/mml.go
@@ -10,20 +10,21 @@ import (
 	"strings"
 	"time"

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

-	tokenConst "ems.agt/src/framework/constants/token"
+	tokenConst "be.ems/src/framework/constants/token"
 	"github.com/gorilla/mux"
 )

 // const (
 // 	//经过测试，linux下，延时需要大于100ms
 // 	TIME_DELAY_AFTER_WRITE = 200
+// 	TIME_DEAD_LINE         = 10
 // )

 type Response struct {
@@ -37,25 +38,150 @@ type MMLRequest struct {
 var (
 	// MML interface
 	UriMML        = config.DefaultUriPrefix + "/operationManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/mml"
+	UriMML2       = config.DefaultUriPrefix + "/operationManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/mml2"
 	UriMMLDiscard = config.DefaultUriPrefix + "/opeartionManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/mml"
 	UriNeOmMml    = config.DefaultUriPrefix + "/omManagement/{apiVersion}/mml/{netype}/{neid}"
 	UriOmMmlExt   = config.DefaultUriPrefix + "/{managedType}/{apiVersion}/elementType/OMC/objectType/mml"
 	UriOmMmlInt   = config.DefaultUriPrefix + "/omManagement/{apiVersion}/mml/{neType}/{neId}"

 	CustomUriMML      = config.UriPrefix + "/operationManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/mml"
+	CustomUriMML2     = config.UriPrefix + "/operationManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/mml2"
 	CustomUriNeOmMml  = config.UriPrefix + "/omManagement/{apiVersion}/mml/{netype}/{neid}"
 	CustomUriOmMmlExt = config.UriPrefix + "/opeartionManagement/{apiVersion}/elementType/OMC/objectType/mml"
 	CustomUriOmMmlInt = config.UriPrefix + "/omManagement/{apiVersion}/mml/{neType}/{neId}"
 )

-// 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)
-// 	}
-// }
+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 PostMML2ToNF(w http.ResponseWriter, r *http.Request) {
+	log.Info("PostMML2ToNF processing... ")
+
+	vars := mux.Vars(r)
+	neType := vars["elementTypeValue"]
+	neInfo := new(dborm.NeInfo)
+	params := r.URL.Query()
+	neId := params["ne_id"]
+	neInfo, err := dborm.XormGetNeInfo(neType, neId[0])
+	if err != nil {
+		log.Error("Failed to dborm.XormGetNeInfo:", err)
+		services.ResponseInternalServerError500ProcessError(w, err)
+		return
+	}
+
+	var buf [20 * 1024]byte
+	//buf := make([]byte, 0)
+	var n int
+	var mmlResult []string
+	port2 := 5002
+	if config.GetYamlConfig().MML.Port2 != 0 {
+		port2 = config.GetYamlConfig().MML.Port2
+	}
+
+	if neInfo != nil {
+		hostMML := fmt.Sprintf("%s:%d", neInfo.Ip, port2)
+		conn, err := net.Dial("tcp", hostMML)
+		if err != nil {
+			errMsg := fmt.Sprintf("Failed to dial %s: %v", hostMML, err)
+			log.Error(errMsg)
+			mmlResult = append(mmlResult, errMsg)
+			response := Response{mmlResult}
+			services.ResponseWithJson(w, http.StatusOK, response)
+			return
+		}
+		defer conn.Close()
+
+		// localAddr := conn.LocalAddr()
+		// remoteAddr := conn.RemoteAddr()
+		// if localAddr == nil || remoteAddr == nil {
+		// 	errMsg := fmt.Sprintf("connect invalid: localAddr=%v, remoteAddr=%v", localAddr, remoteAddr)
+		// 	log.Error(errMsg)
+		// 	mmlResult = append(mmlResult, errMsg)
+		// 	response := Response{mmlResult}
+		// 	services.ResponseWithJson(w, http.StatusOK, response)
+		// 	return
+		// }
+
+		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)
+			mmlResult = append(mmlResult, err.Error())
+			response := Response{mmlResult}
+			services.ResponseWithJson(w, http.StatusOK, response)
+			return
+		}
+
+		time.Sleep(time.Millisecond * TIME_DELAY_AFTER_WRITE)
+
+		n, err = conn.Read(buf[0:])
+		if err != nil {
+			log.Error("Failed to read:", err)
+			mmlResult = append(mmlResult, err.Error())
+			response := Response{mmlResult}
+			services.ResponseWithJson(w, http.StatusOK, response)
+			return
+		}
+		log.Trace(string(buf[0:n]))
+
+		body, err := io.ReadAll(io.LimitReader(r.Body, global.RequestBodyMaxLen))
+		if err != nil {
+			log.Error("Failed to ReadAll:", err)
+			services.ResponseNotFound404UriNotExist(w, r)
+			return
+		}
+		log.Trace("Body:", string(body))
+
+		mmlRequest := new(MMLRequest)
+		_ = json.Unmarshal(body, mmlRequest)
+
+		for _, mml := range mmlRequest.MML {
+			mmlCommand := fmt.Sprintf("%s\n", mml)
+			_, err = conn.Write([]byte(mmlCommand))
+			if err != nil {
+				log.Error("Failed to write:", err)
+				mmlResult = append(mmlResult, err.Error())
+				// response := Response{mmlResult}
+				// services.ResponseWithJson(w, http.StatusOK, response)
+				// return
+				continue
+			}
+			time.Sleep(time.Millisecond * TIME_DELAY_AFTER_WRITE)
+
+			n, err = conn.Read(buf[0:])
+			if err != nil {
+				log.Error("Failed to read:", err)
+				mmlResult = append(mmlResult, err.Error())
+				// response := Response{mmlResult}
+				// services.ResponseWithJson(w, http.StatusOK, response)
+				// return
+				continue
+			}
+			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, "")
+			mmlResult = append(mmlResult, result)
+		}
+
+	}
+
+	response := Response{mmlResult}
+	services.ResponseWithJson(w, http.StatusOK, response)
+}

 func PostMMLToNF(w http.ResponseWriter, r *http.Request) {
 	log.Debug("PostMMLToNF processing... ")
@@ -66,14 +192,14 @@ func PostMMLToNF(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	// 经过测试，linux下，延时需要大于100ms
-	var TIME_DELAY_AFTER_WRITE time.Duration = 200
-	var TIME_DEAD_LINE time.Duration = 10
-	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)
-	}
+	// var TIME_DELAY_AFTER_WRITE time.Duration = 200
+	// var TIME_DEAD_LINE time.Duration = 10
+	// 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)
+	// }

 	pack := "mml"
 	vars := mux.Vars(r)
@@ -242,9 +368,10 @@ func PostMMLToNF(w http.ResponseWriter, r *http.Request) {
 				if err != nil {
 					log.Error("Failed to write:", err)
 					mmlResult = append(mmlResult, err.Error())
-					response := Response{mmlResult}
-					services.ResponseWithJson(w, http.StatusOK, response)
-					return
+					//response := Response{mmlResult}
+					//services.ResponseWithJson(w, http.StatusOK, response)
+					//return
+					continue
 				}
 				time.Sleep(time.Millisecond * TIME_DELAY_AFTER_WRITE)
 				mmlCommand := fmt.Sprintf("%s\n", mml)
@@ -253,9 +380,10 @@ func PostMMLToNF(w http.ResponseWriter, r *http.Request) {
 				if err != nil {
 					log.Error("Failed to write:", err)
 					mmlResult = append(mmlResult, err.Error())
-					response := Response{mmlResult}
-					services.ResponseWithJson(w, http.StatusOK, response)
-					return
+					//response := Response{mmlResult}
+					//services.ResponseWithJson(w, http.StatusOK, response)
+					//return
+					continue
 				}
 				time.Sleep(time.Millisecond * TIME_DELAY_AFTER_WRITE)

@@ -263,9 +391,10 @@ func PostMMLToNF(w http.ResponseWriter, r *http.Request) {
 				if err != nil {
 					log.Error("Failed to read:", err)
 					mmlResult = append(mmlResult, err.Error())
-					response := Response{mmlResult}
-					services.ResponseWithJson(w, http.StatusOK, response)
-					return
+					//response := Response{mmlResult}
+					//services.ResponseWithJson(w, http.StatusOK, response)
+					//return
+					continue
 				}
 				log.Trace(string(buf[0 : n-len(neType)-2]))

@@ -327,7 +456,7 @@ func PostMMLToNF(w http.ResponseWriter, r *http.Request) {
 				services.ResponseWithJson(w, http.StatusOK, response)
 				return
 			}
-			log.Debug(string(buf[0:n]))
+			log.Trace(string(buf[0:n]))

 			_, err = conn.Write([]byte(config.GetYamlConfig().MML.Password + "\r\n"))
 			if err != nil {
@@ -377,9 +506,10 @@ func PostMMLToNF(w http.ResponseWriter, r *http.Request) {
 				if err != nil {
 					log.Error("Failed to write:", err)
 					mmlResult = append(mmlResult, err.Error())
-					response := Response{mmlResult}
-					services.ResponseWithJson(w, http.StatusOK, response)
-					return
+					// response := Response{mmlResult}
+					// services.ResponseWithJson(w, http.StatusOK, response)
+					// return
+					continue
 				}
 				time.Sleep(time.Millisecond * TIME_DELAY_AFTER_WRITE)

@@ -387,9 +517,10 @@ func PostMMLToNF(w http.ResponseWriter, r *http.Request) {
 				if err != nil {
 					log.Error("Failed to read:", err)
 					mmlResult = append(mmlResult, err.Error())
-					response := Response{mmlResult}
-					services.ResponseWithJson(w, http.StatusOK, response)
-					return
+					// response := Response{mmlResult}
+					// services.ResponseWithJson(w, http.StatusOK, response)
+					// return
+					continue
 				}
 				log.Trace(string(buf[0 : n-len(neType)-2]))

@@ -397,7 +528,6 @@ func PostMMLToNF(w http.ResponseWriter, r *http.Request) {
 				//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, "")
 				mmlResult = append(mmlResult, result)
@@ -466,9 +596,10 @@ func PostMMLToNF(w http.ResponseWriter, r *http.Request) {
 				if err != nil {
 					log.Error("Failed to write:", err)
 					mmlResult = append(mmlResult, err.Error())
-					response := Response{mmlResult}
-					services.ResponseWithJson(w, http.StatusOK, response)
-					return
+					// response := Response{mmlResult}
+					// services.ResponseWithJson(w, http.StatusOK, response)
+					// return
+					continue
 				}
 				time.Sleep(time.Millisecond * TIME_DELAY_AFTER_WRITE)

@@ -476,9 +607,10 @@ func PostMMLToNF(w http.ResponseWriter, r *http.Request) {
 				if err != nil {
 					log.Error("Failed to read:", err)
 					mmlResult = append(mmlResult, err.Error())
-					response := Response{mmlResult}
-					services.ResponseWithJson(w, http.StatusOK, response)
-					return
+					// response := Response{mmlResult}
+					// services.ResponseWithJson(w, http.StatusOK, response)
+					// return
+					continue
 				}
 				log.Trace(string(buf[0 : n-len(neType)-2]))
 				re1 := regexp.MustCompile(`\x1B\[[0-9;]*[a-zA-Z]`) // 匹配包含␛的控制字符
@@ -533,7 +665,7 @@ func PostMMLToOMC(w http.ResponseWriter, r *http.Request) {
 	hostUri := fmt.Sprintf("http://%s:%s", neInfo.Ip, neInfo.Port)

 	omcMmlVar := &mmlp.MmlVar{
-		Version:       "16.1.1",
+		Version:       global.Version,
 		Output:        mmlp.DefaultFormatType,
 		MmlHome:       config.GetYamlConfig().MML.MmlHome,
 		Limit:         50,